Merging all the board specific Kconfig options into the main Kconfig file for mach-mvebu makes things easier to maintain.
Signed-off-by: Stefan Roese sr@denx.de Cc: Luka Perkov luka.perkov@sartura.hr --- arch/arm/Kconfig | 4 ---- arch/arm/mach-mvebu/Kconfig | 17 +++++++++++++++++ board/Marvell/db-88f6820-gp/Kconfig | 12 ------------ board/Marvell/db-mv784mp-gp/Kconfig | 12 ------------ board/maxbcm/Kconfig | 9 --------- board/solidrun/clearfog/Kconfig | 12 ------------ 6 files changed, 17 insertions(+), 49 deletions(-) delete mode 100644 board/Marvell/db-88f6820-gp/Kconfig delete mode 100644 board/Marvell/db-mv784mp-gp/Kconfig delete mode 100644 board/maxbcm/Kconfig delete mode 100644 board/solidrun/clearfog/Kconfig
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index c246a49..b878623 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig @@ -774,8 +774,6 @@ source "board/BuR/kwb/Kconfig" source "board/BuR/tseries/Kconfig" source "board/CarMediaLab/flea3/Kconfig" source "board/Marvell/aspenite/Kconfig" -source "board/Marvell/db-88f6820-gp/Kconfig" -source "board/Marvell/db-mv784mp-gp/Kconfig" source "board/Marvell/gplugd/Kconfig" source "board/armadeus/apf27/Kconfig" source "board/armltd/vexpress/Kconfig" @@ -814,7 +812,6 @@ source "board/h2200/Kconfig" source "board/hisilicon/hikey/Kconfig" source "board/imx31_phycore/Kconfig" source "board/isee/igep0033/Kconfig" -source "board/maxbcm/Kconfig" source "board/mpl/vcma9/Kconfig" source "board/olimex/mx23_olinuxino/Kconfig" source "board/phytec/pcm051/Kconfig" @@ -827,7 +824,6 @@ source "board/siemens/draco/Kconfig" source "board/siemens/pxm2/Kconfig" source "board/siemens/rut/Kconfig" source "board/silica/pengwyn/Kconfig" -source "board/solidrun/clearfog/Kconfig" source "board/spear/spear300/Kconfig" source "board/spear/spear310/Kconfig" source "board/spear/spear320/Kconfig" diff --git a/arch/arm/mach-mvebu/Kconfig b/arch/arm/mach-mvebu/Kconfig index 82a439e..9f4d46b 100644 --- a/arch/arm/mach-mvebu/Kconfig +++ b/arch/arm/mach-mvebu/Kconfig @@ -18,6 +18,23 @@ config TARGET_MAXBCM
endchoice
+config SYS_BOARD + default "clearfog" if TARGET_CLEARFOG + default "db-88f6820-gp" if TARGET_DB_88F6820_GP + default "db-mv784mp-gp" if TARGET_DB_MV784MP_GP + default "maxbcm" if TARGET_MAXBCM + +config SYS_CONFIG_NAME + default "clearfog" if TARGET_CLEARFOG + default "db-88f6820-gp" if TARGET_DB_88F6820_GP + default "db-mv784mp-gp" if TARGET_DB_MV784MP_GP + default "maxbcm" if TARGET_MAXBCM + +config SYS_VENDOR + default "Marvell" if TARGET_DB_MV784MP_GP + default "Marvell" if TARGET_DB_88F6820_GP + default "solidrun" if TARGET_CLEARFOG + config SYS_SOC default "mvebu"
diff --git a/board/Marvell/db-88f6820-gp/Kconfig b/board/Marvell/db-88f6820-gp/Kconfig deleted file mode 100644 index f12b968..0000000 --- a/board/Marvell/db-88f6820-gp/Kconfig +++ /dev/null @@ -1,12 +0,0 @@ -if TARGET_DB_88F6820_GP - -config SYS_BOARD - default "db-88f6820-gp" - -config SYS_VENDOR - default "Marvell" - -config SYS_CONFIG_NAME - default "db-88f6820-gp" - -endif diff --git a/board/Marvell/db-mv784mp-gp/Kconfig b/board/Marvell/db-mv784mp-gp/Kconfig deleted file mode 100644 index 428a5e1..0000000 --- a/board/Marvell/db-mv784mp-gp/Kconfig +++ /dev/null @@ -1,12 +0,0 @@ -if TARGET_DB_MV784MP_GP - -config SYS_BOARD - default "db-mv784mp-gp" - -config SYS_VENDOR - default "Marvell" - -config SYS_CONFIG_NAME - default "db-mv784mp-gp" - -endif diff --git a/board/maxbcm/Kconfig b/board/maxbcm/Kconfig deleted file mode 100644 index 2edccfe..0000000 --- a/board/maxbcm/Kconfig +++ /dev/null @@ -1,9 +0,0 @@ -if TARGET_MAXBCM - -config SYS_BOARD - default "maxbcm" - -config SYS_CONFIG_NAME - default "maxbcm" - -endif diff --git a/board/solidrun/clearfog/Kconfig b/board/solidrun/clearfog/Kconfig deleted file mode 100644 index cdf8938..0000000 --- a/board/solidrun/clearfog/Kconfig +++ /dev/null @@ -1,12 +0,0 @@ -if TARGET_CLEARFOG - -config SYS_BOARD - default "clearfog" - -config SYS_VENDOR - default "solidrun" - -config SYS_CONFIG_NAME - default "clearfog" - -endif