diff options
| -rw-r--r-- | nuttx/Kconfig | 6 | ||||
| -rw-r--r-- | nuttx/Makefile | 5 | ||||
| -rw-r--r-- | nuttx/arch/8051/Kconfig | 4 | ||||
| -rw-r--r-- | nuttx/arch/Kconfig | 88 | ||||
| -rw-r--r-- | nuttx/arch/arm/Kconfig | 101 | ||||
| -rw-r--r-- | nuttx/arch/arm/src/c5471/Kconfig | 4 | ||||
| -rw-r--r-- | nuttx/arch/arm/src/calypso/Kconfig | 4 | ||||
| -rw-r--r-- | nuttx/arch/arm/src/dm320/Kconfig | 4 | ||||
| -rw-r--r-- | nuttx/arch/arm/src/imx/Kconfig | 4 | ||||
| -rw-r--r-- | nuttx/arch/arm/src/kinetis/Kconfig | 4 | ||||
| -rw-r--r-- | nuttx/arch/arm/src/lm3s/Kconfig | 4 | ||||
| -rw-r--r-- | nuttx/arch/arm/src/lpc17xx/Kconfig | 4 | ||||
| -rw-r--r-- | nuttx/arch/arm/src/lpc214x/Kconfig | 4 | ||||
| -rw-r--r-- | nuttx/arch/arm/src/lpc2378/Kconfig | 4 | ||||
| -rw-r--r-- | nuttx/arch/arm/src/lpc31xx/Kconfig | 4 | ||||
| -rw-r--r-- | nuttx/arch/arm/src/sam3u/Kconfig | 4 | ||||
| -rw-r--r-- | nuttx/arch/arm/src/stm32/Kconfig | 4 | ||||
| -rw-r--r-- | nuttx/arch/arm/src/str71x/Kconfig | 4 | ||||
| -rw-r--r-- | nuttx/arch/sim/Kconfig | 21 |
19 files changed, 254 insertions, 23 deletions
diff --git a/nuttx/Kconfig b/nuttx/Kconfig index 0b140e16f..84ef912fb 100644 --- a/nuttx/Kconfig +++ b/nuttx/Kconfig @@ -5,10 +5,6 @@ mainmenu "Nuttx/$ARCH Configuration" -config SRCARCH - string - option env="SRCARCH" - config APPSDIR string option env="APPSDIR" @@ -119,7 +115,7 @@ endif endmenu menu "System Type" -source "arch/$SRCARCH/Kconfig" +source "arch/Kconfig" endmenu menu "Kernel Features" diff --git a/nuttx/Makefile b/nuttx/Makefile index c6ace3c76..e2a7e76c7 100644 --- a/nuttx/Makefile +++ b/nuttx/Makefile @@ -604,7 +604,6 @@ ifneq ($(APPDIR),) { echo "Copy of _SAVED_APPS_config failed" ; exit 1 ; } endif -ARCH ?=sim menuconfig: - SRCARCH=${ARCH} APPSDIR=${CONFIG_APPS_DIR} mconf Kconfig - + APPSDIR=${CONFIG_APPS_DIR} mconf Kconfig + diff --git a/nuttx/arch/8051/Kconfig b/nuttx/arch/8051/Kconfig new file mode 100644 index 000000000..ae2bf3130 --- /dev/null +++ b/nuttx/arch/8051/Kconfig @@ -0,0 +1,4 @@ +# +# For a description of the syntax of this configuration file, +# see misc/tools/kconfig-language.txt. +# diff --git a/nuttx/arch/Kconfig b/nuttx/arch/Kconfig index ae2bf3130..253151a3b 100644 --- a/nuttx/arch/Kconfig +++ b/nuttx/arch/Kconfig @@ -2,3 +2,91 @@ # For a description of the syntax of this configuration file, # see misc/tools/kconfig-language.txt. # + +choice + prompt "CPU Architecture" + default ARCH_ARM + +config ARCH_8051 + bool "8051" + ---help--- + Intel 8051 architectures and derivaties + +config ARCH_ARM + bool "ARM" + ---help--- + The ARM architectures + +config ARCH_AVR + bool "AVR" + ---help--- + Atmel 9-bit bit AVR and 32-bit AVR32 architectures + +config ARCH_HC + bool "Freescale HC" + ---help--- + Freescale HC architectures (M9S12) + +config ARCH_MIPS + bool "MIPS" + ---help--- + MIPS architectures (PIC32) + +config ARCH_RGMP + bool "RGMP" + ---help--- + RTOS and GPOS on Multi-Processor (RGMP) architecture. See + http://rgmp.sourceforge.net/wiki/index.php/Main_Page. + +config ARCH_SH + bool "Rensas" + ---help--- + Renesas architectures (SH and M16C). + +config ARCH_SIM + bool "Simulation" + ---help--- + Linux/Cywgin user-mode simulation. + +config ARCH_X86 + bool "x86" + ---help--- + Intel x86 architectures. + +config ARCH_Z16 + bool "ZNEO" + ---help--- + ZiLOG ZNEO 16-bit architectures (z16f). + +config ARCH_Z80 + bool "z80" + ---help--- + ZiLOG 8-bit architectures (z80, ez80, z8). + +endchoice + +config ARCH + string + default "8051" if ARCH_8051 + default "arm" if ARCH_ARM + default "avr" if ARCH_AVR + default "hc" if ARCH_HC + default "mips" if ARCH_MIPS + default "rgmp" if ARCH_RGMP + default "sh" if ARCH_SH + default "sim" if ARCH_SIM + default "x86" if ARCH_X86 + default "z16" if ARCH_Z16 + default "z80" if ARCH_Z80 + +source arch/8051/Kconfig +source arch/arm/Kconfig +source arch/avr/Kconfig +source arch/hc/Kconfig +source arch/mips/Kconfig +source arch/rgmp/Kconfig +source arch/sh/Kconfig +source arch/sim/Kconfig +source arch/x86/Kconfig +source arch/z16/Kconfig +source arch/z80/Kconfig diff --git a/nuttx/arch/arm/Kconfig b/nuttx/arch/arm/Kconfig index ae2bf3130..92520604e 100644 --- a/nuttx/arch/arm/Kconfig +++ b/nuttx/arch/arm/Kconfig @@ -2,3 +2,104 @@ # For a description of the syntax of this configuration file, # see misc/tools/kconfig-language.txt. # + +choice + prompt "ARM chip selection" + default ARCH_CHIP_STM32 + +config ARCH_CHIP_C5471 + bool "TMS320 C5471" + ---help--- + TI TMS320 C5471, A180, or DA180 (ARM7TDMI) + +config ARCH_CHIP_CALYPSO + bool "Calypso" + ---help--- + TI Calypso-based cell phones (ARM7TDMI) + +config ARCH_CHIP_DM320 + bool "TMS320 DM320" + ---help--- + TI DMS320 DM320 (ARM926EJS) + +config ARCH_CHIP_IMX + bool "Freescale iMX" + ---help--- + Freescale iMX architectures (ARM920T) + +config ARCH_CHIP_KINETIS + bool "Freescale Kinetis" + ---help--- + Freescale Kinetis Architectures (ARM Cortex-M4) + +config ARCH_CHIP_LM3S + bool "TI Stellaris" + ---help--- + TI Stellaris LMS3 architecutres (ARM Cortex-M3) + +config ARCH_CHIP_LPC17XX + bool "NXP LPC17xx" + ---help--- + NXP LPC17xx architectures (ARM Cortex-M3) + +config ARCH_CHIP_LPC214X + bool "NXP LPC214x" + ---help--- + NXP LPC2145x architectures (ARM7TDMI) + +config ARCH_CHIP_LPC2378 + bool "NXP LPC2378" + ---help--- + NXP LPC2145x architectures (ARM7TDMI) + +config ARCH_CHIP_LPC31XX + bool "NXP LPC31XX" + ---help--- + NPX LPC31XX architectures (ARM926EJS). + +config ARCH_CHIP_SAM3U + bool "Atmel AT91SAM3U" + ---help--- + Atmel AT91SAM3U architectures (ARM Cortex-M3) + +config ARCH_CHIP_STM32 + bool "STMicro STM32" + ---help--- + STMicro STM32 architectures (ARM Cortex-M3/4). + +config ARCH_CHIP_STR71X + bool "STMicro STR71x" + ---help--- + STMicro STR71x architectures (ARM7TDMI). + +endchoice + +config ARCH + string + default "c5471" if ARCH_CHIP_C5471 + default "calypso" if ARCH_CHIP_CALYPSO + default "dm320" if ARCH_CHIP_DM320 + default "imx" if ARCH_CHIP_IMX + default "kinetis" if ARCH_CHIP_KINETIS + default "lm3s" if ARCH_CHIP_LM3S + default "lpc17x" if ARCH_CHIP_LPC17XX + default "lpc214x" if ARCH_CHIP_LPC214X + default "lpc2378" if ARCH_CHIP_LPC2378 + default "lpc31xx" if ARCH_CHIP_LPC31XX + default "sam3u" if ARCH_CHIP_SAM3U + default "stm32" if ARCH_CHIP_STM32 + default "str71x" if ARCH_CHIP_STR71X + +source arch/arm/src/c5471/Kconfig +source arch/arm/src/calypso/Kconfig +source arch/arm/src/dm320/Kconfig +source arch/arm/src/imx/Kconfig +source arch/arm/src/kinetis/Kconfig +source arch/arm/src/lm3s/Kconfig +source arch/arm/src/lpc17xx/Kconfig +source arch/arm/src/lpc214x/Kconfig +source arch/arm/src/lpc2378/Kconfig +source arch/arm/src/lpc31xx/Kconfig +source arch/arm/src/sam3u/Kconfig +source arch/arm/src/stm32/Kconfig +source arch/arm/src/str71x/Kconfig diff --git a/nuttx/arch/arm/src/c5471/Kconfig b/nuttx/arch/arm/src/c5471/Kconfig new file mode 100644 index 000000000..ae2bf3130 --- /dev/null +++ b/nuttx/arch/arm/src/c5471/Kconfig @@ -0,0 +1,4 @@ +# +# For a description of the syntax of this configuration file, +# see misc/tools/kconfig-language.txt. +# diff --git a/nuttx/arch/arm/src/calypso/Kconfig b/nuttx/arch/arm/src/calypso/Kconfig new file mode 100644 index 000000000..ae2bf3130 --- /dev/null +++ b/nuttx/arch/arm/src/calypso/Kconfig @@ -0,0 +1,4 @@ +# +# For a description of the syntax of this configuration file, +# see misc/tools/kconfig-language.txt. +# diff --git a/nuttx/arch/arm/src/dm320/Kconfig b/nuttx/arch/arm/src/dm320/Kconfig new file mode 100644 index 000000000..ae2bf3130 --- /dev/null +++ b/nuttx/arch/arm/src/dm320/Kconfig @@ -0,0 +1,4 @@ +# +# For a description of the syntax of this configuration file, +# see misc/tools/kconfig-language.txt. +# diff --git a/nuttx/arch/arm/src/imx/Kconfig b/nuttx/arch/arm/src/imx/Kconfig new file mode 100644 index 000000000..ae2bf3130 --- /dev/null +++ b/nuttx/arch/arm/src/imx/Kconfig @@ -0,0 +1,4 @@ +# +# For a description of the syntax of this configuration file, +# see misc/tools/kconfig-language.txt. +# diff --git a/nuttx/arch/arm/src/kinetis/Kconfig b/nuttx/arch/arm/src/kinetis/Kconfig new file mode 100644 index 000000000..ae2bf3130 --- /dev/null +++ b/nuttx/arch/arm/src/kinetis/Kconfig @@ -0,0 +1,4 @@ +# +# For a description of the syntax of this configuration file, +# see misc/tools/kconfig-language.txt. +# diff --git a/nuttx/arch/arm/src/lm3s/Kconfig b/nuttx/arch/arm/src/lm3s/Kconfig new file mode 100644 index 000000000..ae2bf3130 --- /dev/null +++ b/nuttx/arch/arm/src/lm3s/Kconfig @@ -0,0 +1,4 @@ +# +# For a description of the syntax of this configuration file, +# see misc/tools/kconfig-language.txt. +# diff --git a/nuttx/arch/arm/src/lpc17xx/Kconfig b/nuttx/arch/arm/src/lpc17xx/Kconfig new file mode 100644 index 000000000..ae2bf3130 --- /dev/null +++ b/nuttx/arch/arm/src/lpc17xx/Kconfig @@ -0,0 +1,4 @@ +# +# For a description of the syntax of this configuration file, +# see misc/tools/kconfig-language.txt. +# diff --git a/nuttx/arch/arm/src/lpc214x/Kconfig b/nuttx/arch/arm/src/lpc214x/Kconfig new file mode 100644 index 000000000..ae2bf3130 --- /dev/null +++ b/nuttx/arch/arm/src/lpc214x/Kconfig @@ -0,0 +1,4 @@ +# +# For a description of the syntax of this configuration file, +# see misc/tools/kconfig-language.txt. +# diff --git a/nuttx/arch/arm/src/lpc2378/Kconfig b/nuttx/arch/arm/src/lpc2378/Kconfig new file mode 100644 index 000000000..ae2bf3130 --- /dev/null +++ b/nuttx/arch/arm/src/lpc2378/Kconfig @@ -0,0 +1,4 @@ +# +# For a description of the syntax of this configuration file, +# see misc/tools/kconfig-language.txt. +# diff --git a/nuttx/arch/arm/src/lpc31xx/Kconfig b/nuttx/arch/arm/src/lpc31xx/Kconfig new file mode 100644 index 000000000..ae2bf3130 --- /dev/null +++ b/nuttx/arch/arm/src/lpc31xx/Kconfig @@ -0,0 +1,4 @@ +# +# For a description of the syntax of this configuration file, +# see misc/tools/kconfig-language.txt. +# diff --git a/nuttx/arch/arm/src/sam3u/Kconfig b/nuttx/arch/arm/src/sam3u/Kconfig new file mode 100644 index 000000000..ae2bf3130 --- /dev/null +++ b/nuttx/arch/arm/src/sam3u/Kconfig @@ -0,0 +1,4 @@ +# +# For a description of the syntax of this configuration file, +# see misc/tools/kconfig-language.txt. +# diff --git a/nuttx/arch/arm/src/stm32/Kconfig b/nuttx/arch/arm/src/stm32/Kconfig new file mode 100644 index 000000000..ae2bf3130 --- /dev/null +++ b/nuttx/arch/arm/src/stm32/Kconfig @@ -0,0 +1,4 @@ +# +# For a description of the syntax of this configuration file, +# see misc/tools/kconfig-language.txt. +# diff --git a/nuttx/arch/arm/src/str71x/Kconfig b/nuttx/arch/arm/src/str71x/Kconfig new file mode 100644 index 000000000..ae2bf3130 --- /dev/null +++ b/nuttx/arch/arm/src/str71x/Kconfig @@ -0,0 +1,4 @@ +# +# For a description of the syntax of this configuration file, +# see misc/tools/kconfig-language.txt. +# diff --git a/nuttx/arch/sim/Kconfig b/nuttx/arch/sim/Kconfig index 08f9a5f63..00253d0dc 100644 --- a/nuttx/arch/sim/Kconfig +++ b/nuttx/arch/sim/Kconfig @@ -3,20 +3,14 @@ # see misc/tools/kconfig-language.txt. # -config ARCH - string - default "sim" - -config ARCH_SIM - bool - default y - +if ARCH_SIM choice prompt "Simulator board type" default ARCH_BOARD_SIM config ARCH_BOARD_SIM bool "x86 Linux user-mode" + depends on ARCH_SIM ---help--- A user-mode port of NuttX to the x86 Linux platform is available. The purpose of this port is primarily to support OS feature development. @@ -24,13 +18,10 @@ config ARCH_BOARD_SIM round robin scheduler) Otherwise, it is complete. config ARCH_BOARD_WIN32 - bool "x86 Win32 user-mode(NOT SUPPORT)" + bool "x86 Win32 user-mode(NOT SUPPORTED)" + depends on ARCH_SIM ---help--- - THIS PORT NOT SUPPORT. + THIS PORT NOT SUPPORTED. endchoice - -config ARCH_BOARD - string - default "sim" if ARCH_BOARD_SIM - +endif |