More Kconfig

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

3 files changed, 56 insertions, 25 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