diff options
-rw-r--r-- | arch/arm/mach-kirkwood/Kconfig | 9 | ||||
-rw-r--r-- | arch/powerpc/cpu/mpc83xx/Kconfig | 44 | ||||
-rw-r--r-- | arch/powerpc/cpu/mpc85xx/Kconfig | 8 | ||||
-rw-r--r-- | board/keymile/Kconfig | 16 | ||||
-rw-r--r-- | board/keymile/km83xx/Kconfig | 62 | ||||
-rw-r--r-- | board/keymile/km_arm/Kconfig | 7 | ||||
-rw-r--r-- | board/keymile/kmp204x/Kconfig | 8 |
7 files changed, 109 insertions, 45 deletions
diff --git a/arch/arm/mach-kirkwood/Kconfig b/arch/arm/mach-kirkwood/Kconfig index 7c4170399a..2f68092f82 100644 --- a/arch/arm/mach-kirkwood/Kconfig +++ b/arch/arm/mach-kirkwood/Kconfig @@ -32,11 +32,8 @@ config TARGET_ICONNECT bool "iconnect Board" config TARGET_KM_KIRKWOOD - bool "KM_KIRKWOOD Board" - select BOARD_LATE_INIT - imply CMD_CRAMFS - imply CMD_DIAG - imply FS_CRAMFS + bool "KM Kirkwood Board" + select VENDOR_KM config TARGET_NET2BIG_V2 bool "LaCie 2Big Network v2 NAS Board" @@ -82,7 +79,7 @@ source "board/buffalo/lsxl/Kconfig" source "board/cloudengines/pogo_e02/Kconfig" source "board/d-link/dns325/Kconfig" source "board/iomega/iconnect/Kconfig" -source "board/keymile/km_arm/Kconfig" +source "board/keymile/Kconfig" source "board/LaCie/net2big_v2/Kconfig" source "board/LaCie/netspace_v2/Kconfig" source "board/raidsonic/ib62x0/Kconfig" diff --git a/arch/powerpc/cpu/mpc83xx/Kconfig b/arch/powerpc/cpu/mpc83xx/Kconfig index b99288aa83..3f68b6f645 100644 --- a/arch/powerpc/cpu/mpc83xx/Kconfig +++ b/arch/powerpc/cpu/mpc83xx/Kconfig @@ -100,65 +100,43 @@ config TARGET_IDS8313 config TARGET_KMETER1 bool "Support kmeter1" - select ARCH_MPC8360 - imply CMD_CRAMFS - imply CMD_DIAG - imply FS_CRAMFS + select VENDOR_KM config TARGET_KMCOGE5NE bool "Support kmcoge5ne" - select ARCH_MPC8360 - imply CMD_CRAMFS - imply CMD_DIAG - imply FS_CRAMFS + select VENDOR_KM config TARGET_SUVD3 bool "Support suvd3" - select ARCH_MPC832X - imply CMD_CRAMFS - imply FS_CRAMFS + select VENDOR_KM config TARGET_KMVECT1 bool "Support kmvect1" - select ARCH_MPC8309 - imply CMD_CRAMFS - imply FS_CRAMFS + select VENDOR_KM config TARGET_KMTEGR1 bool "Support kmtegr1" - select ARCH_MPC8309 - imply CMD_CRAMFS - imply FS_CRAMFS + select VENDOR_KM config TARGET_TUXX1 bool "Support tuxx1" - select ARCH_MPC832X - imply CMD_CRAMFS - imply FS_CRAMFS + select VENDOR_KM config TARGET_KMSUPX5 bool "Support kmsupx5" - select ARCH_MPC832X - imply CMD_CRAMFS - imply FS_CRAMFS + select VENDOR_KM config TARGET_TUGE1 bool "Support tuge1" - select ARCH_MPC832X - imply CMD_CRAMFS - imply FS_CRAMFS + select VENDOR_KM config TARGET_KMOPTI2 bool "Support kmopti2" - select ARCH_MPC832X - imply CMD_CRAMFS - imply FS_CRAMFS + select VENDOR_KM config TARGET_KMTEPR2 bool "Support kmtepr2" - select ARCH_MPC832X - imply CMD_CRAMFS - imply FS_CRAMFS + select VENDOR_KM config TARGET_TQM834X bool "Support TQM834x" @@ -354,7 +332,7 @@ source "board/freescale/mpc8349itx/Kconfig" source "board/freescale/mpc837xemds/Kconfig" source "board/freescale/mpc837xerdb/Kconfig" source "board/ids/ids8313/Kconfig" -source "board/keymile/km83xx/Kconfig" +source "board/keymile/Kconfig" source "board/mpc8308_p1m/Kconfig" source "board/sbc8349/Kconfig" source "board/tqc/tqm834x/Kconfig" diff --git a/arch/powerpc/cpu/mpc85xx/Kconfig b/arch/powerpc/cpu/mpc85xx/Kconfig index 7572404625..c038a6ddb0 100644 --- a/arch/powerpc/cpu/mpc85xx/Kconfig +++ b/arch/powerpc/cpu/mpc85xx/Kconfig @@ -412,11 +412,7 @@ config TARGET_CONTROLCENTERD config TARGET_KMP204X bool "Support kmp204x" - select ARCH_P2041 - select PHYS_64BIT - select FSL_DDR_INTERACTIVE - imply CMD_CRAMFS - imply FS_CRAMFS + select VENDOR_KM config TARGET_XPEDITE520X bool "Support xpedite520x" @@ -1620,7 +1616,7 @@ source "board/freescale/t208xrdb/Kconfig" source "board/freescale/t4qds/Kconfig" source "board/freescale/t4rdb/Kconfig" source "board/gdsys/p1022/Kconfig" -source "board/keymile/kmp204x/Kconfig" +source "board/keymile/Kconfig" source "board/sbc8548/Kconfig" source "board/socrates/Kconfig" source "board/varisys/cyrus/Kconfig" diff --git a/board/keymile/Kconfig b/board/keymile/Kconfig new file mode 100644 index 0000000000..e30d64818c --- /dev/null +++ b/board/keymile/Kconfig @@ -0,0 +1,16 @@ +# SPDX-License-Identifier: GPL-2.0+ +# +# Copyright (C) 2019, Pascal Linder <pascal.linder@edu.hefr.ch> + +config VENDOR_KM + bool + help + Selected by any KM board to have additional configurations. + +if VENDOR_KM + +source "board/keymile/km83xx/Kconfig" +source "board/keymile/kmp204x/Kconfig" +source "board/keymile/km_arm/Kconfig" + +endif diff --git a/board/keymile/km83xx/Kconfig b/board/keymile/km83xx/Kconfig index fbbbb17034..0a41be57f5 100644 --- a/board/keymile/km83xx/Kconfig +++ b/board/keymile/km83xx/Kconfig @@ -9,6 +9,13 @@ config SYS_VENDOR config SYS_CONFIG_NAME default "kmeter1" +config BOARD_SPECIFIC_OPTIONS # dummy + def_bool y + select ARCH_MPC8360 + imply CMD_CRAMFS + imply CMD_DIAG + imply FS_CRAMFS + endif if TARGET_KMCOGE5NE @@ -22,6 +29,13 @@ config SYS_VENDOR config SYS_CONFIG_NAME default "kmcoge5ne" +config BOARD_SPECIFIC_OPTIONS # dummy + def_bool y + select ARCH_MPC8360 + imply CMD_CRAMFS + imply CMD_DIAG + imply FS_CRAMFS + endif if TARGET_KMVECT1 @@ -35,6 +49,12 @@ config SYS_VENDOR config SYS_CONFIG_NAME default "kmvect1" +config BOARD_SPECIFIC_OPTIONS # dummy + def_bool y + select ARCH_MPC8309 + imply CMD_CRAMFS + imply FS_CRAMFS + endif if TARGET_KMTEGR1 @@ -48,6 +68,12 @@ config SYS_VENDOR config SYS_CONFIG_NAME default "kmtegr1" +config BOARD_SPECIFIC_OPTIONS # dummy + def_bool y + select ARCH_MPC8309 + imply CMD_CRAMFS + imply FS_CRAMFS + endif if TARGET_SUVD3 @@ -61,6 +87,12 @@ config SYS_VENDOR config SYS_CONFIG_NAME default "suvd3" +config BOARD_SPECIFIC_OPTIONS # dummy + def_bool y + select ARCH_MPC832X + imply CMD_CRAMFS + imply FS_CRAMFS + endif if TARGET_TUXX1 @@ -74,6 +106,12 @@ config SYS_VENDOR config SYS_CONFIG_NAME default "tuxx1" +config BOARD_SPECIFIC_OPTIONS # dummy + def_bool y + select ARCH_MPC832X + imply CMD_CRAMFS + imply FS_CRAMFS + endif if TARGET_KMSUPX5 @@ -87,6 +125,12 @@ config SYS_VENDOR config SYS_CONFIG_NAME default "kmsupx5" +config BOARD_SPECIFIC_OPTIONS # dummy + def_bool y + select ARCH_MPC832X + imply CMD_CRAMFS + imply FS_CRAMFS + endif if TARGET_TUGE1 @@ -100,6 +144,12 @@ config SYS_VENDOR config SYS_CONFIG_NAME default "tuge1" +config BOARD_SPECIFIC_OPTIONS # dummy + def_bool y + select ARCH_MPC832X + imply CMD_CRAMFS + imply FS_CRAMFS + endif if TARGET_KMOPTI2 @@ -113,6 +163,12 @@ config SYS_VENDOR config SYS_CONFIG_NAME default "kmopti2" +config BOARD_SPECIFIC_OPTIONS # dummy + def_bool y + select ARCH_MPC832X + imply CMD_CRAMFS + imply FS_CRAMFS + endif if TARGET_KMTEPR2 @@ -126,4 +182,10 @@ config SYS_VENDOR config SYS_CONFIG_NAME default "kmtepr2" +config BOARD_SPECIFIC_OPTIONS # dummy + def_bool y + select ARCH_MPC832X + imply CMD_CRAMFS + imply FS_CRAMFS + endif diff --git a/board/keymile/km_arm/Kconfig b/board/keymile/km_arm/Kconfig index 3476780847..2542f1ea8f 100644 --- a/board/keymile/km_arm/Kconfig +++ b/board/keymile/km_arm/Kconfig @@ -9,4 +9,11 @@ config SYS_VENDOR config SYS_CONFIG_NAME default "km_kirkwood" +config BOARD_SPECIFIC_OPTIONS # dummy + def_bool y + select BOARD_LATE_INIT + imply CMD_CRAMFS + imply CMD_DIAG + imply FS_CRAMFS + endif diff --git a/board/keymile/kmp204x/Kconfig b/board/keymile/kmp204x/Kconfig index 7b45a13cfb..f74d4295c7 100644 --- a/board/keymile/kmp204x/Kconfig +++ b/board/keymile/kmp204x/Kconfig @@ -9,4 +9,12 @@ config SYS_VENDOR config SYS_CONFIG_NAME default "kmp204x" +config BOARD_SPECIFIC_OPTIONS # dummy + def_bool y + select ARCH_P2041 + select FSL_DDR_INTERACTIVE + select PHYS_64BIT + imply CMD_CRAMFS + imply FS_CRAMFS + endif |