Add ARM architecture type to configuration

git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@1794 42af7a65-404d-4744-a932-0658087f49c3

22 files changed, 117 insertions, 41 deletions

diff --git a/nuttx/configs/c5471evm/README.txt b/nuttx/configs/c5471evm/README.txt
index f984a6a90..1e127d565 100644
--- a/nuttx/configs/c5471evm/README.txt
+++ b/nuttx/configs/c5471evm/README.txt
@@ -39,10 +39,14 @@ ARM/C5471-specific Configuration Options
 
 	   CONFIG_ARCH=arm
 
-	CONFIG_ARCH_name - For use in C code:
+	CONFIG_ARCH_family - For use in C code:
 
 	   CONFIG_ARCH_ARM=y
 
+	CONFIG_ARCH_architecture - For use in C code:
+
+	   CONFIG_ARCH_ARM7TDMI=y
+
 	CONFIG_ARCH_CHIP - Identifies the arch/*/chip subdirectory
 
 	   CONFIG_ARCH_CHIP=c5471
diff --git a/nuttx/configs/c5471evm/defconfig b/nuttx/configs/c5471evm/defconfig
index 5cf56d0cc..303a0c10c 100644
--- a/nuttx/configs/c5471evm/defconfig
+++ b/nuttx/configs/c5471evm/defconfig
@@ -37,9 +37,11 @@
 #
 # CONFIG_ARCH - identifies the arch subdirectory and, hence, the
 #   processor architecture.
-# CONFIG_ARCH_name - for use in C code.  This identifies the
-#   particular chip or SoC that the architecture is implemented
+# CONFIG_ARCH_family - for use in C code.  This identifies the
+#   particular chip family that the architecture is implemented
 #   in.
+# CONFIG_ARCH_architecture - for use in C code.  This identifies the
+#   specific architecture within the chip familyl.
 # CONFIG_ARCH_CHIP - Identifies the arch/*/chip subdirectory
 # CONFIG_ARCH_CHIP_name - For use in C code
 # CONFIG_ARCH_BOARD - identifies the configs subdirectory and, hence,
@@ -59,6 +61,7 @@
 #
 CONFIG_ARCH=arm
 CONFIG_ARCH_ARM=y
+CONFIG_ARCH_ARM7TDMI=y
 CONFIG_ARCH_CHIP=c5471
 CONFIG_ARCH_CHIP_C5471=y
 CONFIG_ARCH_BOARD=c5471evm
diff --git a/nuttx/configs/c5471evm/dhcpconfig b/nuttx/configs/c5471evm/dhcpconfig
index 7ffaeb224..abd4664b1 100644
--- a/nuttx/configs/c5471evm/dhcpconfig
+++ b/nuttx/configs/c5471evm/dhcpconfig
@@ -37,9 +37,11 @@
 #
 # CONFIG_ARCH - identifies the arch subdirectory and, hence, the
 #   processor architecture.
-# CONFIG_ARCH_name - for use in C code.  This identifies the
-#   particular chip or SoC that the architecture is implemented
+# CONFIG_ARCH_family - for use in C code.  This identifies the
+#   particular chip family that the architecture is implemented
 #   in.
+# CONFIG_ARCH_architecture - for use in C code.  This identifies the
+#   specific architecture within the chip familyl.
 # CONFIG_ARCH_CHIP - Identifies the arch/*/chip subdirectory
 # CONFIG_ARCH_CHIP_name - For use in C code
 # CONFIG_ARCH_BOARD - identifies the configs subdirectory and, hence,
@@ -59,6 +61,7 @@
 #
 CONFIG_ARCH=arm
 CONFIG_ARCH_ARM=y
+CONFIG_ARCH_ARM7TDMI=y
 CONFIG_ARCH_CHIP=c5471
 CONFIG_ARCH_CHIP_C5471=y
 CONFIG_ARCH_BOARD=c5471evm
diff --git a/nuttx/configs/c5471evm/netconfig b/nuttx/configs/c5471evm/netconfig
index 4f61659d3..31e79d86c 100644
--- a/nuttx/configs/c5471evm/netconfig
+++ b/nuttx/configs/c5471evm/netconfig
@@ -37,9 +37,11 @@
 #
 # CONFIG_ARCH - identifies the arch subdirectory and, hence, the
 #   processor architecture.
-# CONFIG_ARCH_name - for use in C code.  This identifies the
-#   particular chip or SoC that the architecture is implemented
+# CONFIG_ARCH_family - for use in C code.  This identifies the
+#   particular chip family that the architecture is implemented
 #   in.
+# CONFIG_ARCH_architecture - for use in C code.  This identifies the
+#   specific architecture within the chip familyl.
 # CONFIG_ARCH_CHIP - Identifies the arch/*/chip subdirectory
 # CONFIG_ARCH_CHIP_name - For use in C code
 # CONFIG_ARCH_BOARD - identifies the configs subdirectory and, hence,
@@ -59,6 +61,7 @@
 #
 CONFIG_ARCH=arm
 CONFIG_ARCH_ARM=y
+CONFIG_ARCH_ARM7TDMI=y
 CONFIG_ARCH_CHIP=c5471
 CONFIG_ARCH_CHIP_C5471=y
 CONFIG_ARCH_BOARD=c5471evm
diff --git a/nuttx/configs/c5471evm/nshconfig b/nuttx/configs/c5471evm/nshconfig
index ae00518f4..260db041f 100644
--- a/nuttx/configs/c5471evm/nshconfig
+++ b/nuttx/configs/c5471evm/nshconfig
@@ -37,9 +37,11 @@
 #
 # CONFIG_ARCH - identifies the arch subdirectory and, hence, the
 #   processor architecture.
-# CONFIG_ARCH_name - for use in C code.  This identifies the
-#   particular chip or SoC that the architecture is implemented
+# CONFIG_ARCH_family - for use in C code.  This identifies the
+#   particular chip family that the architecture is implemented
 #   in.
+# CONFIG_ARCH_architecture - for use in C code.  This identifies the
+#   specific architecture within the chip familyl.
 # CONFIG_ARCH_CHIP - Identifies the arch/*/chip subdirectory
 # CONFIG_ARCH_CHIP_name - For use in C code
 # CONFIG_ARCH_BOARD - identifies the configs subdirectory and, hence,
@@ -59,6 +61,7 @@
 #
 CONFIG_ARCH=arm
 CONFIG_ARCH_ARM=y
+CONFIG_ARCH_ARM7TDMI=y
 CONFIG_ARCH_CHIP=c5471
 CONFIG_ARCH_CHIP_C5471=y
 CONFIG_ARCH_BOARD=c5471evm
diff --git a/nuttx/configs/eagle100/README.txt b/nuttx/configs/eagle100/README.txt
index 8f93fd82d..fe72213c7 100644
--- a/nuttx/configs/eagle100/README.txt
+++ b/nuttx/configs/eagle100/README.txt
@@ -83,10 +83,14 @@ Eagle100-specific Configuration Options
 
 	   CONFIG_ARCH=arm
 
-	CONFIG_ARCH_name - For use in C code:
+	CONFIG_ARCH_family - For use in C code:
 
 	   CONFIG_ARCH_ARM=y
 
+	CONFIG_ARCH_architecture - For use in C code:
+
+	   CONFIG_ARCH_CORTEXM3=y
+
 	CONFIG_ARCH_CHIP - Identifies the arch/*/chip subdirectory
 
 	   CONFIG_ARCH_CHIP=lm3s
diff --git a/nuttx/configs/eagle100/ostest/defconfig b/nuttx/configs/eagle100/ostest/defconfig
index 238ffe240..8f651378b 100644
--- a/nuttx/configs/eagle100/ostest/defconfig
+++ b/nuttx/configs/eagle100/ostest/defconfig
@@ -37,9 +37,11 @@
 #
 # CONFIG_ARCH - identifies the arch subdirectory and, hence, the
 #   processor architecture.
-# CONFIG_ARCH_name - for use in C code.  This identifies the
-#   particular chip or SoC that the architecture is implemented
+# CONFIG_ARCH_family - for use in C code.  This identifies the
+#   particular chip family that the architecture is implemented
 #   in.
+# CONFIG_ARCH_architecture - for use in C code.  This identifies the
+#   specific architecture within the chip familyl.
 # CONFIG_ARCH_CHIP - Identifies the arch/*/chip subdirectory
 # CONFIG_ARCH_CHIP_name - For use in C code
 # CONFIG_ARCH_BOARD - identifies the configs subdirectory and, hence,
@@ -67,6 +69,7 @@
 #   the delay actually is 100 seconds.
 CONFIG_ARCH=arm
 CONFIG_ARCH_ARM=y
+CONFIG_ARCH_CORTEXM3=y
 CONFIG_ARCH_CHIP=lm3s
 CONFIG_ARCH_CHIP_LM3S6918=y
 CONFIG_ARCH_BOARD=eagle100
@@ -430,9 +433,9 @@ CONFIG_BOOT_RUNFROMFLASH=n
 CONFIG_BOOT_COPYTORAM=n
 CONFIG_CUSTOM_STACK=n
 CONFIG_STACK_POINTER=
-CONFIG_IDLETHREAD_STACKSIZE=4096
+CONFIG_IDLETHREAD_STACKSIZE=1024
 CONFIG_USERMAIN_STACKSIZE=4096
 CONFIG_PTHREAD_STACK_MIN=256
-CONFIG_PTHREAD_STACK_DEFAULT=4096
+CONFIG_PTHREAD_STACK_DEFAULT=2048
 CONFIG_HEAP_BASE=
 CONFIG_HEAP_SIZE=
diff --git a/nuttx/configs/mcu123-lpc214x/README.txt b/nuttx/configs/mcu123-lpc214x/README.txt
index bceff817c..019bdc69d 100644
--- a/nuttx/configs/mcu123-lpc214x/README.txt
+++ b/nuttx/configs/mcu123-lpc214x/README.txt
@@ -53,10 +53,14 @@ ARM/LPC214X-specific Configuration Options
 
 	   CONFIG_ARCH=arm
 
-	CONFIG_ARCH_name - For use in C code:
+	CONFIG_ARCH_family - For use in C code:
 
 	   CONFIG_ARCH_ARM=y
 
+	CONFIG_ARCH_architecture - For use in C code:
+
+	   CONFIG_ARCH_ARM7TDMI=y
+
 	CONFIG_ARCH_CHIP - Identifies the arch/*/chip subdirectory
 
 	   CONFIG_ARCH_CHIP=c5471
diff --git a/nuttx/configs/mcu123-lpc214x/nsh/defconfig b/nuttx/configs/mcu123-lpc214x/nsh/defconfig
index bf44ee265..36a939f45 100644
--- a/nuttx/configs/mcu123-lpc214x/nsh/defconfig
+++ b/nuttx/configs/mcu123-lpc214x/nsh/defconfig
@@ -37,9 +37,11 @@
 #
 # CONFIG_ARCH - identifies the arch subdirectory and, hence, the
 #   processor architecture.
-# CONFIG_ARCH_name - for use in C code.  This identifies the
-#   particular chip or SoC that the architecture is implemented
+# CONFIG_ARCH_family - for use in C code.  This identifies the
+#   particular chip family that the architecture is implemented
 #   in.
+# CONFIG_ARCH_architecture - for use in C code.  This identifies the
+#   specific architecture within the chip familyl.
 # CONFIG_ARCH_CHIP - Identifies the arch/*/chip subdirectory
 # CONFIG_ARCH_CHIP_name - For use in C code
 # CONFIG_ARCH_BOARD - identifies the configs subdirectory and, hence,
@@ -57,6 +59,8 @@
 # CONFIG_ARCH_STACKDUMP - Do stack dumps after assertions
 #
 CONFIG_ARCH=arm
+CONFIG_ARCH_ARM=y
+CONFIG_ARCH_ARM7TDMI=y
 CONFIG_ARCH_CHIP=lpc214x
 CONFIG_ARCH_LPC2148=y
 CONFIG_ARCH_BOARD=mcu123-lpc214x
diff --git a/nuttx/configs/mcu123-lpc214x/ostest/defconfig b/nuttx/configs/mcu123-lpc214x/ostest/defconfig
index b7a87699c..a842b82c0 100644
--- a/nuttx/configs/mcu123-lpc214x/ostest/defconfig
+++ b/nuttx/configs/mcu123-lpc214x/ostest/defconfig
@@ -37,9 +37,11 @@
 #
 # CONFIG_ARCH - identifies the arch subdirectory and, hence, the
 #   processor architecture.
-# CONFIG_ARCH_name - for use in C code.  This identifies the
-#   particular chip or SoC that the architecture is implemented
+# CONFIG_ARCH_family - for use in C code.  This identifies the
+#   particular chip family that the architecture is implemented
 #   in.
+# CONFIG_ARCH_architecture - for use in C code.  This identifies the
+#   specific architecture within the chip familyl.
 # CONFIG_ARCH_CHIP - Identifies the arch/*/chip subdirectory
 # CONFIG_ARCH_CHIP_name - For use in C code
 # CONFIG_ARCH_BOARD - identifies the configs subdirectory and, hence,
@@ -57,6 +59,8 @@
 # CONFIG_ARCH_STACKDUMP - Do stack dumps after assertions
 #
 CONFIG_ARCH=arm
+CONFIG_ARCH_ARM=y
+CONFIG_ARCH_ARM7TDMI=y
 CONFIG_ARCH_CHIP=lpc214x
 CONFIG_ARCH_LPC2148=y
 CONFIG_ARCH_BOARD=mcu123-lpc214x
diff --git a/nuttx/configs/mcu123-lpc214x/usbserial/defconfig b/nuttx/configs/mcu123-lpc214x/usbserial/defconfig
index 8c0396ded..a9a41bfad 100644
--- a/nuttx/configs/mcu123-lpc214x/usbserial/defconfig
+++ b/nuttx/configs/mcu123-lpc214x/usbserial/defconfig
@@ -37,9 +37,11 @@
 #
 # CONFIG_ARCH - identifies the arch subdirectory and, hence, the
 #   processor architecture.
-# CONFIG_ARCH_name - for use in C code.  This identifies the
-#   particular chip or SoC that the architecture is implemented
+# CONFIG_ARCH_family - for use in C code.  This identifies the
+#   particular chip family that the architecture is implemented
 #   in.
+# CONFIG_ARCH_architecture - for use in C code.  This identifies the
+#   specific architecture within the chip familyl.
 # CONFIG_ARCH_CHIP - Identifies the arch/*/chip subdirectory
 # CONFIG_ARCH_CHIP_name - For use in C code
 # CONFIG_ARCH_BOARD - identifies the configs subdirectory and, hence,
@@ -57,6 +59,8 @@
 # CONFIG_ARCH_STACKDUMP - Do stack dumps after assertions
 #
 CONFIG_ARCH=arm
+CONFIG_ARCH_ARM=y
+CONFIG_ARCH_ARM7TDMI=y
 CONFIG_ARCH_CHIP=lpc214x
 CONFIG_ARCH_LPC2148=y
 CONFIG_ARCH_BOARD=mcu123-lpc214x
diff --git a/nuttx/configs/mcu123-lpc214x/usbstorage/defconfig b/nuttx/configs/mcu123-lpc214x/usbstorage/defconfig
index 71be91b4b..170acc236 100644
--- a/nuttx/configs/mcu123-lpc214x/usbstorage/defconfig
+++ b/nuttx/configs/mcu123-lpc214x/usbstorage/defconfig
@@ -37,9 +37,11 @@
 #
 # CONFIG_ARCH - identifies the arch subdirectory and, hence, the
 #   processor architecture.
-# CONFIG_ARCH_name - for use in C code.  This identifies the
-#   particular chip or SoC that the architecture is implemented
+# CONFIG_ARCH_family - for use in C code.  This identifies the
+#   particular chip family that the architecture is implemented
 #   in.
+# CONFIG_ARCH_architecture - for use in C code.  This identifies the
+#   specific architecture within the chip familyl.
 # CONFIG_ARCH_CHIP - Identifies the arch/*/chip subdirectory
 # CONFIG_ARCH_CHIP_name - For use in C code
 # CONFIG_ARCH_BOARD - identifies the configs subdirectory and, hence,
@@ -57,6 +59,8 @@
 # CONFIG_ARCH_STACKDUMP - Do stack dumps after assertions
 #
 CONFIG_ARCH=arm
+CONFIG_ARCH_ARM=y
+CONFIG_ARCH_ARM7TDMI=y
 CONFIG_ARCH_CHIP=lpc214x
 CONFIG_ARCH_LPC2148=y
 CONFIG_ARCH_BOARD=mcu123-lpc214x
diff --git a/nuttx/configs/mx1ads/README.txt b/nuttx/configs/mx1ads/README.txt
index a270bfa2b..1ff9ebac3 100644
--- a/nuttx/configs/mx1ads/README.txt
+++ b/nuttx/configs/mx1ads/README.txt
@@ -39,10 +39,14 @@ ARM/i.MX1-specific Configuration Options
 
 	   CONFIG_ARCH=arm
 
-	CONFIG_ARCH_name - For use in C code:
+	CONFIG_ARCH_family - For use in C code:
 
 	   CONFIG_ARCH_ARM=y
 
+	CONFIG_ARCH_architecture - For use in C code:
+
+	   CONFIG_ARCH_ARM920T=y
+
 	CONFIG_ARCH_CHIP - Identifies the arch/*/chip subdirectory
 
 	   CONFIG_ARCH_CHIP=imx
diff --git a/nuttx/configs/mx1ads/ostest/defconfig b/nuttx/configs/mx1ads/ostest/defconfig
index 65ff6d11a..9ae511171 100644
--- a/nuttx/configs/mx1ads/ostest/defconfig
+++ b/nuttx/configs/mx1ads/ostest/defconfig
@@ -37,9 +37,11 @@
 #
 # CONFIG_ARCH - identifies the arch subdirectory and, hence, the
 #   processor architecture.
-# CONFIG_ARCH_name - for use in C code.  This identifies the
-#   particular chip or SoC that the architecture is implemented
+# CONFIG_ARCH_family - for use in C code.  This identifies the
+#   particular chip family that the architecture is implemented
 #   in.
+# CONFIG_ARCH_architecture - for use in C code.  This identifies the
+#   specific architecture within the chip familyl.
 # CONFIG_ARCH_CHIP - Identifies the arch/*/chip subdirectory
 # CONFIG_ARCH_CHIP_name - For use in C code
 # CONFIG_ARCH_BOARD - identifies the configs subdirectory and, hence,
@@ -60,6 +62,7 @@
 #
 CONFIG_ARCH=arm
 CONFIG_ARCH_ARM=y
+CONFIG_ARCH_ARM920T=y
 CONFIG_ARCH_CHIP=imx
 CONFIG_ARCH_CHIP_IMX1=y
 CONFIG_ARCH_BOARD=mx1ads
diff --git a/nuttx/configs/ntosd-dm320/README.txt b/nuttx/configs/ntosd-dm320/README.txt
index 2a82b5bbb..a6234dad6 100644
--- a/nuttx/configs/ntosd-dm320/README.txt
+++ b/nuttx/configs/ntosd-dm320/README.txt
@@ -40,10 +40,14 @@ ARM/DM320-specific Configuration Options
 
 	   CONFIG_ARCH=arm
 
-	CONFIG_ARCH_name - For use in C code:
+	CONFIG_ARCH_family - For use in C code:
 
 	   CONFIG_ARCH_ARM=y
 
+	CONFIG_ARCH_architecture - For use in C code:
+
+	   CONFIG_ARCH_ARM926EJS=y
+
 	CONFIG_ARCH_CHIP - Identifies the arch/*/chip subdirectory
 
 	   CONFIG_ARCH_CHIP=dm320
diff --git a/nuttx/configs/ntosd-dm320/nettest/defconfig b/nuttx/configs/ntosd-dm320/nettest/defconfig
index 200e378dc..fc3eb10c6 100644
--- a/nuttx/configs/ntosd-dm320/nettest/defconfig
+++ b/nuttx/configs/ntosd-dm320/nettest/defconfig
@@ -37,9 +37,11 @@
 #
 # CONFIG_ARCH - identifies the arch subdirectory and, hence, the
 #   processor architecture.
-# CONFIG_ARCH_name - for use in C code.  This identifies the
-#   particular chip or SoC that the architecture is implemented
+# CONFIG_ARCH_family - for use in C code.  This identifies the
+#   particular chip family that the architecture is implemented
 #   in.
+# CONFIG_ARCH_architecture - for use in C code.  This identifies the
+#   specific architecture within the chip familyl.
 # CONFIG_ARCH_CHIP - Identifies the arch/*/chip subdirectory
 # CONFIG_ARCH_CHIP_name - For use in C code
 # CONFIG_ARCH_BOARD - identifies the configs subdirectory and, hence,
@@ -58,6 +60,7 @@
 #
 CONFIG_ARCH=arm
 CONFIG_ARCH_ARM=y
+CONFIG_ARCH_ARM7TDMI=y
 CONFIG_ARCH_CHIP=dm320
 CONFIG_ARCH_CHIP_DM320=y
 CONFIG_ARCH_BOARD=ntosd-dm320
diff --git a/nuttx/configs/ntosd-dm320/nsh/defconfig b/nuttx/configs/ntosd-dm320/nsh/defconfig
index 676e8e387..a111eb7a6 100644
--- a/nuttx/configs/ntosd-dm320/nsh/defconfig
+++ b/nuttx/configs/ntosd-dm320/nsh/defconfig
@@ -37,9 +37,11 @@
 #
 # CONFIG_ARCH - identifies the arch subdirectory and, hence, the
 #   processor architecture.
-# CONFIG_ARCH_name - for use in C code.  This identifies the
-#   particular chip or SoC that the architecture is implemented
+# CONFIG_ARCH_family - for use in C code.  This identifies the
+#   particular chip family that the architecture is implemented
 #   in.
+# CONFIG_ARCH_architecture - for use in C code.  This identifies the
+#   specific architecture within the chip familyl.
 # CONFIG_ARCH_CHIP - Identifies the arch/*/chip subdirectory
 # CONFIG_ARCH_CHIP_name - For use in C code
 # CONFIG_ARCH_BOARD - identifies the configs subdirectory and, hence,
@@ -58,6 +60,7 @@
 #
 CONFIG_ARCH=arm
 CONFIG_ARCH_ARM=y
+CONFIG_ARCH_ARM7TDMI=y
 CONFIG_ARCH_CHIP=dm320
 CONFIG_ARCH_CHIP_DM320=y
 CONFIG_ARCH_BOARD=ntosd-dm320
diff --git a/nuttx/configs/ntosd-dm320/ostest/defconfig b/nuttx/configs/ntosd-dm320/ostest/defconfig
index 4f83616a5..82cef5c81 100644
--- a/nuttx/configs/ntosd-dm320/ostest/defconfig
+++ b/nuttx/configs/ntosd-dm320/ostest/defconfig
@@ -37,9 +37,11 @@
 #
 # CONFIG_ARCH - identifies the arch subdirectory and, hence, the
 #   processor architecture.
-# CONFIG_ARCH_name - for use in C code.  This identifies the
-#   particular chip or SoC that the architecture is implemented
+# CONFIG_ARCH_family - for use in C code.  This identifies the
+#   particular chip family that the architecture is implemented
 #   in.
+# CONFIG_ARCH_architecture - for use in C code.  This identifies the
+#   specific architecture within the chip familyl.
 # CONFIG_ARCH_CHIP - Identifies the arch/*/chip subdirectory
 # CONFIG_ARCH_CHIP_name - For use in C code
 # CONFIG_ARCH_BOARD - identifies the configs subdirectory and, hence,
@@ -58,6 +60,7 @@
 #
 CONFIG_ARCH=arm
 CONFIG_ARCH_ARM=y
+CONFIG_ARCH_ARM7TDMI=y
 CONFIG_ARCH_CHIP=dm320
 CONFIG_ARCH_CHIP_DM320=y
 CONFIG_ARCH_BOARD=ntosd-dm320
diff --git a/nuttx/configs/ntosd-dm320/poll/defconfig b/nuttx/configs/ntosd-dm320/poll/defconfig
index 676071387..12c31fc7b 100644
--- a/nuttx/configs/ntosd-dm320/poll/defconfig
+++ b/nuttx/configs/ntosd-dm320/poll/defconfig
@@ -37,9 +37,11 @@
 #
 # CONFIG_ARCH - identifies the arch subdirectory and, hence, the
 #   processor architecture.
-# CONFIG_ARCH_name - for use in C code.  This identifies the
-#   particular chip or SoC that the architecture is implemented
+# CONFIG_ARCH_family - for use in C code.  This identifies the
+#   particular chip family that the architecture is implemented
 #   in.
+# CONFIG_ARCH_architecture - for use in C code.  This identifies the
+#   specific architecture within the chip familyl.
 # CONFIG_ARCH_CHIP - Identifies the arch/*/chip subdirectory
 # CONFIG_ARCH_CHIP_name - For use in C code
 # CONFIG_ARCH_BOARD - identifies the configs subdirectory and, hence,
@@ -58,6 +60,7 @@
 #
 CONFIG_ARCH=arm
 CONFIG_ARCH_ARM=y
+CONFIG_ARCH_ARM7TDMI=y
 CONFIG_ARCH_CHIP=dm320
 CONFIG_ARCH_CHIP_DM320=y
 CONFIG_ARCH_BOARD=ntosd-dm320
diff --git a/nuttx/configs/ntosd-dm320/udp/defconfig b/nuttx/configs/ntosd-dm320/udp/defconfig
index eca9836cd..0073d8a70 100644
--- a/nuttx/configs/ntosd-dm320/udp/defconfig
+++ b/nuttx/configs/ntosd-dm320/udp/defconfig
@@ -37,9 +37,11 @@
 #
 # CONFIG_ARCH - identifies the arch subdirectory and, hence, the
 #   processor architecture.
-# CONFIG_ARCH_name - for use in C code.  This identifies the
-#   particular chip or SoC that the architecture is implemented
+# CONFIG_ARCH_family - for use in C code.  This identifies the
+#   particular chip family that the architecture is implemented
 #   in.
+# CONFIG_ARCH_architecture - for use in C code.  This identifies the
+#   specific architecture within the chip familyl.
 # CONFIG_ARCH_CHIP - Identifies the arch/*/chip subdirectory
 # CONFIG_ARCH_CHIP_name - For use in C code
 # CONFIG_ARCH_BOARD - identifies the configs subdirectory and, hence,
@@ -58,6 +60,7 @@
 #
 CONFIG_ARCH=arm
 CONFIG_ARCH_ARM=y
+CONFIG_ARCH_ARM7TDMI=y
 CONFIG_ARCH_CHIP=dm320
 CONFIG_ARCH_CHIP_DM320=y
 CONFIG_ARCH_BOARD=ntosd-dm320
diff --git a/nuttx/configs/ntosd-dm320/uip/defconfig b/nuttx/configs/ntosd-dm320/uip/defconfig
index 5033f9c70..f5194803a 100644
--- a/nuttx/configs/ntosd-dm320/uip/defconfig
+++ b/nuttx/configs/ntosd-dm320/uip/defconfig
@@ -37,9 +37,11 @@
 #
 # CONFIG_ARCH - identifies the arch subdirectory and, hence, the
 #   processor architecture.
-# CONFIG_ARCH_name - for use in C code.  This identifies the
-#   particular chip or SoC that the architecture is implemented
+# CONFIG_ARCH_family - for use in C code.  This identifies the
+#   particular chip family that the architecture is implemented
 #   in.
+# CONFIG_ARCH_architecture - for use in C code.  This identifies the
+#   specific architecture within the chip familyl.
 # CONFIG_ARCH_CHIP - Identifies the arch/*/chip subdirectory
 # CONFIG_ARCH_CHIP_name - For use in C code
 # CONFIG_ARCH_BOARD - identifies the configs subdirectory and, hence,
@@ -58,6 +60,7 @@
 #
 CONFIG_ARCH=arm
 CONFIG_ARCH_ARM=y
+CONFIG_ARCH_ARM7TDMI=y
 CONFIG_ARCH_CHIP=dm320
 CONFIG_ARCH_CHIP_DM320=y
 CONFIG_ARCH_BOARD=ntosd-dm320
diff --git a/nuttx/configs/olimex-strp711/ostest/defconfig b/nuttx/configs/olimex-strp711/ostest/defconfig
index 909c626e8..4849621d1 100644
--- a/nuttx/configs/olimex-strp711/ostest/defconfig
+++ b/nuttx/configs/olimex-strp711/ostest/defconfig
@@ -37,9 +37,11 @@
 #
 # CONFIG_ARCH - identifies the arch subdirectory and, hence, the
 #   processor architecture.
-# CONFIG_ARCH_name - for use in C code.  This identifies the
-#   particular chip or SoC that the architecture is implemented
+# CONFIG_ARCH_family - for use in C code.  This identifies the
+#   particular chip family that the architecture is implemented
 #   in.
+# CONFIG_ARCH_architecture - for use in C code.  This identifies the
+#   specific architecture within the chip familyl.
 # CONFIG_ARCH_CHIP - Identifies the arch/*/chip subdirectory
 # CONFIG_ARCH_CHIP_name - For use in C code
 # CONFIG_ARCH_BOARD - identifies the configs subdirectory and, hence,
@@ -64,6 +66,8 @@
 # CONFIG_ARCH_STACKDUMP - Do stack dumps after assertions
 #
 CONFIG_ARCH=arm
+CONFIG_ARCH_ARM=y
+CONFIG_ARCH_ARM7TDMI=y
 CONFIG_ARCH_CHIP=str71x
 CONFIG_ARCH_STR71X=y
 CONFIG_ARCH_BOARD=olimex-strp711