summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--arch/arm/Kconfig15
-rw-r--r--arch/arm/mach-netx/Kconfig17
2 files changed, 17 insertions, 15 deletions
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index 8271465641..74cb595cf0 100644
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -96,21 +96,6 @@ config ARCH_S3C24xx
endchoice
-choice
- prompt "Select your board"
- depends on !ARCH_AT91 && !ARCH_AT91RM9200 && !ARCH_OMAP && !ARCH_IMX && !ARCH_S3C24xx
-
-config MACH_NXDB500
- bool "Hilscher Netx nxdb500"
- depends on ARCH_NETX
- select HAS_NETX_ETHER
- select HAS_CFI
- select MACH_HAS_LOWLEVEL_INIT
- help
- Say Y here if you are using the Hilscher Netx nxdb500 board
-
-endchoice
-
source arch/arm/mach-at91/Kconfig
source arch/arm/mach-at91rm9200/Kconfig
source arch/arm/mach-imx/Kconfig
diff --git a/arch/arm/mach-netx/Kconfig b/arch/arm/mach-netx/Kconfig
index a058470209..a62c3bc8f9 100644
--- a/arch/arm/mach-netx/Kconfig
+++ b/arch/arm/mach-netx/Kconfig
@@ -1,3 +1,5 @@
+if ARCH_NETX
+
config NETX_SDRAM_CTRL
hex
default 0x010D0001 if MACH_NXDKN
@@ -30,3 +32,18 @@ config NETX_COOKIE
default 16 if MACH_NXEB500HMI
default 16 if MACH_NXHX
+choice
+
+ prompt "Netx Board Type"
+
+config MACH_NXDB500
+ bool "Hilscher Netx nxdb500"
+ select HAS_NETX_ETHER
+ select HAS_CFI
+ select MACH_HAS_LOWLEVEL_INIT
+ help
+ Say Y here if you are using the Hilscher Netx nxdb500 board
+
+endchoice
+
+endif