6 files changed, 155 insertions, 179 deletions
diff --git a/nuttx/configs/ea3131/nsh/defconfig b/nuttx/configs/ea3131/nsh/defconfig
index a50104ba4..5c4e3fda2 100644
--- a/nuttx/configs/ea3131/nsh/defconfig
+++ b/nuttx/configs/ea3131/nsh/defconfig
@@ -1,7 +1,7 @@
 ############################################################################
 # configs/ea3131/nsh/defconfig
 #
-#   Copyright (C) 2010 Gregory Nutt. All rights reserved.
+#   Copyright (C) 2010,2012 Gregory Nutt. All rights reserved.
 #   Author: Gregory Nutt <gnutt@nuttx.org>
 #
 # Redistribution and use in source and binary forms, with or without
@@ -39,6 +39,7 @@ CONFIG_ARCH="arm"
 CONFIG_ARCH_ARM=y
 CONFIG_ARCH_ARM926EJS=y
 CONFIG_ARCH_CHIP="lpc31xx"
+CONFIG_ARCH_CHIP_LPC31XX=y
 CONFIG_ARCH_CHIP_LPC3131=y
 CONFIG_ARCH_BOARD="ea3131"
 CONFIG_ARCH_BOARD_EA3131=y
@@ -63,32 +64,32 @@ CONFIG_ARCH_ROMPGTABLE=y
 
 # Identify toolchain and linker options
 #
-CONFIG_LPC31XX_CODESOURCERYW=n
-CONFIG_LPC31XX_CODESOURCERYL=n
-CONFIG_LPC31XX_DEVKITARM=n
-CONFIG_LPC31XX_BUILDROOT=y
+CONFIG_LPC31_CODESOURCERYW=n
+CONFIG_LPC31_CODESOURCERYL=n
+CONFIG_LPC31_DEVKITARM=n
+CONFIG_LPC31_BUILDROOT=y
 
 #
 # Individual subsystems can be enabled:
 #
-CONFIG_LPC31XX_MCI=n
-CONFIG_LPC31XX_SPI=n
-CONFIG_LPC31XX_UART=y
+CONFIG_LPC31_MCI=n
+CONFIG_LPC31_SPI=n
+CONFIG_LPC31_UART=y
 
 #
 # Exernal memory available on the board (see also CONFIG_MM_REGIONS)
 #
-CONFIG_LPC31XX_EXTSRAM0=n
-CONFIG_LPC31XX_EXTSRAM0HEAP=n
-CONFIG_LPC31XX_EXTSRAM0SIZE=131072
-CONFIG_LPC31XX_EXTSRAM1=n
-CONFIG_LPC31XX_EXTSRAM1HEAP=n
-CONFIG_LPC31XX_EXTSRAM1SIZE=131072
-CONFIG_LPC31XX_EXTSDRAM=n
-CONFIG_LPC31XX_EXTSDRAMHEAP=n
-CONFIG_LPC31XX_EXTSDRAMSIZE=67108864
-CONFIG_LPC31XX_EXTNAND=n
-CONFIG_LPC31XX_EXTNANDSIZE=67108864
+CONFIG_LPC31_EXTSRAM0=n
+CONFIG_LPC31_EXTSRAM0HEAP=n
+CONFIG_LPC31_EXTSRAM0SIZE=131072
+CONFIG_LPC31_EXTSRAM1=n
+CONFIG_LPC31_EXTSRAM1HEAP=n
+CONFIG_LPC31_EXTSRAM1SIZE=131072
+CONFIG_LPC31_EXTSDRAM=n
+CONFIG_LPC31_EXTSDRAMHEAP=n
+CONFIG_LPC31_EXTSDRAMSIZE=67108864
+CONFIG_LPC31_EXTNAND=n
+CONFIG_LPC31_EXTNANDSIZE=67108864
 
 #
 # LPC31XX specific device driver settings
@@ -269,11 +270,11 @@ CONFIG_USBDEV_TRACE_NRECORDS=128
 #
 # LPC31XX USB Configuration
 #
-CONFIG_LPC31XX_GIO_USBATTACH=6
-CONFIG_LPC31XX_GIO_USBDPPULLUP=17
-CONFIG_LPC31XX_VENDORID=0xd320
-CONFIG_LPC31XX_PRODUCTID=0x3211
-CONFIG_LPC31XX_USBDEV_DMA=n
+CONFIG_LPC31_GIO_USBATTACH=6
+CONFIG_LPC31_GIO_USBDPPULLUP=17
+CONFIG_LPC31_VENDORID=0xd320
+CONFIG_LPC31_PRODUCTID=0x3211
+CONFIG_LPC31_USBDEV_DMA=n
 
 #
 # USB Serial Device Configuration
@@ -388,12 +389,7 @@ CONFIG_EXAMPLES_USBSERIAL_TRACEINTERRUPTS=n
 # Stack and heap information
 #
 CONFIG_BOOT_RUNFROMFLASH=n
-CONFIG_BOOT_COPYTORAM=n
-CONFIG_CUSTOM_STACK=n
-#CONFIG_STACK_POINTER
 CONFIG_IDLETHREAD_STACKSIZE=1024
 CONFIG_USERMAIN_STACKSIZE=2048
 CONFIG_PTHREAD_STACK_MIN=256
 CONFIG_PTHREAD_STACK_DEFAULT=2048
-CONFIG_HEAP_BASE=
-CONFIG_HEAP_SIZE=
diff --git a/nuttx/configs/ea3131/ostest/defconfig b/nuttx/configs/ea3131/ostest/defconfig
index 2e76bebbd..4e9a70743 100644
--- a/nuttx/configs/ea3131/ostest/defconfig
+++ b/nuttx/configs/ea3131/ostest/defconfig
@@ -1,7 +1,7 @@
 ############################################################################
 # configs/ea3131/ostest/defconfig
 #
-#   Copyright (C) 2009-2010 Gregory Nutt. All rights reserved.
+#   Copyright (C) 2009-2010,2012 Gregory Nutt. All rights reserved.
 #   Author: Gregory Nutt <gnutt@nuttx.org>
 #
 # Redistribution and use in source and binary forms, with or without
@@ -39,6 +39,7 @@ CONFIG_ARCH="arm"
 CONFIG_ARCH_ARM=y
 CONFIG_ARCH_ARM926EJS=y
 CONFIG_ARCH_CHIP="lpc31xx"
+CONFIG_ARCH_CHIP_LPC31XX=y
 CONFIG_ARCH_CHIP_LPC3131=y
 CONFIG_ARCH_BOARD="ea3131"
 CONFIG_ARCH_BOARD_EA3131=y
@@ -63,32 +64,32 @@ CONFIG_ARCH_ROMPGTABLE=y
 
 # Identify toolchain and linker options
 #
-CONFIG_LPC31XX_CODESOURCERYW=n
-CONFIG_LPC31XX_CODESOURCERYL=n
-CONFIG_LPC31XX_DEVKITARM=n
-CONFIG_LPC31XX_BUILDROOT=y
+CONFIG_LPC31_CODESOURCERYW=n
+CONFIG_LPC31_CODESOURCERYL=n
+CONFIG_LPC31_DEVKITARM=n
+CONFIG_LPC31_BUILDROOT=y
 
 #
 # Individual subsystems can be enabled:
 #
-CONFIG_LPC31XX_MCI=n
-CONFIG_LPC31XX_SPI=n
-CONFIG_LPC31XX_UART=y
+CONFIG_LPC31_MCI=n
+CONFIG_LPC31_SPI=n
+CONFIG_LPC31_UART=y
 
 #
 # Exernal memory available on the board (see also CONFIG_MM_REGIONS)
 #
-CONFIG_LPC31XX_EXTSRAM0=n
-CONFIG_LPC31XX_EXTSRAM0HEAP=n
-CONFIG_LPC31XX_EXTSRAM0SIZE=131072
-CONFIG_LPC31XX_EXTSRAM1=n
-CONFIG_LPC31XX_EXTSRAM1HEAP=n
-CONFIG_LPC31XX_EXTSRAM1SIZE=131072
-CONFIG_LPC31XX_EXTSDRAM=n
-CONFIG_LPC31XX_EXTSDRAMHEAP=n
-CONFIG_LPC31XX_EXTSDRAMSIZE=67108864
-CONFIG_LPC31XX_EXTNAND=n
-CONFIG_LPC31XX_EXTNANDSIZE=67108864
+CONFIG_LPC31_EXTSRAM0=n
+CONFIG_LPC31_EXTSRAM0HEAP=n
+CONFIG_LPC31_EXTSRAM0SIZE=131072
+CONFIG_LPC31_EXTSRAM1=n
+CONFIG_LPC31_EXTSRAM1HEAP=n
+CONFIG_LPC31_EXTSRAM1SIZE=131072
+CONFIG_LPC31_EXTSDRAM=n
+CONFIG_LPC31_EXTSDRAMHEAP=n
+CONFIG_LPC31_EXTSDRAMSIZE=67108864
+CONFIG_LPC31_EXTNAND=n
+CONFIG_LPC31_EXTNANDSIZE=67108864
 
 #
 # LPC31XX specific device driver settings
@@ -269,11 +270,11 @@ CONFIG_USBDEV_TRACE_NRECORDS=128
 #
 # LPC31XX USB Configuration
 #
-CONFIG_LPC31XX_GIO_USBATTACH=6
-CONFIG_LPC31XX_GIO_USBDPPULLUP=17
-CONFIG_LPC31XX_VENDORID=0xd320
-CONFIG_LPC31XX_PRODUCTID=0x3211
-CONFIG_LPC31XX_USBDEV_DMA=n
+CONFIG_LPC31_GIO_USBATTACH=6
+CONFIG_LPC31_GIO_USBDPPULLUP=17
+CONFIG_LPC31_VENDORID=0xd320
+CONFIG_LPC31_PRODUCTID=0x3211
+CONFIG_LPC31_USBDEV_DMA=n
 
 #
 # USB Serial Device Configuration
@@ -387,13 +388,8 @@ CONFIG_EXAMPLES_USBSERIAL_TRACEINTERRUPTS=n
 #
 # Stack and heap information
 #
-CONFIG_BOOT_RUNFROMFLASH=n
-CONFIG_BOOT_COPYTORAM=n
-CONFIG_CUSTOM_STACK=n
-#CONFIG_STACK_POINTER
+CONFIG_BOOT_RUNFROMISRAM=y
 CONFIG_IDLETHREAD_STACKSIZE=1024
 CONFIG_USERMAIN_STACKSIZE=2048
 CONFIG_PTHREAD_STACK_MIN=256
 CONFIG_PTHREAD_STACK_DEFAULT=2048
-CONFIG_HEAP_BASE=
-CONFIG_HEAP_SIZE=
diff --git a/nuttx/configs/ea3131/pgnsh/defconfig b/nuttx/configs/ea3131/pgnsh/defconfig
index a28f1f827..14c967c78 100644
--- a/nuttx/configs/ea3131/pgnsh/defconfig
+++ b/nuttx/configs/ea3131/pgnsh/defconfig
@@ -1,7 +1,7 @@
 ############################################################################
 # configs/ea3131/pgnsh/defconfig
 #
-#   Copyright (C) 2010 Gregory Nutt. All rights reserved.
+#   Copyright (C) 2010, 2012 Gregory Nutt. All rights reserved.
 #   Author: Gregory Nutt <gnutt@nuttx.org>
 #
 # Redistribution and use in source and binary forms, with or without
@@ -39,6 +39,7 @@ CONFIG_ARCH="arm"
 CONFIG_ARCH_ARM=y
 CONFIG_ARCH_ARM926EJS=y
 CONFIG_ARCH_CHIP="lpc31xx"
+CONFIG_ARCH_CHIP_LPC31XX=y
 CONFIG_ARCH_CHIP_LPC3131=y
 CONFIG_ARCH_BOARD="ea3131"
 CONFIG_ARCH_BOARD_EA3131=y
@@ -63,32 +64,32 @@ CONFIG_ARCH_ROMPGTABLE=n
 
 # Identify toolchain and linker options
 #
-CONFIG_LPC31XX_CODESOURCERYW=n
-CONFIG_LPC31XX_CODESOURCERYL=n
-CONFIG_LPC31XX_DEVKITARM=n
-CONFIG_LPC31XX_BUILDROOT=y
+CONFIG_LPC31_CODESOURCERYW=n
+CONFIG_LPC31_CODESOURCERYL=n
+CONFIG_LPC31_DEVKITARM=n
+CONFIG_LPC31_BUILDROOT=y
 
 #
 # Individual subsystems can be enabled:
 #
-CONFIG_LPC31XX_MCI=n
-CONFIG_LPC31XX_SPI=y
-CONFIG_LPC31XX_UART=y
+CONFIG_LPC31_MCI=n
+CONFIG_LPC31_SPI=y
+CONFIG_LPC31_UART=y
 
 #
 # Exernal memory available on the board (see also CONFIG_MM_REGIONS)
 #
-CONFIG_LPC31XX_EXTSRAM0=n
-CONFIG_LPC31XX_EXTSRAM0HEAP=n
-CONFIG_LPC31XX_EXTSRAM0SIZE=131072
-CONFIG_LPC31XX_EXTSRAM1=n
-CONFIG_LPC31XX_EXTSRAM1HEAP=n
-CONFIG_LPC31XX_EXTSRAM1SIZE=131072
-CONFIG_LPC31XX_EXTSDRAM=n
-CONFIG_LPC31XX_EXTSDRAMHEAP=n
-CONFIG_LPC31XX_EXTSDRAMSIZE=67108864
-CONFIG_LPC31XX_EXTNAND=n
-CONFIG_LPC31XX_EXTNANDSIZE=67108864
+CONFIG_LPC31_EXTSRAM0=n
+CONFIG_LPC31_EXTSRAM0HEAP=n
+CONFIG_LPC31_EXTSRAM0SIZE=131072
+CONFIG_LPC31_EXTSRAM1=n
+CONFIG_LPC31_EXTSRAM1HEAP=n
+CONFIG_LPC31_EXTSRAM1SIZE=131072
+CONFIG_LPC31_EXTSDRAM=n
+CONFIG_LPC31_EXTSDRAMHEAP=n
+CONFIG_LPC31_EXTSDRAMSIZE=67108864
+CONFIG_LPC31_EXTNAND=n
+CONFIG_LPC31_EXTNANDSIZE=67108864
 
 #
 # LPC31XX specific device driver settings
@@ -312,11 +313,11 @@ CONFIG_USBDEV_TRACE_NRECORDS=128
 #
 # LPC31XX USB Configuration
 #
-CONFIG_LPC31XX_GIO_USBATTACH=6
-CONFIG_LPC31XX_GIO_USBDPPULLUP=17
-CONFIG_LPC31XX_VENDORID=0xd320
-CONFIG_LPC31XX_PRODUCTID=0x3211
-CONFIG_LPC31XX_USBDEV_DMA=n
+CONFIG_LPC31_GIO_USBATTACH=6
+CONFIG_LPC31_GIO_USBDPPULLUP=17
+CONFIG_LPC31_VENDORID=0xd320
+CONFIG_LPC31_PRODUCTID=0x3211
+CONFIG_LPC31_USBDEV_DMA=n
 
 #
 # USB Serial Device Configuration
@@ -430,13 +431,8 @@ CONFIG_EXAMPLES_USBSERIAL_TRACEINTERRUPTS=n
 #
 # Stack and heap information
 #
-CONFIG_BOOT_RUNFROMFLASH=n
-CONFIG_BOOT_COPYTORAM=n
-CONFIG_CUSTOM_STACK=n
-#CONFIG_STACK_POINTER
+CONFIG_BOOT_RUNFROMISRAM=y
 CONFIG_IDLETHREAD_STACKSIZE=1024
 CONFIG_USERMAIN_STACKSIZE=2048
 CONFIG_PTHREAD_STACK_MIN=256
 CONFIG_PTHREAD_STACK_DEFAULT=2048
-CONFIG_HEAP_BASE=
-CONFIG_HEAP_SIZE=
diff --git a/nuttx/configs/ea3131/usbserial/defconfig b/nuttx/configs/ea3131/usbserial/defconfig
index abd2855df..b03e6cd3d 100644
--- a/nuttx/configs/ea3131/usbserial/defconfig
+++ b/nuttx/configs/ea3131/usbserial/defconfig
@@ -1,7 +1,7 @@
 ############################################################################
 # configs/ea3131/usbserial/defconfig
 #
-#   Copyright (C) 2010-2011 Gregory Nutt. All rights reserved.
+#   Copyright (C) 2010, 2012 Gregory Nutt. All rights reserved.
 #   Author: Gregory Nutt <gnutt@nuttx.org>
 #
 # Redistribution and use in source and binary forms, with or without
@@ -39,6 +39,7 @@ CONFIG_ARCH="arm"
 CONFIG_ARCH_ARM=y
 CONFIG_ARCH_ARM926EJS=y
 CONFIG_ARCH_CHIP="lpc31xx"
+CONFIG_ARCH_CHIP_LPC31XX=y
 CONFIG_ARCH_CHIP_LPC3131=y
 CONFIG_ARCH_BOARD="ea3131"
 CONFIG_ARCH_BOARD_EA3131=y
@@ -63,32 +64,32 @@ CONFIG_ARCH_ROMPGTABLE=y
 
 # Identify toolchain and linker options
 #
-CONFIG_LPC31XX_CODESOURCERYW=n
-CONFIG_LPC31XX_CODESOURCERYL=y
-CONFIG_LPC31XX_DEVKITARM=n
-CONFIG_LPC31XX_BUILDROOT=n
+CONFIG_LPC31_CODESOURCERYW=n
+CONFIG_LPC31_CODESOURCERYL=y
+CONFIG_LPC31_DEVKITARM=n
+CONFIG_LPC31_BUILDROOT=n
 
 #
 # Individual subsystems can be enabled:
 #
-CONFIG_LPC31XX_MCI=n
-CONFIG_LPC31XX_SPI=n
-CONFIG_LPC31XX_UART=y
+CONFIG_LPC31_MCI=n
+CONFIG_LPC31_SPI=n
+CONFIG_LPC31_UART=y
 
 #
 # Exernal memory available on the board (see also CONFIG_MM_REGIONS)
 #
-CONFIG_LPC31XX_EXTSRAM0=n
-CONFIG_LPC31XX_EXTSRAM0HEAP=n
-CONFIG_LPC31XX_EXTSRAM0SIZE=131072
-CONFIG_LPC31XX_EXTSRAM1=n
-CONFIG_LPC31XX_EXTSRAM1HEAP=n
-CONFIG_LPC31XX_EXTSRAM1SIZE=131072
-CONFIG_LPC31XX_EXTSDRAM=n
-CONFIG_LPC31XX_EXTSDRAMHEAP=n
-CONFIG_LPC31XX_EXTSDRAMSIZE=67108864
-CONFIG_LPC31XX_EXTNAND=n
-CONFIG_LPC31XX_EXTNANDSIZE=67108864
+CONFIG_LPC31_EXTSRAM0=n
+CONFIG_LPC31_EXTSRAM0HEAP=n
+CONFIG_LPC31_EXTSRAM0SIZE=131072
+CONFIG_LPC31_EXTSRAM1=n
+CONFIG_LPC31_EXTSRAM1HEAP=n
+CONFIG_LPC31_EXTSRAM1SIZE=131072
+CONFIG_LPC31_EXTSDRAM=n
+CONFIG_LPC31_EXTSDRAMHEAP=n
+CONFIG_LPC31_EXTSDRAMSIZE=67108864
+CONFIG_LPC31_EXTNAND=n
+CONFIG_LPC31_EXTNANDSIZE=67108864
 
 #
 # LPC31XX specific device driver settings
@@ -272,11 +273,11 @@ CONFIG_USBDEV_TRACE_NRECORDS=128
 #
 # LPC31XX USB Configuration
 #
-CONFIG_LPC31XX_GIO_USBATTACH=6
-CONFIG_LPC31XX_GIO_USBDPPULLUP=17
-CONFIG_LPC31XX_VENDORID=0xd320
-CONFIG_LPC31XX_PRODUCTID=0x3211
-CONFIG_LPC31XX_USBDEV_DMA=n
+CONFIG_LPC31_GIO_USBATTACH=6
+CONFIG_LPC31_GIO_USBDPPULLUP=17
+CONFIG_LPC31_VENDORID=0xd320
+CONFIG_LPC31_PRODUCTID=0x3211
+CONFIG_LPC31_USBDEV_DMA=n
 
 #
 # USB Serial Device Configuration
@@ -402,13 +403,8 @@ CONFIG_EXAMPLES_USBMSC_TRACEINTERRUPTS=n
 #
 # Stack and heap information
 #
-CONFIG_BOOT_RUNFROMFLASH=n
-CONFIG_BOOT_COPYTORAM=n
-CONFIG_CUSTOM_STACK=n
-#CONFIG_STACK_POINTER
+CONFIG_BOOT_RUNFROMISRAM=y
 CONFIG_IDLETHREAD_STACKSIZE=1024
 CONFIG_USERMAIN_STACKSIZE=2048
 CONFIG_PTHREAD_STACK_MIN=256
 CONFIG_PTHREAD_STACK_DEFAULT=2048
-CONFIG_HEAP_BASE=
-CONFIG_HEAP_SIZE=
diff --git a/nuttx/configs/ea3131/usbstorage/defconfig b/nuttx/configs/ea3131/usbstorage/defconfig
index 1d4c5dfd4..b55eee1c9 100644
--- a/nuttx/configs/ea3131/usbstorage/defconfig
+++ b/nuttx/configs/ea3131/usbstorage/defconfig
@@ -1,7 +1,7 @@
 ############################################################################
 # configs/ea3131/usbstorage/defconfig
 #
-#   Copyright (C) 2010-2011 Gregory Nutt. All rights reserved.
+#   Copyright (C) 2010-2012 Gregory Nutt. All rights reserved.
 #   Author: Gregory Nutt <gnutt@nuttx.org>
 #
 # Redistribution and use in source and binary forms, with or without
@@ -39,6 +39,7 @@ CONFIG_ARCH="arm"
 CONFIG_ARCH_ARM=y
 CONFIG_ARCH_ARM926EJS=y
 CONFIG_ARCH_CHIP="lpc31xx"
+CONFIG_ARCH_CHIP_LPC31XX=y
 CONFIG_ARCH_CHIP_LPC3131=y
 CONFIG_ARCH_BOARD="ea3131"
 CONFIG_ARCH_BOARD_EA3131=y
@@ -63,32 +64,32 @@ CONFIG_ARCH_ROMPGTABLE=y
 
 # Identify toolchain and linker options
 #
-CONFIG_LPC31XX_CODESOURCERYW=n
-CONFIG_LPC31XX_CODESOURCERYL=y
-CONFIG_LPC31XX_DEVKITARM=n
-CONFIG_LPC31XX_BUILDROOT=n
+CONFIG_LPC31_CODESOURCERYW=n
+CONFIG_LPC31_CODESOURCERYL=y
+CONFIG_LPC31_DEVKITARM=n
+CONFIG_LPC31_BUILDROOT=n
 
 #
 # Individual subsystems can be enabled:
 #
-CONFIG_LPC31XX_MCI=n
-CONFIG_LPC31XX_SPI=n
-CONFIG_LPC31XX_UART=y
+CONFIG_LPC31_MCI=n
+CONFIG_LPC31_SPI=n
+CONFIG_LPC31_UART=y
 
 #
 # Exernal memory available on the board (see also CONFIG_MM_REGIONS)
 #
-CONFIG_LPC31XX_EXTSRAM0=n
-CONFIG_LPC31XX_EXTSRAM0HEAP=n
-CONFIG_LPC31XX_EXTSRAM0SIZE=131072
-CONFIG_LPC31XX_EXTSRAM1=n
-CONFIG_LPC31XX_EXTSRAM1HEAP=n
-CONFIG_LPC31XX_EXTSRAM1SIZE=131072
-CONFIG_LPC31XX_EXTSDRAM=n
-CONFIG_LPC31XX_EXTSDRAMHEAP=n
-CONFIG_LPC31XX_EXTSDRAMSIZE=67108864
-CONFIG_LPC31XX_EXTNAND=n
-CONFIG_LPC31XX_EXTNANDSIZE=67108864
+CONFIG_LPC31_EXTSRAM0=n
+CONFIG_LPC31_EXTSRAM0HEAP=n
+CONFIG_LPC31_EXTSRAM0SIZE=131072
+CONFIG_LPC31_EXTSRAM1=n
+CONFIG_LPC31_EXTSRAM1HEAP=n
+CONFIG_LPC31_EXTSRAM1SIZE=131072
+CONFIG_LPC31_EXTSDRAM=n
+CONFIG_LPC31_EXTSDRAMHEAP=n
+CONFIG_LPC31_EXTSDRAMSIZE=67108864
+CONFIG_LPC31_EXTNAND=n
+CONFIG_LPC31_EXTNANDSIZE=67108864
 
 #
 # LPC31XX specific device driver settings
@@ -273,11 +274,11 @@ CONFIG_USBDEV_TRACE_NRECORDS=128
 #
 # LPC31XX USB Configuration
 #
-CONFIG_LPC31XX_GIO_USBATTACH=6
-CONFIG_LPC31XX_GIO_USBDPPULLUP=17
-CONFIG_LPC31XX_VENDORID=0xd320
-CONFIG_LPC31XX_PRODUCTID=0x3211
-CONFIG_LPC31XX_USBDEV_DMA=n
+CONFIG_LPC31_GIO_USBATTACH=6
+CONFIG_LPC31_GIO_USBDPPULLUP=17
+CONFIG_LPC31_VENDORID=0xd320
+CONFIG_LPC31_PRODUCTID=0x3211
+CONFIG_LPC31_USBDEV_DMA=n
 
 #
 # USB Serial Device Configuration
@@ -403,13 +404,8 @@ CONFIG_EXAMPLES_USBMSC_TRACEINTERRUPTS=n
 #
 # Stack and heap information
 #
-CONFIG_BOOT_RUNFROMFLASH=n
-CONFIG_BOOT_COPYTORAM=n
-CONFIG_CUSTOM_STACK=n
-#CONFIG_STACK_POINTER
+CONFIG_BOOT_RUNFROMISRAM=y
 CONFIG_IDLETHREAD_STACKSIZE=1024
 CONFIG_USERMAIN_STACKSIZE=2048
 CONFIG_PTHREAD_STACK_MIN=256
 CONFIG_PTHREAD_STACK_DEFAULT=2048
-CONFIG_HEAP_BASE=
-CONFIG_HEAP_SIZE=
diff --git a/nuttx/configs/ea3152/ostest/defconfig b/nuttx/configs/ea3152/ostest/defconfig
index ebb9e637b..be916b7dc 100644
--- a/nuttx/configs/ea3152/ostest/defconfig
+++ b/nuttx/configs/ea3152/ostest/defconfig
@@ -1,7 +1,7 @@
 ############################################################################
 # configs/ea3152/ostest/defconfig
 #
-#   Copyright (C) 2011 Gregory Nutt. All rights reserved.
+#   Copyright (C) 2011-2012 Gregory Nutt. All rights reserved.
 #   Author: Gregory Nutt <gnutt@nuttx.org>
 #
 # Redistribution and use in source and binary forms, with or without
@@ -39,6 +39,7 @@ CONFIG_ARCH="arm"
 CONFIG_ARCH_ARM=y
 CONFIG_ARCH_ARM926EJS=y
 CONFIG_ARCH_CHIP="lpc31xx"
+CONFIG_ARCH_CHIP_LPC31XX=y
 CONFIG_ARCH_CHIP_LPC3152=y
 CONFIG_ARCH_BOARD="ea3152"
 CONFIG_ARCH_BOARD_EA3152=y
@@ -63,32 +64,32 @@ CONFIG_ARCH_ROMPGTABLE=y
 
 # Identify toolchain and linker options
 #
-CONFIG_LPC31XX_CODESOURCERYW=n
-CONFIG_LPC31XX_CODESOURCERYL=n
-CONFIG_LPC31XX_DEVKITARM=n
-CONFIG_LPC31XX_BUILDROOT=y
+CONFIG_LPC31_CODESOURCERYW=n
+CONFIG_LPC31_CODESOURCERYL=n
+CONFIG_LPC31_DEVKITARM=n
+CONFIG_LPC31_BUILDROOT=y
 
 #
 # Individual subsystems can be enabled:
 #
-CONFIG_LPC31XX_MCI=n
-CONFIG_LPC31XX_SPI=n
-CONFIG_LPC31XX_UART=y
+CONFIG_LPC31_MCI=n
+CONFIG_LPC31_SPI=n
+CONFIG_LPC31_UART=y
 
 #
 # Exernal memory available on the board (see also CONFIG_MM_REGIONS)
 #
-CONFIG_LPC31XX_EXTSRAM0=n
-CONFIG_LPC31XX_EXTSRAM0HEAP=n
-CONFIG_LPC31XX_EXTSRAM0SIZE=131072
-CONFIG_LPC31XX_EXTSRAM1=n
-CONFIG_LPC31XX_EXTSRAM1HEAP=n
-CONFIG_LPC31XX_EXTSRAM1SIZE=131072
-CONFIG_LPC31XX_EXTSDRAM=n
-CONFIG_LPC31XX_EXTSDRAMHEAP=n
-CONFIG_LPC31XX_EXTSDRAMSIZE=67108864
-CONFIG_LPC31XX_EXTNAND=n
-CONFIG_LPC31XX_EXTNANDSIZE=67108864
+CONFIG_LPC31_EXTSRAM0=n
+CONFIG_LPC31_EXTSRAM0HEAP=n
+CONFIG_LPC31_EXTSRAM0SIZE=131072
+CONFIG_LPC31_EXTSRAM1=n
+CONFIG_LPC31_EXTSRAM1HEAP=n
+CONFIG_LPC31_EXTSRAM1SIZE=131072
+CONFIG_LPC31_EXTSDRAM=n
+CONFIG_LPC31_EXTSDRAMHEAP=n
+CONFIG_LPC31_EXTSDRAMSIZE=67108864
+CONFIG_LPC31_EXTNAND=n
+CONFIG_LPC31_EXTNANDSIZE=67108864
 
 #
 # LPC31XX specific device driver settings
@@ -270,11 +271,11 @@ CONFIG_USBDEV_TRACE_NRECORDS=128
 #
 # LPC31XX USB Configuration
 #
-CONFIG_LPC31XX_GIO_USBATTACH=6
-CONFIG_LPC31XX_GIO_USBDPPULLUP=17
-CONFIG_LPC31XX_VENDORID=0xd320
-CONFIG_LPC31XX_PRODUCTID=0x3211
-CONFIG_LPC31XX_USBDEV_DMA=n
+CONFIG_LPC31_GIO_USBATTACH=6
+CONFIG_LPC31_GIO_USBDPPULLUP=17
+CONFIG_LPC31_VENDORID=0xd320
+CONFIG_LPC31_PRODUCTID=0x3211
+CONFIG_LPC31_USBDEV_DMA=n
 
 #
 # USB Serial Device Configuration
@@ -388,13 +389,8 @@ CONFIG_EXAMPLES_USBSERIAL_TRACEINTERRUPTS=n
 #
 # Stack and heap information
 #
-CONFIG_BOOT_RUNFROMFLASH=n
-CONFIG_BOOT_COPYTORAM=n
-CONFIG_CUSTOM_STACK=n
-#CONFIG_STACK_POINTER
+CONFIG_BOOT_RUNFROMISRAM=y
 CONFIG_IDLETHREAD_STACKSIZE=1024
 CONFIG_USERMAIN_STACKSIZE=2048
 CONFIG_PTHREAD_STACK_MIN=256
 CONFIG_PTHREAD_STACK_DEFAULT=2048
-CONFIG_HEAP_BASE=
-CONFIG_HEAP_SIZE=