summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--nuttx/arch/rgmp/Kconfig24
-rw-r--r--nuttx/arch/sh/Kconfig32
-rw-r--r--nuttx/arch/sim/Kconfig25
-rw-r--r--nuttx/configs/Kconfig5
-rw-r--r--nuttx/configs/README.txt3
-rw-r--r--nuttx/configs/sim/Kconfig3
-rw-r--r--nuttx/configs/skp16c26/ostest/defconfig2
7 files changed, 61 insertions, 33 deletions
diff --git a/nuttx/arch/rgmp/Kconfig b/nuttx/arch/rgmp/Kconfig
index ae2bf3130..7cc5fcc97 100644
--- a/nuttx/arch/rgmp/Kconfig
+++ b/nuttx/arch/rgmp/Kconfig
@@ -2,3 +2,27 @@
# For a description of the syntax of this configuration file,
# see misc/tools/kconfig-language.txt.
#
+
+if ARCH_RGMP
+choice
+ prompt "RGMP Architecture"
+ default RGMP_SUBARCH_X86
+
+config RGMP_SUBARCH_ARM
+ bool "ARM"
+ ---help---
+ RGMP ARM architecture"
+
+config RGMP_SUBARCH_X86
+ bool "x86"
+ ---help---
+ RGMP x86 architecture"
+
+endchoice
+
+config RGMP_SUBARCH
+ string
+ default "arm" if RGMP_SUBARCH_ARM
+ default "x86" if RGMP_SUBARCH_X86
+
+endif
diff --git a/nuttx/arch/sh/Kconfig b/nuttx/arch/sh/Kconfig
index ae2bf3130..8735dc238 100644
--- a/nuttx/arch/sh/Kconfig
+++ b/nuttx/arch/sh/Kconfig
@@ -2,3 +2,35 @@
# For a description of the syntax of this configuration file,
# see misc/tools/kconfig-language.txt.
#
+
+if ARCH_SH
+choice
+ prompt "SH chip selection"
+ default ARCH_CHIP_SH7032
+
+config ARCH_CHIP_SH7032
+ bool "SH7032"
+ ---help---
+ Hitachi/Renesas SH7032 (SH1)
+
+config ARCH_CHIP_M30262F8
+ bool "M30262F8"
+ ---help---
+ Renesas M30262F8 (M16C)
+
+endchoice
+
+config ARCH_SH1
+ bool
+ default y if ARCH_CHIP_SH7032
+
+config ARCH_M16C
+ bool
+ default y if ARCH_CHIP_M30262F8
+
+config ARCH_CHIP
+ string
+ default "sh1" if ARCH_SH1
+ default "m16c" if ARCH_M16C
+
+endif
diff --git a/nuttx/arch/sim/Kconfig b/nuttx/arch/sim/Kconfig
index dce2bc918..dd25aa5c8 100644
--- a/nuttx/arch/sim/Kconfig
+++ b/nuttx/arch/sim/Kconfig
@@ -4,29 +4,4 @@
#
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.
- This port does not support interrupts or a real timer (and hence no
- round robin scheduler) Otherwise, it is complete.
-
-config ARCH_BOARD_WIN32
- bool "x86 Win32 user-mode(NOT SUPPORTED)"
- depends on ARCH_SIM
- ---help---
- THIS PORT NOT SUPPORTED.
-
-endchoice
-
-config ARCH_BOARD
- string
- default "sim" if ARCH_BOARD_SIM
-
endif
diff --git a/nuttx/configs/Kconfig b/nuttx/configs/Kconfig
index e8a4a3ddf..d6f3152e0 100644
--- a/nuttx/configs/Kconfig
+++ b/nuttx/configs/Kconfig
@@ -426,14 +426,11 @@ config ARCH_BOARD_SIM
bool "User mode simulation"
depends on ARCH_SIM
---help---
- A user-mode port of NuttX to the x86 Linux platform is available.
+ A user-mode port of NuttX to the x86 Linux/Cygwin platform is available.
The purpose of this port is primarily to support OS feature development.
This port does not support interrupts or a real timer (and hence no
round robin scheduler) Otherwise, it is complete.
- NOTE: This target will not run on Cygwin probably for many reasons but
- first off because it uses some of the same symbols as does cygwin.dll.
-
config ARCH_BOARD_CUSTOM
bool "Custom development board"
---help---
diff --git a/nuttx/configs/README.txt b/nuttx/configs/README.txt
index 170d34f16..9cb8cd33b 100644
--- a/nuttx/configs/README.txt
+++ b/nuttx/configs/README.txt
@@ -1518,9 +1518,6 @@ configs/sim
This port does not support interrupts or a real timer (and hence no
round robin scheduler) Otherwise, it is complete.
- NOTE: This target will not run on Cygwin probably for many reasons but
- first off because it uses some of the same symbols as does cygwin.dll.
-
configs/skp16c26
Renesas M16C processor on the Renesas SKP16C26 StarterKit. This port
uses the GNU m32c toolchain. STATUS: The port is complete but untested
diff --git a/nuttx/configs/sim/Kconfig b/nuttx/configs/sim/Kconfig
index ae2bf3130..8a0c25f70 100644
--- a/nuttx/configs/sim/Kconfig
+++ b/nuttx/configs/sim/Kconfig
@@ -2,3 +2,6 @@
# For a description of the syntax of this configuration file,
# see misc/tools/kconfig-language.txt.
#
+
+if ARCH_BOARD_SIM
+endif
diff --git a/nuttx/configs/skp16c26/ostest/defconfig b/nuttx/configs/skp16c26/ostest/defconfig
index 70248aaac..6ab7318e6 100644
--- a/nuttx/configs/skp16c26/ostest/defconfig
+++ b/nuttx/configs/skp16c26/ostest/defconfig
@@ -64,7 +64,7 @@
# CONFIG_ARCH_LCD - Configure LCD. Unique to skp16c26.
CONFIG_ARCH=sh
-CONFIG_ARCH_SH=y
+CONFIG_ARCH_M16C=y
CONFIG_ARCH_CHIP=m16c
CONFIG_ARCH_CHIP_M30262F8=y
CONFIG_ARCH_BOARD=skp16c26