diff --git a/configs/README.txt b/configs/README.txt index a2faea333ac..5962c34a4a4 100644 --- a/configs/README.txt +++ b/configs/README.txt @@ -24,6 +24,7 @@ following characteristics: + |-- include/ |-- Make.defs |-- defconfig `-- setenv.sh @@ -31,6 +32,12 @@ following characteristics: Summary of Files ^^^^^^^^^^^^^^^^ +include/ -- This directoy contains board specific header files. This + directory will be linked as include/arch/board at configuration time and + can be included via '#include '. These header file + can only be included by files in arch/include/ and + arch//src + Make.defs -- This makefile fragment provides architecture and tool-specific build options. It will be included by all other makefiles in the build (once it is installed). This make fragment diff --git a/configs/c5471evm/Make.defs b/configs/c5471evm/Make.defs index 11c36ba5f87..f0ef5c8458b 100644 --- a/configs/c5471evm/Make.defs +++ b/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/c5471evm/ld.script +ARCHSCRIPT = -T$(TOPDIR)/configs/$(CONFIG_BOARD)/ld.script CROSSDEV = arm-elf- CC = $(CROSSDEV)gcc diff --git a/configs/c5471evm/defconfig b/configs/c5471evm/defconfig index a7d27caad88..a65cdb43583 100644 --- a/configs/c5471evm/defconfig +++ b/configs/c5471evm/defconfig @@ -37,6 +37,8 @@ # # CONFIG_ARCH - identifies the arch subdirectory # CONFIG_ARCH_name - for use in C code +# CONFIG_BOARD - identifies the configs subdirectory +# CONFIG_BARD_name - for use in C code # CONFIG_ROM_VECTORS - unique to c5471 # CONFIG_DRAM_END - the size of installed DRAM. # Unique to c5471 @@ -45,6 +47,8 @@ # CONFIG_ARCH=c5471 CONFIG_ARCH_C5471=y +CONFIG_BOARD=c5471evm +CONFIG_BOARD_C5471EVM=y CONFIG_ROM_VECTORS=n CONFIG_DRAM_END=0x11000000 CONFIG_C5471_LEDS=y diff --git a/configs/m68332evb/Make.defs b/configs/m68332evb/Make.defs index 1b7b65e5013..2dc2d5b2bc5 100644 --- a/configs/m68332evb/Make.defs +++ b/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/m68332evb/ld.script +ARCHSCRIPT = -T$(TOPDIR)/configs/$(CONFIG_BOARD)/ld.script CROSSDEV = m68k-elf- CC = $(CROSSDEV)gcc diff --git a/configs/m68332evb/defconfig b/configs/m68332evb/defconfig index 537d56281e8..86a7e059a55 100644 --- a/configs/m68332evb/defconfig +++ b/configs/m68332evb/defconfig @@ -37,12 +37,16 @@ # # CONFIG_ARCH - identifies the arch subdirectory # CONFIG_ARCH_name - for use in C code +# CONFIG_BOARD - identifies the configs subdirectory +# CONFIG_BARD_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_DRAM_SIZE=0x003000 CONFIG_DRAM_NUTTXENTRY=0x003000 CONFIG_ARCH_STACKDUMP=y diff --git a/configs/ntosd-dm320/Make.defs b/configs/ntosd-dm320/Make.defs index 363c8366986..f0ef5c8458b 100644 --- a/configs/ntosd-dm320/Make.defs +++ b/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/ntosd-dm320/ld.script +ARCHSCRIPT = -T$(TOPDIR)/configs/$(CONFIG_BOARD)/ld.script CROSSDEV = arm-elf- CC = $(CROSSDEV)gcc diff --git a/configs/ntosd-dm320/defconfig b/configs/ntosd-dm320/defconfig index 4a7ea5c7935..1763fe0f4cc 100644 --- a/configs/ntosd-dm320/defconfig +++ b/configs/ntosd-dm320/defconfig @@ -37,12 +37,16 @@ # # CONFIG_ARCH - identifies the arch subdirectory # CONFIG_ARCH_name - for use in C code +# CONFIG_BOARD - identifies the configs subdirectory +# CONFIG_BARD_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_ROM_VECTORS=n CONFIG_DRAM_SIZE=0x01000000 CONFIG_DRAM_NUTTXENTRY=0x01008000 diff --git a/configs/pjrc-8051/defconfig b/configs/pjrc-8051/defconfig index cdb73acdab5..316bda2b4b1 100644 --- a/configs/pjrc-8051/defconfig +++ b/configs/pjrc-8051/defconfig @@ -38,10 +38,14 @@ # CONFIG_ARCH - identifies the arch subdirectory # CONFIG_ARCH_8051 - Set if processor is 8051 family # CONFIG_ARCH_8052 = Set if processor is 8052 family +# CONFIG_BOARD - identifies the configs subdirectory +# CONFIG_BARD_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 # # Architecture-specific settings. These may mean nothing to diff --git a/configs/sim/defconfig b/configs/sim/defconfig index 142d1d4136c..13e1030eea0 100644 --- a/configs/sim/defconfig +++ b/configs/sim/defconfig @@ -37,9 +37,13 @@ # # CONFIG_ARCH - identifies the arch subdirectory # CONFIG_ARCH_name - for use in C code +# CONFIG_BOARD - identifies the configs subdirectory +# CONFIG_BARD_name - for use in C code # CONFIG_ARCH=sim CONFIG_ARCH_SIM=y +CONFIG_BOARD=sim +CONFIG_BOARD_SIM=y # # General OS setup