diff --git a/configs/arduino-due/nsh/defconfig b/configs/arduino-due/nsh/defconfig
index 01e2dfe16d2..e672fe6b6b8 100644
--- a/configs/arduino-due/nsh/defconfig
+++ b/configs/arduino-due/nsh/defconfig
@@ -187,10 +187,10 @@ CONFIG_ARCH_HAVE_EXTNAND=y
 CONFIG_ARCH_HAVE_EXTNOR=y
 CONFIG_ARCH_HAVE_EXTSRAM0=y
 CONFIG_ARCH_HAVE_EXTSRAM1=y
-# CONFIG_ARCH_EXTNAND is not set
-# CONFIG_ARCH_EXTNOR is not set
-# CONFIG_ARCH_EXTSRAM0 is not set
-# CONFIG_ARCH_EXTSRAM1 is not set
+# CONFIG_SAM34_EXTNAND is not set
+# CONFIG_SAM34_EXTNOR is not set
+# CONFIG_SAM34_EXTSRAM0 is not set
+# CONFIG_SAM34_EXTSRAM1 is not set
 
 #
 # Architecture Options
diff --git a/configs/arduino-due/ostest/defconfig b/configs/arduino-due/ostest/defconfig
index 2cfc4c2401c..3ad676207bc 100644
--- a/configs/arduino-due/ostest/defconfig
+++ b/configs/arduino-due/ostest/defconfig
@@ -187,10 +187,10 @@ CONFIG_ARCH_HAVE_EXTNAND=y
 CONFIG_ARCH_HAVE_EXTNOR=y
 CONFIG_ARCH_HAVE_EXTSRAM0=y
 CONFIG_ARCH_HAVE_EXTSRAM1=y
-# CONFIG_ARCH_EXTNAND is not set
-# CONFIG_ARCH_EXTNOR is not set
-# CONFIG_ARCH_EXTSRAM0 is not set
-# CONFIG_ARCH_EXTSRAM1 is not set
+# CONFIG_SAM34_EXTNAND is not set
+# CONFIG_SAM34_EXTNOR is not set
+# CONFIG_SAM34_EXTSRAM0 is not set
+# CONFIG_SAM34_EXTSRAM1 is not set
 
 #
 # Architecture Options
diff --git a/configs/arduino-due/src/arduino-due.h b/configs/arduino-due/src/arduino-due.h
index 986f824bfd7..0430b8d2dc0 100644
--- a/configs/arduino-due/src/arduino-due.h
+++ b/configs/arduino-due/src/arduino-due.h
@@ -316,7 +316,7 @@
  *
  ************************************************************************************/
 
-#ifdef CONFIG_ARCH_EXTSRAM0
+#ifdef CONFIG_SAM34_EXTSRAM0
 void sam_sram_initialize(void);
 #endif
 
diff --git a/configs/ea3131/README.txt b/configs/ea3131/README.txt
index e3e71821038..8d8f2c0bf64 100644
--- a/configs/ea3131/README.txt
+++ b/configs/ea3131/README.txt
@@ -570,23 +570,23 @@ ARM/EA3131-specific Configuration Options
 
   External memory available on the board (see also CONFIG_MM_REGIONS)
 
-    CONFIG_ARCH_EXTSRAM0 - Select if external SRAM0 is present
-    CONFIG_ARCH_EXTSRAM0HEAP - Select if external SRAM0 should be
+    CONFIG_LPC31_EXTSRAM0 - Select if external SRAM0 is present
+    CONFIG_LPC31_EXTSRAM0HEAP - Select if external SRAM0 should be
       configured as part of the NuttX heap.
-    CONFIG_ARCH_EXTSRAM0SIZE - Size (in bytes) of the installed
+    CONFIG_LPC31_EXTSRAM0SIZE - Size (in bytes) of the installed
       external SRAM0 memory
-    CONFIG_ARCH_EXTSRAM1 - Select if external SRAM1 is present
-    CONFIG_ARCH_EXTSRAM1HEAP - Select if external SRAM1 should be
+    CONFIG_LPC31_EXTSRAM1 - Select if external SRAM1 is present
+    CONFIG_LPC31_EXTSRAM1HEAP - Select if external SRAM1 should be
       configured as part of the NuttX heap.
-    CONFIG_ARCH_EXTSRAM1SIZE - Size (in bytes) of the installed
+    CONFIG_LPC31_EXTSRAM1SIZE - Size (in bytes) of the installed
       external SRAM1 memory
-    CONFIG_ARCH_EXTDRAM - Select if external SDRAM is present
-    CONFIG_ARCH_EXTDRAMHEAP - Select if external SDRAM should be
+    CONFIG_LPC31_EXTDRAM - Select if external SDRAM is present
+    CONFIG_LPC31_EXTDRAMHEAP - Select if external SDRAM should be
       configured as part of the NuttX heap.
-    CONFIG_ARCH_EXTDRAMSIZE - Size (in bytes) of the installed
+    CONFIG_LPC31_EXTDRAMSIZE - Size (in bytes) of the installed
       external SDRAM memory
-    CONFIG_ARCH_EXTNAND - Select if external NAND is present
-    CONFIG_ARCH_EXTNANDSIZE - Size (in bytes) of the installed
+    CONFIG_LPC31_EXTNAND - Select if external NAND is present
+    CONFIG_LPC31_EXTNANDSIZE - Size (in bytes) of the installed
       external NAND memory
 
   LPC313X specific device driver settings
diff --git a/configs/ea3131/nsh/defconfig b/configs/ea3131/nsh/defconfig
index 328cf96f0ea..02a9949e3bb 100644
--- a/configs/ea3131/nsh/defconfig
+++ b/configs/ea3131/nsh/defconfig
@@ -79,17 +79,17 @@ CONFIG_LPC31_UART=y
 #
 # Exernal memory available on the board (see also CONFIG_MM_REGIONS)
 #
-CONFIG_ARCH_EXTSRAM0=n
-CONFIG_ARCH_EXTSRAM0HEAP=n
-CONFIG_ARCH_EXTSRAM0SIZE=131072
-CONFIG_ARCH_EXTSRAM1=n
-CONFIG_ARCH_EXTSRAM1HEAP=n
-CONFIG_ARCH_EXTSRAM1SIZE=131072
-CONFIG_ARCH_EXTDRAM=n
-CONFIG_ARCH_EXTDRAMHEAP=n
-CONFIG_ARCH_EXTDRAMSIZE=67108864
-CONFIG_ARCH_EXTNAND=n
-CONFIG_ARCH_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_EXTDRAM=n
+CONFIG_LPC31_EXTDRAMHEAP=n
+CONFIG_LPC31_EXTDRAMSIZE=67108864
+CONFIG_LPC31_EXTNAND=n
+CONFIG_LPC31_EXTNANDSIZE=67108864
 
 #
 # LPC31XX specific device driver settings
diff --git a/configs/ea3131/ostest/defconfig b/configs/ea3131/ostest/defconfig
index 5f4b800279c..19c1d6e3012 100644
--- a/configs/ea3131/ostest/defconfig
+++ b/configs/ea3131/ostest/defconfig
@@ -79,17 +79,17 @@ CONFIG_LPC31_UART=y
 #
 # Exernal memory available on the board (see also CONFIG_MM_REGIONS)
 #
-CONFIG_ARCH_EXTSRAM0=n
-CONFIG_ARCH_EXTSRAM0HEAP=n
-CONFIG_ARCH_EXTSRAM0SIZE=131072
-CONFIG_ARCH_EXTSRAM1=n
-CONFIG_ARCH_EXTSRAM1HEAP=n
-CONFIG_ARCH_EXTSRAM1SIZE=131072
-CONFIG_ARCH_EXTDRAM=n
-CONFIG_ARCH_EXTDRAMHEAP=n
-CONFIG_ARCH_EXTDRAMSIZE=67108864
-CONFIG_ARCH_EXTNAND=n
-CONFIG_ARCH_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_EXTDRAM=n
+CONFIG_LPC31_EXTDRAMHEAP=n
+CONFIG_LPC31_EXTDRAMSIZE=67108864
+CONFIG_LPC31_EXTNAND=n
+CONFIG_LPC31_EXTNANDSIZE=67108864
 
 #
 # LPC31XX specific device driver settings
diff --git a/configs/ea3131/pgnsh/defconfig b/configs/ea3131/pgnsh/defconfig
index 9283f32078b..a73842bc7ba 100644
--- a/configs/ea3131/pgnsh/defconfig
+++ b/configs/ea3131/pgnsh/defconfig
@@ -79,17 +79,17 @@ CONFIG_LPC31_UART=y
 #
 # Exernal memory available on the board (see also CONFIG_MM_REGIONS)
 #
-CONFIG_ARCH_EXTSRAM0=n
-CONFIG_ARCH_EXTSRAM0HEAP=n
-CONFIG_ARCH_EXTSRAM0SIZE=131072
-CONFIG_ARCH_EXTSRAM1=n
-CONFIG_ARCH_EXTSRAM1HEAP=n
-CONFIG_ARCH_EXTSRAM1SIZE=131072
-CONFIG_ARCH_EXTDRAM=n
-CONFIG_ARCH_EXTDRAMHEAP=n
-CONFIG_ARCH_EXTDRAMSIZE=67108864
-CONFIG_ARCH_EXTNAND=n
-CONFIG_ARCH_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_EXTDRAM=n
+CONFIG_LPC31_EXTDRAMHEAP=n
+CONFIG_LPC31_EXTDRAMSIZE=67108864
+CONFIG_LPC31_EXTNAND=n
+CONFIG_LPC31_EXTNANDSIZE=67108864
 
 #
 # LPC31XX specific device driver settings
diff --git a/configs/ea3131/src/Makefile b/configs/ea3131/src/Makefile
index 1b91577e9dc..27c4b622105 100644
--- a/configs/ea3131/src/Makefile
+++ b/configs/ea3131/src/Makefile
@@ -44,7 +44,7 @@ CSRCS		= up_boot.c up_clkinit.c
 ifeq ($(CONFIG_ARCH_BUTTONS),y)
 CSRCS		+= up_buttons.c
 endif
-ifeq ($(CONFIG_ARCH_EXTDRAM),y)
+ifeq ($(CONFIG_LPC31_EXTDRAM),y)
 CSRCS		+= up_mem.c
 endif
 ifeq ($(CONFIG_ARCH_LEDS),y)
diff --git a/configs/ea3131/src/ea3131_internal.h b/configs/ea3131/src/ea3131_internal.h
index 4ba97d83d95..1846bf4619e 100644
--- a/configs/ea3131/src/ea3131_internal.h
+++ b/configs/ea3131/src/ea3131_internal.h
@@ -86,7 +86,7 @@
  *
  ************************************************************************************/
 
-#ifdef CONFIG_ARCH_EXTDRAM
+#ifdef CONFIG_LPC31_EXTDRAM
 extern void lpc31_meminitialize(void);
 #endif
 
diff --git a/configs/ea3131/src/up_boot.c b/configs/ea3131/src/up_boot.c
index c8ae7046189..554e90d1030 100644
--- a/configs/ea3131/src/up_boot.c
+++ b/configs/ea3131/src/up_boot.c
@@ -75,7 +75,7 @@ void lpc31_boardinitialize(void)
 {
   /* Initialize configured, external memory resources */
 
-#ifdef CONFIG_ARCH_EXTDRAM
+#ifdef CONFIG_LPC31_EXTDRAM
   lpc31_meminitialize();
 #endif
 
diff --git a/configs/ea3131/src/up_mem.c b/configs/ea3131/src/up_mem.c
index 668233d3b98..15a09c5959b 100644
--- a/configs/ea3131/src/up_mem.c
+++ b/configs/ea3131/src/up_mem.c
@@ -59,7 +59,7 @@
 #include "lpc31_mpmc.h"
 #include "ea3131_internal.h"
 
-#ifdef CONFIG_ARCH_EXTDRAM
+#ifdef CONFIG_LPC31_EXTDRAM
 
 /****************************************************************************
  * Pre-processor Definitions
@@ -356,4 +356,4 @@ void lpc31_meminitialize(void)
 
   lpc31_sdraminitialize();
 }
-#endif /* CONFIG_ARCH_EXTDRAM */
+#endif /* CONFIG_LPC31_EXTDRAM */
diff --git a/configs/ea3131/usbserial/defconfig b/configs/ea3131/usbserial/defconfig
index 642a258c54f..c4b0c2bbecf 100644
--- a/configs/ea3131/usbserial/defconfig
+++ b/configs/ea3131/usbserial/defconfig
@@ -79,17 +79,17 @@ CONFIG_LPC31_UART=y
 #
 # Exernal memory available on the board (see also CONFIG_MM_REGIONS)
 #
-CONFIG_ARCH_EXTSRAM0=n
-CONFIG_ARCH_EXTSRAM0HEAP=n
-CONFIG_ARCH_EXTSRAM0SIZE=131072
-CONFIG_ARCH_EXTSRAM1=n
-CONFIG_ARCH_EXTSRAM1HEAP=n
-CONFIG_ARCH_EXTSRAM1SIZE=131072
-CONFIG_ARCH_EXTDRAM=n
-CONFIG_ARCH_EXTDRAMHEAP=n
-CONFIG_ARCH_EXTDRAMSIZE=67108864
-CONFIG_ARCH_EXTNAND=n
-CONFIG_ARCH_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_EXTDRAM=n
+CONFIG_LPC31_EXTDRAMHEAP=n
+CONFIG_LPC31_EXTDRAMSIZE=67108864
+CONFIG_LPC31_EXTNAND=n
+CONFIG_LPC31_EXTNANDSIZE=67108864
 
 #
 # LPC31XX specific device driver settings
diff --git a/configs/ea3131/usbstorage/defconfig b/configs/ea3131/usbstorage/defconfig
index 73213ef4a10..528ef86931d 100644
--- a/configs/ea3131/usbstorage/defconfig
+++ b/configs/ea3131/usbstorage/defconfig
@@ -79,17 +79,17 @@ CONFIG_LPC31_UART=y
 #
 # Exernal memory available on the board (see also CONFIG_MM_REGIONS)
 #
-CONFIG_ARCH_EXTSRAM0=n
-CONFIG_ARCH_EXTSRAM0HEAP=n
-CONFIG_ARCH_EXTSRAM0SIZE=131072
-CONFIG_ARCH_EXTSRAM1=n
-CONFIG_ARCH_EXTSRAM1HEAP=n
-CONFIG_ARCH_EXTSRAM1SIZE=131072
-CONFIG_ARCH_EXTDRAM=n
-CONFIG_ARCH_EXTDRAMHEAP=n
-CONFIG_ARCH_EXTDRAMSIZE=67108864
-CONFIG_ARCH_EXTNAND=n
-CONFIG_ARCH_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_EXTDRAM=n
+CONFIG_LPC31_EXTDRAMHEAP=n
+CONFIG_LPC31_EXTDRAMSIZE=67108864
+CONFIG_LPC31_EXTNAND=n
+CONFIG_LPC31_EXTNANDSIZE=67108864
 
 #
 # LPC31XX specific device driver settings
diff --git a/configs/ea3152/README.txt b/configs/ea3152/README.txt
index e405c6a2178..ef502eb905c 100644
--- a/configs/ea3152/README.txt
+++ b/configs/ea3152/README.txt
@@ -376,23 +376,23 @@ ARM/EA3152-specific Configuration Options
 
   External memory available on the board (see also CONFIG_MM_REGIONS)
 
-    CONFIG_ARCH_EXTSRAM0 - Select if external SRAM0 is present
-    CONFIG_ARCH_EXTSRAM0HEAP - Select if external SRAM0 should be
+    CONFIG_LPC31_EXTSRAM0 - Select if external SRAM0 is present
+    CONFIG_LPC31_EXTSRAM0HEAP - Select if external SRAM0 should be
       configured as part of the NuttX heap.
-    CONFIG_ARCH_EXTSRAM0SIZE - Size (in bytes) of the installed
+    CONFIG_LPC31_EXTSRAM0SIZE - Size (in bytes) of the installed
       external SRAM0 memory
-    CONFIG_ARCH_EXTSRAM1 - Select if external SRAM1 is present
-    CONFIG_ARCH_EXTSRAM1HEAP - Select if external SRAM1 should be
+    CONFIG_LPC31_EXTSRAM1 - Select if external SRAM1 is present
+    CONFIG_LPC31_EXTSRAM1HEAP - Select if external SRAM1 should be
       configured as part of the NuttX heap.
-    CONFIG_ARCH_EXTSRAM1SIZE - Size (in bytes) of the installed
+    CONFIG_LPC31_EXTSRAM1SIZE - Size (in bytes) of the installed
       external SRAM1 memory
-    CONFIG_ARCH_EXTDRAM - Select if external SDRAM is present
-    CONFIG_ARCH_EXTDRAMHEAP - Select if external SDRAM should be
+    CONFIG_LPC31_EXTDRAM - Select if external SDRAM is present
+    CONFIG_LPC31_EXTDRAMHEAP - Select if external SDRAM should be
       configured as part of the NuttX heap.
-    CONFIG_ARCH_EXTDRAMSIZE - Size (in bytes) of the installed
+    CONFIG_LPC31_EXTDRAMSIZE - Size (in bytes) of the installed
       external SDRAM memory
-    CONFIG_ARCH_EXTNAND - Select if external NAND is present
-    CONFIG_ARCH_EXTNANDSIZE - Size (in bytes) of the installed
+    CONFIG_LPC31_EXTNAND - Select if external NAND is present
+    CONFIG_LPC31_EXTNANDSIZE - Size (in bytes) of the installed
       external NAND memory
 
   LPC315X specific device driver settings
diff --git a/configs/ea3152/ostest/defconfig b/configs/ea3152/ostest/defconfig
index 377d8fb9909..78700547cb8 100644
--- a/configs/ea3152/ostest/defconfig
+++ b/configs/ea3152/ostest/defconfig
@@ -79,17 +79,17 @@ CONFIG_LPC31_UART=y
 #
 # Exernal memory available on the board (see also CONFIG_MM_REGIONS)
 #
-CONFIG_ARCH_EXTSRAM0=n
-CONFIG_ARCH_EXTSRAM0HEAP=n
-CONFIG_ARCH_EXTSRAM0SIZE=131072
-CONFIG_ARCH_EXTSRAM1=n
-CONFIG_ARCH_EXTSRAM1HEAP=n
-CONFIG_ARCH_EXTSRAM1SIZE=131072
-CONFIG_ARCH_EXTDRAM=n
-CONFIG_ARCH_EXTDRAMHEAP=n
-CONFIG_ARCH_EXTDRAMSIZE=67108864
-CONFIG_ARCH_EXTNAND=n
-CONFIG_ARCH_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_EXTDRAM=n
+CONFIG_LPC31_EXTDRAMHEAP=n
+CONFIG_LPC31_EXTDRAMSIZE=67108864
+CONFIG_LPC31_EXTNAND=n
+CONFIG_LPC31_EXTNANDSIZE=67108864
 
 #
 # LPC31XX specific device driver settings
diff --git a/configs/ea3152/src/Makefile b/configs/ea3152/src/Makefile
index c184838d51b..df33bbceafa 100644
--- a/configs/ea3152/src/Makefile
+++ b/configs/ea3152/src/Makefile
@@ -44,7 +44,7 @@ CSRCS		= up_boot.c up_clkinit.c
 ifeq ($(CONFIG_ARCH_BUTTONS),y)
 CSRCS		+= up_buttons.c
 endif
-ifeq ($(CONFIG_ARCH_EXTDRAM),y)
+ifeq ($(CONFIG_LPC31_EXTDRAM),y)
 CSRCS		+= up_mem.c
 endif
 ifeq ($(CONFIG_ARCH_LEDS),y)
diff --git a/configs/ea3152/src/ea3152_internal.h b/configs/ea3152/src/ea3152_internal.h
index 84fab133847..f55bbd173bd 100644
--- a/configs/ea3152/src/ea3152_internal.h
+++ b/configs/ea3152/src/ea3152_internal.h
@@ -86,7 +86,7 @@
  *
  ************************************************************************************/
 
-#ifdef CONFIG_ARCH_EXTDRAM
+#ifdef CONFIG_LPC31_EXTDRAM
 extern void lpc31_meminitialize(void);
 #endif
 
diff --git a/configs/ea3152/src/up_boot.c b/configs/ea3152/src/up_boot.c
index 066808b2f8e..df599b305d2 100644
--- a/configs/ea3152/src/up_boot.c
+++ b/configs/ea3152/src/up_boot.c
@@ -75,7 +75,7 @@ void lpc31_boardinitialize(void)
 {
   /* Initialize configured, external memory resources */
 
-#ifdef CONFIG_ARCH_EXTDRAM
+#ifdef CONFIG_LPC31_EXTDRAM
   lpc31_meminitialize();
 #endif
 
diff --git a/configs/ea3152/src/up_mem.c b/configs/ea3152/src/up_mem.c
index 4ac716f0619..d4c0d8c8b58 100644
--- a/configs/ea3152/src/up_mem.c
+++ b/configs/ea3152/src/up_mem.c
@@ -59,7 +59,7 @@
 #include "lpc31_mpmc.h"
 #include "ea3152_internal.h"
 
-#ifdef CONFIG_ARCH_EXTDRAM
+#ifdef CONFIG_LPC31_EXTDRAM
 
 /****************************************************************************
  * Pre-processor Definitions
@@ -356,4 +356,4 @@ void lpc31_meminitialize(void)
 
   lpc31_sdraminitialize();
 }
-#endif /* CONFIG_ARCH_EXTDRAM */
+#endif /* CONFIG_LPC31_EXTDRAM */
diff --git a/configs/open1788/README.txt b/configs/open1788/README.txt
index f4a269f58c0..1425db71899 100644
--- a/configs/open1788/README.txt
+++ b/configs/open1788/README.txt
@@ -508,8 +508,8 @@ CONFIGURATION
        the configuration in the following ways:
 
        CONFIG_LPC17_EMC=y                  : Enable the EMC
-       CONFIG_ARCH_EXTDRAM=y               : Configure external DRAM
-       CONFIG_ARCH_EXTDRAMSIZE=67108864    : DRAM size 2x256/8 = 64MB
+       CONFIG_LPC17_EXTDRAM=y               : Configure external DRAM
+       CONFIG_LPC17_EXTDRAMSIZE=67108864    : DRAM size 2x256/8 = 64MB
        CONFIG_SYSTEM_RAMTEST=y             : Enable the RAM test built-in
 
        In this configuration, the SDRAM is not added to heap and so is
diff --git a/configs/open1788/include/board.h b/configs/open1788/include/board.h
index e054c540096..ac5feb64c0d 100644
--- a/configs/open1788/include/board.h
+++ b/configs/open1788/include/board.h
@@ -201,7 +201,7 @@
  */
 
 #ifdef CONFIG_LPC17_EMC
-#if defined(CONFIG_ARCH_EXTNAND) || defined(CONFIG_ARCH_EXTDRAM)
+#if defined(CONFIG_LPC17_EXTNAND) || defined(CONFIG_LPC17_EXTDRAM)
 #  define BOARD_CMDDLY             17
 #  define BOARD_FBCLKDLY           17
 #  define BOARD_CLKOUT0DLY         1
diff --git a/configs/open1788/knsh/defconfig b/configs/open1788/knsh/defconfig
index 8295097d380..d93870f8f9b 100755
--- a/configs/open1788/knsh/defconfig
+++ b/configs/open1788/knsh/defconfig
@@ -214,16 +214,16 @@ CONFIG_ARCH_HAVE_EXTNAND=y
 CONFIG_ARCH_HAVE_EXTNOR=y
 CONFIG_ARCH_HAVE_EXTDRAM=y
 CONFIG_ARCH_HAVE_EXTSRAM0=y
-CONFIG_ARCH_EXTNAND=y
-CONFIG_ARCH_EXTNANDSIZE=134217728
-CONFIG_ARCH_EXTNOR=y
-CONFIG_ARCH_EXTNORSIZE=4194304
-CONFIG_ARCH_EXTDRAM=y
-CONFIG_ARCH_EXTDRAMSIZE=67108864
-CONFIG_ARCH_EXTDRAMHEAP=y
-CONFIG_ARCH_EXTSRAM0=y
-CONFIG_ARCH_EXTSRAM0SIZE=131072
-CONFIG_ARCH_EXTSRAM0HEAP=y
+CONFIG_LPC17_EXTNAND=y
+CONFIG_LPC17_EXTNANDSIZE=134217728
+CONFIG_LPC17_EXTNOR=y
+CONFIG_LPC17_EXTNORSIZE=4194304
+CONFIG_LPC17_EXTDRAM=y
+CONFIG_LPC17_EXTDRAMSIZE=67108864
+CONFIG_LPC17_EXTDRAMHEAP=y
+CONFIG_LPC17_EXTSRAM0=y
+CONFIG_LPC17_EXTSRAM0SIZE=131072
+CONFIG_LPC17_EXTSRAM0HEAP=y
 
 #
 # Architecture Options
diff --git a/configs/open1788/nxlines/defconfig b/configs/open1788/nxlines/defconfig
index dcf6b98f77e..68957e1faec 100644
--- a/configs/open1788/nxlines/defconfig
+++ b/configs/open1788/nxlines/defconfig
@@ -209,12 +209,12 @@ CONFIG_ARCH_HAVE_EXTNAND=y
 CONFIG_ARCH_HAVE_EXTNOR=y
 CONFIG_ARCH_HAVE_EXTDRAM=y
 CONFIG_ARCH_HAVE_EXTSRAM0=y
-# CONFIG_ARCH_EXTNAND is not set
-# CONFIG_ARCH_EXTNOR is not set
-CONFIG_ARCH_EXTDRAM=y
-CONFIG_ARCH_EXTDRAMSIZE=67108864
-CONFIG_ARCH_EXTDRAMHEAP=y
-# CONFIG_ARCH_EXTSRAM0 is not set
+# CONFIG_LPC17_EXTNAND is not set
+# CONFIG_LPC17_EXTNOR is not set
+CONFIG_LPC17_EXTDRAM=y
+CONFIG_LPC17_EXTDRAMSIZE=67108864
+CONFIG_LPC17_EXTDRAMHEAP=y
+# CONFIG_LPC17_EXTSRAM0 is not set
 
 #
 # Architecture Options
diff --git a/configs/open1788/src/Makefile b/configs/open1788/src/Makefile
index fd73a9686bc..44821e7fbd9 100644
--- a/configs/open1788/src/Makefile
+++ b/configs/open1788/src/Makefile
@@ -41,15 +41,15 @@ ASRCS =
 CSRCS = lpc17_boardinitialize.c lpc17_ssp.c
 
 ifeq ($(CONFIG_LPC17_EMC),y)
-ifeq ($(CONFIG_ARCH_EXTNOR),y)
+ifeq ($(CONFIG_LPC17_EXTNOR),y)
   CSRCS += lpc17_norinitialize.c
 endif
 
-ifeq ($(CONFIG_ARCH_EXTNAND),y)
+ifeq ($(CONFIG_LPC17_EXTNAND),y)
   CSRCS += lpc17_nandinitialize.c
 endif
 
-ifeq ($(CONFIG_ARCH_EXTDRAM),y)
+ifeq ($(CONFIG_LPC17_EXTDRAM),y)
   CSRCS += lpc17_sdraminitialize.c
 endif
 endif
diff --git a/configs/open1788/src/lpc17_boardinitialize.c b/configs/open1788/src/lpc17_boardinitialize.c
index 9e106bb3bc9..0143e58b344 100644
--- a/configs/open1788/src/lpc17_boardinitialize.c
+++ b/configs/open1788/src/lpc17_boardinitialize.c
@@ -79,13 +79,13 @@ void lpc17_boardinitialize(void)
 
 #ifdef CONFIG_LPC17_EMC
   lpc17_emcinitialize();
-#ifdef CONFIG_ARCH_EXTDRAM
+#ifdef CONFIG_LPC17_EXTDRAM
   open1788_sdram_initialize();
 #endif
-#ifdef CONFIG_ARCH_EXTNOR
+#ifdef CONFIG_LPC17_EXTNOR
   open1788_nor_initialize();
 #endif
-#ifdef CONFIG_ARCH_EXTNAND
+#ifdef CONFIG_LPC17_EXTNAND
   open1788_nand_initialize();
 #endif
 #endif
diff --git a/configs/open1788/src/lpc17_nandinitialize.c b/configs/open1788/src/lpc17_nandinitialize.c
index a0d658759d9..75a6f5a3150 100644
--- a/configs/open1788/src/lpc17_nandinitialize.c
+++ b/configs/open1788/src/lpc17_nandinitialize.c
@@ -49,7 +49,7 @@
 
 #include "open1788.h"
 
-#if defined(CONFIG_LPC17_EMC) && defined(CONFIG_ARCH_EXTNAND)
+#if defined(CONFIG_LPC17_EMC) && defined(CONFIG_LPC17_EXTNAND)
 
 /************************************************************************************
  * Definitions
@@ -98,4 +98,4 @@ void open1788_nand_initialize(void)
   lpc17_gpioconfig(GPIO_NAND_RB);
 }
 
-#endif /* CONFIG_LPC17_EMC && CONFIG_ARCH_EXTNAND */
+#endif /* CONFIG_LPC17_EMC && CONFIG_LPC17_EXTNAND */
diff --git a/configs/open1788/src/lpc17_norinitialize.c b/configs/open1788/src/lpc17_norinitialize.c
index 8cf21d540b6..c39527fa619 100644
--- a/configs/open1788/src/lpc17_norinitialize.c
+++ b/configs/open1788/src/lpc17_norinitialize.c
@@ -49,7 +49,7 @@
 
 #include "open1788.h"
 
-#if defined(CONFIG_LPC17_EMC) && defined(CONFIG_ARCH_EXTNOR)
+#if defined(CONFIG_LPC17_EMC) && defined(CONFIG_LPC17_EXTNOR)
 
 /************************************************************************************
  * Definitions
@@ -94,4 +94,4 @@ void open1788_nor_initialize(void)
   up_mdelay(10);
 }
 
-#endif /* CONFIG_LPC17_EMC && CONFIG_ARCH_EXTNOR */
+#endif /* CONFIG_LPC17_EMC && CONFIG_LPC17_EXTNOR */
diff --git a/configs/open1788/src/lpc17_sdraminitialize.c b/configs/open1788/src/lpc17_sdraminitialize.c
index 818f1ade43c..d0081ac18c2 100644
--- a/configs/open1788/src/lpc17_sdraminitialize.c
+++ b/configs/open1788/src/lpc17_sdraminitialize.c
@@ -52,7 +52,7 @@
 
 #include "open1788.h"
 
-#if defined(CONFIG_LPC17_EMC) && defined(CONFIG_ARCH_EXTDRAM)
+#if defined(CONFIG_LPC17_EMC) && defined(CONFIG_LPC17_EXTDRAM)
 
 /************************************************************************************
  * Definitions
@@ -78,13 +78,13 @@
 
 /* Set up for 32-bit SDRAM at CS0 */
 
-#define CONFIG_ARCH_SDRAM_32BIT
+#define CONFIG_LPC17_SDRAM_32BIT
 
-#ifdef CONFIG_ARCH_SDRAM_16BIT 
+#ifdef CONFIG_LPC17_SDRAM_16BIT 
 #  define SDRAM_SIZE        0x02000000 /* 256Mbit */
-#else /* if defined(CONFIG_ARCH_SDRAM_32BIT) */
-#  undef CONFIG_ARCH_SDRAM_32BIT
-#  define CONFIG_ARCH_SDRAM_32BIT 1
+#else /* if defined(CONFIG_LPC17_SDRAM_32BIT) */
+#  undef CONFIG_LPC17_SDRAM_32BIT
+#  define CONFIG_LPC17_SDRAM_32BIT 1
 #  define SDRAM_SIZE        0x04000000 /* 512Mbit */
 #endif
 
@@ -109,7 +109,7 @@
 void open1788_sdram_initialize(void)
 {
   uint32_t regval;
-#ifdef CONFIG_ARCH_SDRAM_16BIT
+#ifdef CONFIG_LPC17_SDRAM_16BIT
   volatile uint16_t dummy;
 #else
   volatile uint32_t dummy;
@@ -159,7 +159,7 @@ void open1788_sdram_initialize(void)
 
   putreg32(MDKCFG_RASCAS0VAL, LPC17_EMC_DYNAMICRASCAS0);
 
-  #ifdef CONFIG_ARCH_SDRAM_16BIT
+  #ifdef CONFIG_LPC17_SDRAM_16BIT
     /* For Manley lpc1778 SDRAM: H57V2562GTR-75C, 256Mb, 16Mx16, 4 banks, row=13, column=9:
      *
      * 256Mb, 16Mx16, 4 banks, row=13, column=9, RBC
@@ -168,7 +168,7 @@ void open1788_sdram_initialize(void)
   putreg32(EMC_DYNAMICCONFIG_MD_SDRAM |  EMC_DYNAMICCONFIG_AM0(13),
            LPC17_EMC_DYNAMICCONFIG0);
 
-#elif defined CONFIG_ARCH_SDRAM_32BIT
+#elif defined CONFIG_LPC17_SDRAM_32BIT
     /* 256Mb, 16Mx16, 4 banks, row=13, column=9, RBC */
 
   putreg32(EMC_DYNAMICCONFIG_MD_SDRAM |  EMC_DYNAMICCONFIG_AM0(13) | EMC_DYNAMICCONFIG_AM1,
@@ -210,9 +210,9 @@ void open1788_sdram_initialize(void)
   putreg32(EMC_DYNAMICCONTROL_CE | EMC_DYNAMICCONTROL_CS | EMC_DYNAMICCONTROL_I_MODE,
            LPC17_EMC_DYNAMICCONTROL);
 
-#ifdef CONFIG_ARCH_SDRAM_16BIT
+#ifdef CONFIG_LPC17_SDRAM_16BIT
   dummy = getreg16(SDRAM_BASE | (0x33 << 12));  /* 8 burst, 3 CAS latency */
-#elif defined CONFIG_ARCH_SDRAM_32BIT
+#elif defined CONFIG_LPC17_SDRAM_32BIT
   dummy = getreg32(SDRAM_BASE | (0x32 << 13)); /* 4 burst, 3 CAS latency */
 #endif
 
@@ -233,4 +233,4 @@ void open1788_sdram_initialize(void)
   putreg32(regval, LPC17_SYSCON_EMCDLYCTL);
 }
 
-#endif /* CONFIG_LPC17_EMC && CONFIG_ARCH_EXTDRAM */
+#endif /* CONFIG_LPC17_EMC && CONFIG_LPC17_EXTDRAM */
diff --git a/configs/open1788/src/open1788.h b/configs/open1788/src/open1788.h
index 9c5b49a191a..7e63a44bcf1 100644
--- a/configs/open1788/src/open1788.h
+++ b/configs/open1788/src/open1788.h
@@ -184,7 +184,7 @@ void weak_function open1788_sspinitialize(void);
  ************************************************************************************/
 
 #ifdef CONFIG_LPC17_EMC
-#ifdef CONFIG_ARCH_EXTDRAM
+#ifdef CONFIG_LPC17_EXTDRAM
 void open1788_sdram_initialize(void);
 #endif
 
@@ -196,7 +196,7 @@ void open1788_sdram_initialize(void);
  *
  ************************************************************************************/
 
-#ifdef CONFIG_ARCH_EXTNOR
+#ifdef CONFIG_LPC17_EXTNOR
 void open1788_nor_initialize(void);
 #endif
 
@@ -208,7 +208,7 @@ void open1788_nor_initialize(void);
  *
  ************************************************************************************/
 
-#ifdef CONFIG_ARCH_EXTNAND
+#ifdef CONFIG_LPC17_EXTNAND
 void open1788_nand_initialize(void);
 #endif
 #endif /* CONFIG_LPC17_EMC */
diff --git a/configs/sam3u-ek/nsh/defconfig b/configs/sam3u-ek/nsh/defconfig
index efe33a84eb6..6030251eadf 100644
--- a/configs/sam3u-ek/nsh/defconfig
+++ b/configs/sam3u-ek/nsh/defconfig
@@ -177,10 +177,10 @@ CONFIG_ARCH_HAVE_EXTNAND=y
 CONFIG_ARCH_HAVE_EXTNOR=y
 CONFIG_ARCH_HAVE_EXTSRAM0=y
 CONFIG_ARCH_HAVE_EXTSRAM1=y
-# CONFIG_ARCH_EXTNAND is not set
-# CONFIG_ARCH_EXTNOR is not set
-# CONFIG_ARCH_EXTSRAM0 is not set
-# CONFIG_ARCH_EXTSRAM1 is not set
+# CONFIG_SAM34_EXTNAND is not set
+# CONFIG_SAM34_EXTNOR is not set
+# CONFIG_SAM34_EXTSRAM0 is not set
+# CONFIG_SAM34_EXTSRAM1 is not set
 
 #
 # Architecture Options
diff --git a/configs/sam3u-ek/nxwm/defconfig b/configs/sam3u-ek/nxwm/defconfig
index 923528106e0..fc170c71f42 100644
--- a/configs/sam3u-ek/nxwm/defconfig
+++ b/configs/sam3u-ek/nxwm/defconfig
@@ -180,10 +180,10 @@ CONFIG_ARCH_HAVE_EXTNAND=y
 CONFIG_ARCH_HAVE_EXTNOR=y
 CONFIG_ARCH_HAVE_EXTSRAM0=y
 CONFIG_ARCH_HAVE_EXTSRAM1=y
-# CONFIG_ARCH_EXTNAND is not set
-# CONFIG_ARCH_EXTNOR is not set
-# CONFIG_ARCH_EXTSRAM0 is not set
-# CONFIG_ARCH_EXTSRAM1 is not set
+# CONFIG_SAM34_EXTNAND is not set
+# CONFIG_SAM34_EXTNOR is not set
+# CONFIG_SAM34_EXTSRAM0 is not set
+# CONFIG_SAM34_EXTSRAM1 is not set
 
 #
 # Architecture Options
diff --git a/configs/sam4s-xplained/README.txt b/configs/sam4s-xplained/README.txt
index 91ca0e38448..bff737db8a4 100644
--- a/configs/sam4s-xplained/README.txt
+++ b/configs/sam4s-xplained/README.txt
@@ -594,8 +594,8 @@ Configuration sub-directories
        for the on-board SRAM (1MB).
 
        System Type -> External Memory Configuration       
-         CONFIG_ARCH_EXTSRAM0=y              : Select SRAM on CS0
-         CONFIG_ARCH_EXTSRAM0SIZE=1048576    : Size=1MB
+         CONFIG_SAM34_EXTSRAM0=y              : Select SRAM on CS0
+         CONFIG_SAM34_EXTSRAM0SIZE=1048576    : Size=1MB
 
        Now what are you going to do with the SRAM.  There are two choices:
 
@@ -603,7 +603,7 @@ Configuration sub-directories
            external SRAM:
 
            System Type -> External Memory Configuration       
-             CONFIG_ARCH_EXTSRAM0HEAP=n      : Don't add to heap
+             CONFIG_SAM34_EXTSRAM0HEAP=n      : Don't add to heap
 
            Application Configuration -> System NSH Add-Ons
              CONFIG_SYSTEM_RAMTEST=y         : Enable the RAM test built-in
@@ -637,7 +637,7 @@ Configuration sub-directories
            configuration as follows:
 
            System Type -> External Memory Configuration       
-             CONFIG_ARCH_EXTSRAM0HEAP=y     : Add external RAM to heap
+             CONFIG_SAM34_EXTSRAM0HEAP=y     : Add external RAM to heap
 
            Memory Management
              -CONFIG_MM_REGIONS=1           : Only the internal SRAM
diff --git a/configs/sam4s-xplained/nsh/defconfig b/configs/sam4s-xplained/nsh/defconfig
index b4f877e4357..421c05c9f7f 100644
--- a/configs/sam4s-xplained/nsh/defconfig
+++ b/configs/sam4s-xplained/nsh/defconfig
@@ -179,10 +179,10 @@ CONFIG_ARCH_HAVE_EXTNAND=y
 CONFIG_ARCH_HAVE_EXTNOR=y
 CONFIG_ARCH_HAVE_EXTSRAM0=y
 CONFIG_ARCH_HAVE_EXTSRAM1=y
-# CONFIG_ARCH_EXTNAND is not set
-# CONFIG_ARCH_EXTNOR is not set
-# CONFIG_ARCH_EXTSRAM0 is not set
-# CONFIG_ARCH_EXTSRAM1 is not set
+# CONFIG_SAM34_EXTNAND is not set
+# CONFIG_SAM34_EXTNOR is not set
+# CONFIG_SAM34_EXTSRAM0 is not set
+# CONFIG_SAM34_EXTSRAM1 is not set
 
 #
 # Architecture Options
diff --git a/configs/sam4s-xplained/src/Makefile b/configs/sam4s-xplained/src/Makefile
index 4103dd7cfd2..0a2ee09550e 100644
--- a/configs/sam4s-xplained/src/Makefile
+++ b/configs/sam4s-xplained/src/Makefile
@@ -42,7 +42,7 @@ AOBJS = $(ASRCS:.S=$(OBJEXT))
 
 CSRCS = sam_boot.c
 
-ifeq ($(CONFIG_ARCH_EXTSRAM0),y)
+ifeq ($(CONFIG_SAM34_EXTSRAM0),y)
 CSRCS += sam_sram.c
 endif
 
diff --git a/configs/sam4s-xplained/src/sam4s-xplained.h b/configs/sam4s-xplained/src/sam4s-xplained.h
index f84afc5eda1..941c99df2b3 100644
--- a/configs/sam4s-xplained/src/sam4s-xplained.h
+++ b/configs/sam4s-xplained/src/sam4s-xplained.h
@@ -131,7 +131,7 @@
  *
  ************************************************************************************/
 
-#ifdef CONFIG_ARCH_EXTSRAM0
+#ifdef CONFIG_SAM34_EXTSRAM0
 void sam_sram_initialize(void);
 #endif
 
diff --git a/configs/sam4s-xplained/src/sam_boot.c b/configs/sam4s-xplained/src/sam_boot.c
index a302d3efbf5..bf32af5c191 100644
--- a/configs/sam4s-xplained/src/sam_boot.c
+++ b/configs/sam4s-xplained/src/sam_boot.c
@@ -67,7 +67,7 @@
 
 void sam_boardinitialize(void)
 {
-#ifdef CONFIG_ARCH_EXTSRAM0
+#ifdef CONFIG_SAM34_EXTSRAM0
   /* Configure and enable SRAM on board the SAM4S Xplained */
 
   sam_sram_initialize();
diff --git a/configs/sam4s-xplained/src/sam_sram.c b/configs/sam4s-xplained/src/sam_sram.c
index 250eda4d84c..51a193e333d 100644
--- a/configs/sam4s-xplained/src/sam_sram.c
+++ b/configs/sam4s-xplained/src/sam_sram.c
@@ -46,7 +46,7 @@
 #include "chip/sam3u_smc.h"
 #include "sam4s-xplained.h"
 
-#ifdef CONFIG_ARCH_EXTSRAM0
+#ifdef CONFIG_SAM34_EXTSRAM0
 
 /************************************************************************************
  * Pre-processor Definitions
@@ -131,4 +131,4 @@ void sam_sram_initialize(void)
   sam_gpiowrite(GPIO_EBI_NLB, false);
 }
 
-#endif /* CONFIG_ARCH_EXTSRAM0 */
+#endif /* CONFIG_SAM34_EXTSRAM0 */
diff --git a/configs/sama5d3x-ek/ostest/Make.defs b/configs/sama5d3x-ek/ostest/Make.defs
index c6128ff0682..a72c47d93d6 100644
--- a/configs/sama5d3x-ek/ostest/Make.defs
+++ b/configs/sama5d3x-ek/ostest/Make.defs
@@ -37,7 +37,7 @@ include ${TOPDIR}/.config
 include ${TOPDIR}/tools/Config.mk
 include ${TOPDIR}$(DELIM)arch$(DELIM)arm$(DELIM)src$(DELIM)armv7-a$(DELIM)Toolchain.defs
 
-ifeq ($(CONFIG_SAMA5_BOOT_SRAM),y)
+ifeq ($(CONFIG_SAMA5_BOOT_ISRAM),y)
   LDSCRIPT = isram.ld
 endif
 ifeq ($(CONFIG_SAMA5_BOOT_SDRAM),y)
diff --git a/configs/sama5d3x-ek/ostest/defconfig b/configs/sama5d3x-ek/ostest/defconfig
index f527d055cf6..f4a6eb9a17a 100644
--- a/configs/sama5d3x-ek/ostest/defconfig
+++ b/configs/sama5d3x-ek/ostest/defconfig
@@ -163,16 +163,20 @@ CONFIG_SAMA5_UART0=y
 # CONFIG_SAMA5_FUSE is not set
 # CONFIG_SAMA5_MPDDRC is not set
 # CONFIG_PIO_IRQ is not set
-CONFIG_SAMA5_BOOT_SRAM=y
-# CONFIG_SAMA5_BOOT_SDRAM is not set
-# CONFIG_SAMA5_BOOT_CS0FLASH is not set
-# CONFIG_SAMA5_BOOT_CS1FLASH is not set
-# CONFIG_SAMA5_BOOT_CS2FLASH is not set
-# CONFIG_SAMA5_BOOT_CS3FLASH is not set
 
 #
 # External Memory Configuration
 #
+# CONFIG_SAMA5_DDRCS is not set
+# CONFIG_SAMA5_EBICS0 is not set
+# CONFIG_SAMA5_EBICS1 is not set
+# CONFIG_SAMA5_EBICS2 is not set
+# CONFIG_SAMA5_EBICS3 is not set
+CONFIG_SAMA5_BOOT_ISRAM=y
+
+#
+# Heap Configuration
+#
 
 #
 # Architecture Options
@@ -383,7 +387,7 @@ CONFIG_DISABLE_MOUNTPOINT=y
 #
 # CONFIG_MM_MULTIHEAP is not set
 # CONFIG_MM_SMALL is not set
-CONFIG_MM_REGIONS=2
+CONFIG_MM_REGIONS=1
 # CONFIG_GRAN is not set
 
 #