summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStefan Roese <sr@denx.de>2015-08-25 13:18:38 +0200
committerStefan Roese <sr@denx.de>2015-10-20 07:12:44 +0200
commitc3d891405bda42cfd00958ab0143e0d3900b06d9 (patch)
tree9ea6c71f64500756786f49c7317ed28b03615d18
parent5ec0003b19cbdf06ccd6941237cbc0d1c3468e2d (diff)
downloadu-boot-imx-c3d891405bda42cfd00958ab0143e0d3900b06d9.zip
u-boot-imx-c3d891405bda42cfd00958ab0143e0d3900b06d9.tar.gz
u-boot-imx-c3d891405bda42cfd00958ab0143e0d3900b06d9.tar.bz2
arm: mvebu: Move Armada XP/38x Kconfig to mach specific Kconfig file
Introduce a mach-mvebu/Kconfig for all Armada based SoC's. Signed-off-by: Stefan Roese <sr@denx.de>
-rw-r--r--arch/arm/Kconfig16
-rw-r--r--arch/arm/mach-mvebu/Kconfig21
-rw-r--r--board/Marvell/db-88f6820-gp/Kconfig3
-rw-r--r--board/Marvell/db-mv784mp-gp/Kconfig3
-rw-r--r--board/maxbcm/Kconfig3
-rw-r--r--configs/db-88f6820-gp_defconfig1
-rw-r--r--configs/db-mv784mp-gp_defconfig1
-rw-r--r--configs/maxbcm_defconfig1
8 files changed, 28 insertions, 21 deletions
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index 7981355..29abdcc 100644
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -105,18 +105,8 @@ config KIRKWOOD
bool "Marvell Kirkwood"
select CPU_ARM926EJS
-config TARGET_DB_88F6820_GP
- bool "Support DB-88F6820-GP"
- select CPU_V7
- select SUPPORT_SPL
-
-config TARGET_DB_MV784MP_GP
- bool "Support db-mv784mp-gp"
- select CPU_V7
- select SUPPORT_SPL
-
-config TARGET_MAXBCM
- bool "Support maxbcm"
+config ARCH_MVEBU
+ bool "Marvell MVEBU family (Armada XP/38x)"
select CPU_V7
select SUPPORT_SPL
@@ -684,6 +674,8 @@ source "arch/arm/mach-keystone/Kconfig"
source "arch/arm/mach-kirkwood/Kconfig"
+source "arch/arm/mach-mvebu/Kconfig"
+
source "arch/arm/cpu/armv7/mx7/Kconfig"
source "arch/arm/cpu/armv7/mx6/Kconfig"
diff --git a/arch/arm/mach-mvebu/Kconfig b/arch/arm/mach-mvebu/Kconfig
new file mode 100644
index 0000000..1aa9640
--- /dev/null
+++ b/arch/arm/mach-mvebu/Kconfig
@@ -0,0 +1,21 @@
+if ARCH_MVEBU
+
+choice
+ prompt "Marvell MVEBU (Armada XP/38x) board select"
+ optional
+
+config TARGET_DB_88F6820_GP
+ bool "Support DB-88F6820-GP"
+
+config TARGET_DB_MV784MP_GP
+ bool "Support db-mv784mp-gp"
+
+config TARGET_MAXBCM
+ bool "Support maxbcm"
+
+endchoice
+
+config SYS_SOC
+ default "mvebu"
+
+endif
diff --git a/board/Marvell/db-88f6820-gp/Kconfig b/board/Marvell/db-88f6820-gp/Kconfig
index b2e9115..f12b968 100644
--- a/board/Marvell/db-88f6820-gp/Kconfig
+++ b/board/Marvell/db-88f6820-gp/Kconfig
@@ -6,9 +6,6 @@ config SYS_BOARD
config SYS_VENDOR
default "Marvell"
-config SYS_SOC
- default "mvebu"
-
config SYS_CONFIG_NAME
default "db-88f6820-gp"
diff --git a/board/Marvell/db-mv784mp-gp/Kconfig b/board/Marvell/db-mv784mp-gp/Kconfig
index d0b426e..428a5e1 100644
--- a/board/Marvell/db-mv784mp-gp/Kconfig
+++ b/board/Marvell/db-mv784mp-gp/Kconfig
@@ -6,9 +6,6 @@ config SYS_BOARD
config SYS_VENDOR
default "Marvell"
-config SYS_SOC
- default "mvebu"
-
config SYS_CONFIG_NAME
default "db-mv784mp-gp"
diff --git a/board/maxbcm/Kconfig b/board/maxbcm/Kconfig
index e86aa16..2edccfe 100644
--- a/board/maxbcm/Kconfig
+++ b/board/maxbcm/Kconfig
@@ -3,9 +3,6 @@ if TARGET_MAXBCM
config SYS_BOARD
default "maxbcm"
-config SYS_SOC
- default "mvebu"
-
config SYS_CONFIG_NAME
default "maxbcm"
diff --git a/configs/db-88f6820-gp_defconfig b/configs/db-88f6820-gp_defconfig
index e22f5f7..24647ce 100644
--- a/configs/db-88f6820-gp_defconfig
+++ b/configs/db-88f6820-gp_defconfig
@@ -1,4 +1,5 @@
CONFIG_ARM=y
+CONFIG_ARCH_MVEBU=y
CONFIG_TARGET_DB_88F6820_GP=y
CONFIG_SPL=y
# CONFIG_CMD_IMLS is not set
diff --git a/configs/db-mv784mp-gp_defconfig b/configs/db-mv784mp-gp_defconfig
index c9859a8..4e4da3c 100644
--- a/configs/db-mv784mp-gp_defconfig
+++ b/configs/db-mv784mp-gp_defconfig
@@ -1,4 +1,5 @@
CONFIG_ARM=y
+CONFIG_ARCH_MVEBU=y
CONFIG_TARGET_DB_MV784MP_GP=y
CONFIG_SPL=y
# CONFIG_CMD_IMLS is not set
diff --git a/configs/maxbcm_defconfig b/configs/maxbcm_defconfig
index b0b0d6c..5957997 100644
--- a/configs/maxbcm_defconfig
+++ b/configs/maxbcm_defconfig
@@ -1,4 +1,5 @@
CONFIG_ARM=y
+CONFIG_ARCH_MVEBU=y
CONFIG_TARGET_MAXBCM=y
CONFIG_SPL=y
# CONFIG_CMD_IMLS is not set