Makesystem changes to better support different SoCs

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

9 files changed, 34 insertions, 27 deletions

diff --git a/nuttx/configs/README.txt b/nuttx/configs/README.txt
index f09046dff..ac1565f84 100644
--- a/nuttx/configs/README.txt
+++ b/nuttx/configs/README.txt
@@ -104,8 +104,13 @@ defconfig -- This is a configuration file similar to the Linux
 
 	Architecture selection:
 
-		CONFIG_ARCH - identifies the arch/ subdirectory
-		CONFIG_ARCH_name - for use in C code
+		CONFIG_ARCH - Identifies the arch/ subdirectory
+		CONFIG_ARCH_name - For use in C code
+		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, the board that supports the particular chip or SoC.
+		CONFIG_ARCH_BOARD_name - For use in C code
 
 	General OS setup
 
@@ -220,6 +225,10 @@ configs/c5471evm
     with a GNU arm-elf toolchain*. This port is complete, verified, and
     included in the NuttX release.
 
+configs/mcu123-lpc214x
+    This is a port to the mcu123.com lpc214x development board.
+    This OS is also built with the the arm-elf toolchain*
+
 configs/ntosd-dm320
     This port uses the Neuros OSD with a GNU arm-elf toolchain*:
     see http://wiki.neurostechnology.com/index.php/Developer_Welcome .
diff --git a/nuttx/configs/c5471evm/Make.defs b/nuttx/configs/c5471evm/Make.defs
index f0ef5c845..8baeb3f36 100644
--- a/nuttx/configs/c5471evm/Make.defs
+++ b/nuttx/configs/c5471evm/Make.defs
@@ -47,7 +47,7 @@ ARCHPICFLAGS		= -fpic
 ARCHWARNINGS		= -Wall -Wstrict-prototypes -Wshadow
 ARCHDEFINES		=
 ARCHINCLUDES		= -I. -isystem $(TOPDIR)/include
-ARCHSCRIPT		= -T$(TOPDIR)/configs/$(CONFIG_BOARD)/ld.script
+ARCHSCRIPT		= -T$(TOPDIR)/configs/$(CONFIG_ARCH_BOARD)/ld.script
 
 CROSSDEV		= arm-elf-
 CC			= $(CROSSDEV)gcc
diff --git a/nuttx/configs/c5471evm/defconfig b/nuttx/configs/c5471evm/defconfig
index 2971805c5..3fd6a2e5d 100644
--- a/nuttx/configs/c5471evm/defconfig
+++ b/nuttx/configs/c5471evm/defconfig
@@ -40,9 +40,9 @@
 # CONFIG_ARCH_name - for use in C code.  This identifies the
 #   particular chip or SoC that the architecture is implemented
 #   in.
-# CONFIG_BOARD - identifies the configs subdirectory and, hence,
+# CONFIG_ARCH_BOARD - identifies the configs subdirectory and, hence,
 #   the board that supports the particular chip or SoC.
-# CONFIG_BOARD_name - for use in C code
+# CONFIG_ARCH_BOARD_name - for use in C code
 # CONFIG_ROM_VECTORS - unique to c5471
 # CONFIG_DRAM_END - the size of installed DRAM.
 #   Unique to c5471
@@ -51,8 +51,8 @@
 #
 CONFIG_ARCH=c5471
 CONFIG_ARCH_C5471=y
-CONFIG_BOARD=c5471evm
-CONFIG_BOARD_C5471EVM=y
+CONFIG_ARCH_BOARD=c5471evm
+CONFIG_ARCH_BOARD_C5471EVM=y
 CONFIG_ROM_VECTORS=n
 CONFIG_DRAM_END=0x11000000
 CONFIG_ARCH_LEDS=y
diff --git a/nuttx/configs/m68332evb/Make.defs b/nuttx/configs/m68332evb/Make.defs
index 2dc2d5b2b..74f14b967 100644
--- a/nuttx/configs/m68332evb/Make.defs
+++ b/nuttx/configs/m68332evb/Make.defs
@@ -47,7 +47,7 @@ ARCHPICFLAGS		= -pic
 ARCHWARNINGS		= -Wall -Wstrict-prototypes -Wshadow
 ARCHDEFINES		=
 ARCHINCLUDES		= -I. -isystem $(TOPDIR)/include
-ARCHSCRIPT		= -T$(TOPDIR)/configs/$(CONFIG_BOARD)/ld.script
+ARCHSCRIPT		= -T$(TOPDIR)/configs/$(CONFIG_ARCH_BOARD)/ld.script
 
 CROSSDEV		= m68k-elf-
 CC			= $(CROSSDEV)gcc
diff --git a/nuttx/configs/m68332evb/defconfig b/nuttx/configs/m68332evb/defconfig
index c63dc6aa2..256256362 100644
--- a/nuttx/configs/m68332evb/defconfig
+++ b/nuttx/configs/m68332evb/defconfig
@@ -40,17 +40,17 @@
 # CONFIG_ARCH_name - for use in C code.  This identifies the
 #   particular chip or SoC that the architecture is implemented
 #   in.
-# CONFIG_BOARD - identifies the configs subdirectory and, hence,
+# CONFIG_ARCH_BOARD - identifies the configs subdirectory and, hence,
 #   the board that supports the particular chip or SoC.
-# CONFIG_BOARD_name - for use in C code
+# CONFIG_ARCH_BOARD_name - for use in C code
 # CONFIG_DRAM_SIZE - Describes the installed DRAM.
 # CONFIG_ARCH_STACKDUMP - Do stack dumps after assertions
 #
 CONFIG_ARCH=m68332evb
 CONFIG_ARCH_M68332=y
 CONFIG_ARCH_M68332EVB=y
-CONFIG_BOARD=m68332evb
-CONFIG_BOARD_M68332EVB=y
+CONFIG_ARCH_BOARD=m68332evb
+CONFIG_ARCH_BOARD_M68332EVB=y
 CONFIG_DRAM_SIZE=0x003000
 CONFIG_DRAM_NUTTXENTRY=0x003000
 CONFIG_ARCH_STACKDUMP=y
diff --git a/nuttx/configs/ntosd-dm320/Make.defs b/nuttx/configs/ntosd-dm320/Make.defs
index 8fbe74836..62302a2f4 100644
--- a/nuttx/configs/ntosd-dm320/Make.defs
+++ b/nuttx/configs/ntosd-dm320/Make.defs
@@ -47,7 +47,7 @@ ARCHPICFLAGS		= -fpic
 ARCHWARNINGS		= -Wall -Wstrict-prototypes -Wshadow
 ARCHDEFINES		=
 ARCHINCLUDES		= -I. -isystem $(TOPDIR)/include
-ARCHSCRIPT		= -T$(TOPDIR)/configs/$(CONFIG_BOARD)/ld.script
+ARCHSCRIPT		= -T$(TOPDIR)/configs/$(CONFIG_ARCH_BOARD)/ld.script
 
 CROSSDEV		= arm-elf-
 CC			= $(CROSSDEV)gcc
diff --git a/nuttx/configs/ntosd-dm320/defconfig b/nuttx/configs/ntosd-dm320/defconfig
index 7ea06e217..bb20353e0 100644
--- a/nuttx/configs/ntosd-dm320/defconfig
+++ b/nuttx/configs/ntosd-dm320/defconfig
@@ -40,17 +40,17 @@
 # CONFIG_ARCH_name - for use in C code.  This identifies the
 #   particular chip or SoC that the architecture is implemented
 #   in.
-# CONFIG_BOARD - identifies the configs subdirectory and, hence,
+# CONFIG_ARCH_BOARD - identifies the configs subdirectory and, hence,
 #   the board that supports the particular chip or SoC.
-# CONFIG_BOARD_name - for use in C code
+# CONFIG_ARCH_BOARD_name - for use in C code
 # CONFIG_ROM_VECTORS - unique to dm320
 # CONFIG_DRAM_SIZE - Describes the installed DRAM.
 # CONFIG_ARCH_STACKDUMP - Do stack dumps after assertions
 #
 CONFIG_ARCH=dm320
 CONFIG_ARCH_DM320=y
-CONFIG_BOARD=ntosd-dm320
-CONFIG_BOARD_NTOSD_DM320=y
+CONFIG_ARCH_BOARD=ntosd-dm320
+CONFIG_ARCH_BOARD_NTOSD_DM320=y
 CONFIG_ROM_VECTORS=n
 CONFIG_DRAM_SIZE=0x01000000
 CONFIG_DRAM_NUTTXENTRY=0x01008000
diff --git a/nuttx/configs/pjrc-8051/defconfig b/nuttx/configs/pjrc-8051/defconfig
index cc5da93bd..a3aabdbdb 100644
--- a/nuttx/configs/pjrc-8051/defconfig
+++ b/nuttx/configs/pjrc-8051/defconfig
@@ -39,17 +39,15 @@
 #   processor architecture.
 # CONFIG_ARCH_8051 - Set if processor is 8051 family
 # CONFIG_ARCH_8052 = Set if processor is 8052 family
-# CONFIG_BOARD - identifies the configs subdirectory and, hence,
+# CONFIG_ARCH_BOARD - identifies the configs subdirectory and, hence,
 #   the board that supports the particular chip or SoC.
-# CONFIG_BOARD_name - for use in C code
-# CONFIG_BOARD - identifies the configs subdirectory
-# CONFIG_BARD_name - for use in C code
+# CONFIG_ARCH_BOARD_name - for use in C code
 #
 CONFIG_ARCH=pjrc-8051
 CONFIG_ARCH_8051=n
 CONFIG_ARCH_8052=y
-CONFIG_BOARD=pjrc-8051
-CONFIG_BOARD_PJRC_87C52=y
+CONFIG_ARCH_BOARD=pjrc-8051
+CONFIG_ARCH_BOARD_PJRC_87C52=y
 
 #
 # Architecture-specific settings.  These may mean nothing to
diff --git a/nuttx/configs/sim/defconfig b/nuttx/configs/sim/defconfig
index 935ca1db2..7736a65de 100644
--- a/nuttx/configs/sim/defconfig
+++ b/nuttx/configs/sim/defconfig
@@ -40,14 +40,14 @@
 # CONFIG_ARCH_name - for use in C code.  This identifies the
 #   particular chip or SoC that the architecture is implemented
 #   in.
-# CONFIG_BOARD - identifies the configs subdirectory and, hence,
+# CONFIG_ARCH_BOARD - identifies the configs subdirectory and, hence,
 #   the board that supports the particular chip or SoC.
-# CONFIG_BOARD_name - for use in C code
+# CONFIG_ARCH_BOARD_name - for use in C code
 #
 CONFIG_ARCH=sim
 CONFIG_ARCH_SIM=y
-CONFIG_BOARD=sim
-CONFIG_BOARD_SIM=y
+CONFIG_ARCH_BOARD=sim
+CONFIG_ARCH_BOARD_SIM=y
 
 #
 # General OS setup