This patch adds intermediate kconfig symbols which select their SoC family. Boards then select them instead of the family symbol directly.

Signed-off-by: Phil Sutter phil@nwl.cc --- arch/arm/mach-mvebu/Kconfig | 24 ++++++++++++++++++++---- include/configs/clearfog.h | 1 - include/configs/db-88f6820-gp.h | 1 - 3 files changed, 20 insertions(+), 6 deletions(-)

diff --git a/arch/arm/mach-mvebu/Kconfig b/arch/arm/mach-mvebu/Kconfig index d96b2ae..a39f900 100644 --- a/arch/arm/mach-mvebu/Kconfig +++ b/arch/arm/mach-mvebu/Kconfig @@ -6,25 +6,41 @@ config ARMADA_38X config ARMADA_XP bool

+config MV78230 + bool + select ARMADA_XP + +config MV78260 + bool + select ARMADA_XP + +config MV78460 + bool + select ARMADA_XP + +config DB_88F6820_GP + bool + select ARMADA_38X + choice prompt "Marvell MVEBU (Armada XP/38x) board select" optional

config TARGET_CLEARFOG bool "Support ClearFog" - select ARMADA_38X + select DB_88F6820_GP

config TARGET_DB_88F6820_GP bool "Support DB-88F6820-GP" - select ARMADA_38X + select DB_88F6820_GP

config TARGET_DB_MV784MP_GP bool "Support db-mv784mp-gp" - select ARMADA_XP + select MV78460

config TARGET_MAXBCM bool "Support maxbcm" - select ARMADA_XP + select MV78460

endchoice

diff --git a/include/configs/clearfog.h b/include/configs/clearfog.h index 6c5356b..f0de827 100644 --- a/include/configs/clearfog.h +++ b/include/configs/clearfog.h @@ -10,7 +10,6 @@ /* * High Level Configuration Options (easy to change) */ -#define CONFIG_DB_88F6820_GP /* Board target name for DDR training */

#define CONFIG_DISPLAY_BOARDINFO_LATE

diff --git a/include/configs/db-88f6820-gp.h b/include/configs/db-88f6820-gp.h index 03a3d31..ef14132 100644 --- a/include/configs/db-88f6820-gp.h +++ b/include/configs/db-88f6820-gp.h @@ -10,7 +10,6 @@ /* * High Level Configuration Options (easy to change) */ -#define CONFIG_DB_88F6820_GP /* Board target name for DDR training */

#define CONFIG_DISPLAY_BOARDINFO_LATE