summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--arch/arm/Kconfig7
-rw-r--r--arch/arm/cpu/arm926ejs/orion5x/Kconfig21
-rw-r--r--board/LaCie/edminiv2/Kconfig8
-rw-r--r--configs/edminiv2_defconfig1
-rw-r--r--include/configs/edminiv2.h1
5 files changed, 26 insertions, 12 deletions
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index 8ac16f9..20b580c 100644
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -193,8 +193,8 @@ config TARGET_SC_SPS_1
config TARGET_NHK8815
bool "Support nhk8815"
-config TARGET_EDMINIV2
- bool "Support edminiv2"
+config ORION5X
+ bool "Marvell Orion"
config TARGET_DKB
bool "Support dkb"
@@ -522,6 +522,8 @@ source "arch/arm/cpu/armv7/omap4/Kconfig"
source "arch/arm/cpu/armv7/omap5/Kconfig"
+source "arch/arm/cpu/arm926ejs/orion5x/Kconfig"
+
source "arch/arm/cpu/armv7/rmobile/Kconfig"
source "arch/arm/cpu/armv7/tegra-common/Kconfig"
@@ -536,7 +538,6 @@ source "board/BuR/tseries/Kconfig"
source "board/BuS/eb_cpux9k2/Kconfig"
source "board/BuS/vl_ma2sc/Kconfig"
source "board/CarMediaLab/flea3/Kconfig"
-source "board/LaCie/edminiv2/Kconfig"
source "board/Marvell/aspenite/Kconfig"
source "board/Marvell/dkb/Kconfig"
source "board/Marvell/gplugd/Kconfig"
diff --git a/arch/arm/cpu/arm926ejs/orion5x/Kconfig b/arch/arm/cpu/arm926ejs/orion5x/Kconfig
new file mode 100644
index 0000000..aa40099
--- /dev/null
+++ b/arch/arm/cpu/arm926ejs/orion5x/Kconfig
@@ -0,0 +1,21 @@
+if ORION5X
+
+choice
+ prompt "Marvell Orion board select"
+
+config TARGET_EDMINIV2
+ bool "LaCie Ethernet Disk mini V2"
+
+endchoice
+
+config SYS_CPU
+ string
+ default "arm926ejs"
+
+config SYS_SOC
+ string
+ default "orion5x"
+
+source "board/LaCie/edminiv2/Kconfig"
+
+endif
diff --git a/board/LaCie/edminiv2/Kconfig b/board/LaCie/edminiv2/Kconfig
index f1151d1..9675a9e 100644
--- a/board/LaCie/edminiv2/Kconfig
+++ b/board/LaCie/edminiv2/Kconfig
@@ -1,9 +1,5 @@
if TARGET_EDMINIV2
-config SYS_CPU
- string
- default "arm926ejs"
-
config SYS_BOARD
string
default "edminiv2"
@@ -12,10 +8,6 @@ config SYS_VENDOR
string
default "LaCie"
-config SYS_SOC
- string
- default "orion5x"
-
config SYS_CONFIG_NAME
string
default "edminiv2"
diff --git a/configs/edminiv2_defconfig b/configs/edminiv2_defconfig
index 82aa684..3b1a6c1 100644
--- a/configs/edminiv2_defconfig
+++ b/configs/edminiv2_defconfig
@@ -1,2 +1,3 @@
CONFIG_ARM=y
+CONFIG_ORION5X=y
CONFIG_TARGET_EDMINIV2=y
diff --git a/include/configs/edminiv2.h b/include/configs/edminiv2.h
index 77717a8..1df4fc1 100644
--- a/include/configs/edminiv2.h
+++ b/include/configs/edminiv2.h
@@ -25,7 +25,6 @@
#define CONFIG_MARVELL 1
#define CONFIG_ARM926EJS 1 /* Basic Architecture */
#define CONFIG_FEROCEON 1 /* CPU Core subversion */
-#define CONFIG_ORION5X 1 /* SOC Family Name */
#define CONFIG_88F5182 1 /* SOC Name */
#define CONFIG_MACH_EDMINIV2 1 /* Machine type */