CONFIG_SPL should not be enabled for boards that do not have SPL. CONFIG_SUPPORT_SPL introduced by this commit should be "select"ed by boards with SPL support and CONFIG_SPL should depend on it.
Signed-off-by: Masahiro Yamada yamada.m@jp.panasonic.com Acked-by: Simon Glass sjg@chromium.org ---
Changes in v3: - Rebase on commit dd0204e48
Changes in v2: None
Kconfig | 4 +++ arch/arm/Kconfig | 45 ++++++++++++++++++++++++++++++++++ arch/arm/cpu/arm926ejs/davinci/Kconfig | 4 +++ arch/arm/cpu/armv7/exynos/Kconfig | 7 ++++++ arch/arm/cpu/armv7/omap3/Kconfig | 16 ++++++++++++ arch/microblaze/Kconfig | 1 + arch/powerpc/cpu/mpc5xxx/Kconfig | 1 + arch/powerpc/cpu/mpc83xx/Kconfig | 1 + arch/powerpc/cpu/mpc85xx/Kconfig | 12 +++++++++ arch/powerpc/cpu/ppc4xx/Kconfig | 1 + 10 files changed, 92 insertions(+)
diff --git a/Kconfig b/Kconfig index e0c8992..29e0b92 100644 --- a/Kconfig +++ b/Kconfig @@ -70,8 +70,12 @@ config TPL_BUILD depends on $KCONFIG_OBJDIR="tpl" default y
+config SUPPORT_SPL + bool + config SPL bool + depends on SUPPORT_SPL prompt "Enable SPL" if !SPL_BUILD default y if SPL_BUILD help diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index 460657a..77cae45 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig @@ -152,12 +152,14 @@ config TARGET_MX25PDK
config TARGET_TX25 bool "Support tx25" + select SUPPORT_SPL
config TARGET_ZMX25 bool "Support zmx25"
config TARGET_APF27 bool "Support apf27" + select SUPPORT_SPL
config TARGET_IMX27LITE bool "Support imx27lite" @@ -167,30 +169,39 @@ config TARGET_MAGNESIUM
config TARGET_APX4DEVKIT bool "Support apx4devkit" + select SUPPORT_SPL
config TARGET_XFI3 bool "Support xfi3" + select SUPPORT_SPL
config TARGET_M28EVK bool "Support m28evk" + select SUPPORT_SPL
config TARGET_MX23EVK bool "Support mx23evk" + select SUPPORT_SPL
config TARGET_MX28EVK bool "Support mx28evk" + select SUPPORT_SPL
config TARGET_MX23_OLINUXINO bool "Support mx23_olinuxino" + select SUPPORT_SPL
config TARGET_BG0900 bool "Support bg0900" + select SUPPORT_SPL
config TARGET_SANSA_FUZE_PLUS bool "Support sansa_fuze_plus" + select SUPPORT_SPL
config TARGET_SC_SPS_1 bool "Support sc_sps_1" + select SUPPORT_SPL
config ARCH_NOMADIK bool "ST-Ericsson Nomadik" @@ -215,6 +226,7 @@ config TARGET_SPEAR600
config TARGET_X600 bool "Support x600" + select SUPPORT_SPL
config ARCH_VERSATILE bool "ARM Ltd. Versatile family" @@ -233,6 +245,7 @@ config TARGET_MX31ADS
config TARGET_MX31PDK bool "Support mx31pdk" + select SUPPORT_SPL
config TARGET_TT01 bool "Support tt01" @@ -245,6 +258,7 @@ config TARGET_WOODBURN
config TARGET_WOODBURN_SD bool "Support woodburn_sd" + select SUPPORT_SPL
config TARGET_FLEA3 bool "Support flea3" @@ -275,54 +289,71 @@ config TARGET_VEXPRESS_CA9X4
config TARGET_KWB bool "Support kwb" + select SUPPORT_SPL
config TARGET_TSERIES bool "Support tseries" + select SUPPORT_SPL
config TARGET_CM_T335 bool "Support cm_t335" + select SUPPORT_SPL
config TARGET_PEPPER bool "Support pepper" + select SUPPORT_SPL
config TARGET_AM335X_IGEP0033 bool "Support am335x_igep0033" + select SUPPORT_SPL
config TARGET_PCM051 bool "Support pcm051" + select SUPPORT_SPL
config TARGET_DRACO bool "Support draco" + select SUPPORT_SPL
config TARGET_DXR2 bool "Support dxr2" + select SUPPORT_SPL
config TARGET_PXM2 bool "Support pxm2" + select SUPPORT_SPL
config TARGET_RUT bool "Support rut" + select SUPPORT_SPL
config TARGET_PENGWYN bool "Support pengwyn" + select SUPPORT_SPL
config TARGET_AM335X_EVM bool "Support am335x_evm" + select SUPPORT_SPL
config TARGET_AM43XX_EVM bool "Support am43xx_evm" + select SUPPORT_SPL
config TARGET_TI814X_EVM bool "Support ti814x_evm" + select SUPPORT_SPL
config TARGET_TI816X_EVM bool "Support ti816x_evm" + select SUPPORT_SPL
config TARGET_SAMA5D3_XPLAINED bool "Support sama5d3_xplained" + select SUPPORT_SPL
config TARGET_SAMA5D3XEK bool "Support sama5d3xek" + select SUPPORT_SPL
config TARGET_BCM28155_AP bool "Support bcm28155_ap" @@ -344,6 +375,7 @@ config ARCH_KEYSTONE
config TARGET_M53EVK bool "Support m53evk" + select SUPPORT_SPL
config TARGET_IMA3_MX53 bool "Support ima3-mx53" @@ -407,6 +439,7 @@ config TARGET_MX6SXSABRESD
config TARGET_GW_VENTANA bool "Support gw_ventana" + select SUPPORT_SPL
config TARGET_HUMMINGBOARD bool "Support hummingboard" @@ -419,15 +452,18 @@ config OMAP34XX
config OMAP44XX bool "OMAP44XX SoC" + select SUPPORT_SPL
config OMAP54XX bool "OMAP54XX SoC" + select SUPPORT_SPL
config RMOBILE bool "Renesas ARM SoCs"
config TARGET_CM_FX6 bool "Support cm_fx6" + select SUPPORT_SPL
config TARGET_S5P_GONI bool "Support s5p_goni" @@ -437,15 +473,19 @@ config TARGET_SMDKC100
config TARGET_SOCFPGA_CYCLONE5 bool "Support socfpga_cyclone5" + select SUPPORT_SPL
config TARGET_SUN4I bool "Support sun4i" + select SUPPORT_SPL
config TARGET_SUN5I bool "Support sun5i" + select SUPPORT_SPL
config TARGET_SUN7I bool "Support sun7i" + select SUPPORT_SPL
config TARGET_SNOWBALL bool "Support snowball" @@ -458,9 +498,11 @@ config TARGET_VF610TWR
config ZYNQ bool "Xilinx Zynq Platform" + select SUPPORT_SPL
config TEGRA bool "NVIDIA Tegra" + select SUPPORT_SPL select SPL select OF_CONTROL if !SPL_BUILD
@@ -496,6 +538,7 @@ config TARGET_PALMTC
config TARGET_PALMTREO680 bool "Support palmtreo680" + select SUPPORT_SPL
config TARGET_PXA255_IDP bool "Support pxa255_idp" @@ -505,6 +548,7 @@ config TARGET_TRIZEPSIV
config TARGET_VPAC270 bool "Support vpac270" + select SUPPORT_SPL
config TARGET_XAENIAX bool "Support xaeniax" @@ -523,6 +567,7 @@ config TARGET_JORNADA
config ARCH_UNIPHIER bool "Panasonic UniPhier platform" + select SUPPORT_SPL
endchoice
diff --git a/arch/arm/cpu/arm926ejs/davinci/Kconfig b/arch/arm/cpu/arm926ejs/davinci/Kconfig index 4c18ab6..1791cef 100644 --- a/arch/arm/cpu/arm926ejs/davinci/Kconfig +++ b/arch/arm/cpu/arm926ejs/davinci/Kconfig @@ -8,18 +8,22 @@ config TARGET_ENBW_CMC
config TARGET_IPAM390 bool "IPAM390 board" + select SUPPORT_SPL
config TARGET_DA830EVM bool "DA830 EVM board"
config TARGET_DA850EVM bool "DA850 EVM board" + select SUPPORT_SPL
config TARGET_CAM_ENC_4XX bool "CAM ENC 4xx board" + select SUPPORT_SPL
config TARGET_HAWKBOARD bool "Hawkboard" + select SUPPORT_SPL
config TARGET_DAVINCI_DM355EVM bool "DM355 EVM board" diff --git a/arch/arm/cpu/armv7/exynos/Kconfig b/arch/arm/cpu/armv7/exynos/Kconfig index e7c93d8..72d90e7 100644 --- a/arch/arm/cpu/armv7/exynos/Kconfig +++ b/arch/arm/cpu/armv7/exynos/Kconfig @@ -4,6 +4,7 @@ choice prompt "EXYNOS board select"
config TARGET_SMDKV310 + select SUPPORT_SPL bool "Exynos4210 SMDKV310 board"
config TARGET_TRATS @@ -14,6 +15,7 @@ config TARGET_S5PC210_UNIVERSAL
config TARGET_ORIGEN bool "Exynos4412 Origen board" + select SUPPORT_SPL
config TARGET_TRATS2 bool "Exynos4412 Trat2 board" @@ -23,22 +25,27 @@ config TARGET_ODROID
config TARGET_ARNDALE bool "Exynos5250 Arndale board" + select SUPPORT_SPL select OF_CONTROL if !SPL_BUILD
config TARGET_SMDK5250 bool "SMDK5250 board" + select SUPPORT_SPL select OF_CONTROL if !SPL_BUILD
config TARGET_SNOW bool "Snow board" + select SUPPORT_SPL select OF_CONTROL if !SPL_BUILD
config TARGET_SMDK5420 bool "SMDK5420 board" + select SUPPORT_SPL select OF_CONTROL if !SPL_BUILD
config TARGET_PEACH_PIT bool "Peach Pi board" + select SUPPORT_SPL select OF_CONTROL if !SPL_BUILD
endchoice diff --git a/arch/arm/cpu/armv7/omap3/Kconfig b/arch/arm/cpu/armv7/omap3/Kconfig index 6fae1e5..26e328f 100644 --- a/arch/arm/cpu/armv7/omap3/Kconfig +++ b/arch/arm/cpu/armv7/omap3/Kconfig @@ -5,57 +5,71 @@ choice
config TARGET_AM3517_EVM bool "AM3517 EVM" + select SUPPORT_SPL
config TARGET_MT_VENTOUX bool "TeeJet Mt.Ventoux" + select SUPPORT_SPL
config TARGET_OMAP3_SDP3430 bool "TI OMAP3430 SDP"
config TARGET_OMAP3_BEAGLE bool "TI OMAP3 BeagleBoard" + select SUPPORT_SPL
config TARGET_CM_T35 bool "CompuLab CM-T35" + select SUPPORT_SPL
config TARGET_DEVKIT8000 bool "TimLL OMAP3 Devkit8000" + select SUPPORT_SPL
config TARGET_OMAP3_EVM bool "TI OMAP3 EVM" + select SUPPORT_SPL
config TARGET_OMAP3_EVM_QUICK_MMC bool "TI OMAP3 EVM Quick MMC" + select SUPPORT_SPL
config TARGET_OMAP3_EVM_QUICK_NAND bool "TI OMAP3 EVM Quick NAND" + select SUPPORT_SPL
config TARGET_OMAP3_IGEP00X0 bool "IGEP" + select SUPPORT_SPL
config TARGET_OMAP3_OVERO bool "OMAP35xx Gumstix Overo" + select SUPPORT_SPL
config TARGET_OMAP3_ZOOM1 bool "TI Zoom1"
config TARGET_AM3517_CRANE bool "am3517_crane" + select SUPPORT_SPL
config TARGET_OMAP3_PANDORA bool "OMAP3 Pandora"
config TARGET_ECO5PK bool "ECO5PK" + select SUPPORT_SPL
config TARGET_DIG297 bool "DIG297"
config TARGET_TRICORDER bool "Tricorder" + select SUPPORT_SPL
config TARGET_MCX bool "MCX" + select SUPPORT_SPL
config TARGET_OMAP3_LOGIC bool "OMAP3 Logic" @@ -68,9 +82,11 @@ config TARGET_NOKIA_RX51
config TARGET_TAO3530 bool "TAO3530" + select SUPPORT_SPL
config TARGET_TWISTER bool "Twister" + select SUPPORT_SPL
endchoice
diff --git a/arch/microblaze/Kconfig b/arch/microblaze/Kconfig index 33bfd9f..6f419f0 100644 --- a/arch/microblaze/Kconfig +++ b/arch/microblaze/Kconfig @@ -9,6 +9,7 @@ choice
config TARGET_MICROBLAZE_GENERIC bool "Support microblaze-generic" + select SUPPORT_SPL
endchoice
diff --git a/arch/powerpc/cpu/mpc5xxx/Kconfig b/arch/powerpc/cpu/mpc5xxx/Kconfig index cca58e5..7f6ae8e 100644 --- a/arch/powerpc/cpu/mpc5xxx/Kconfig +++ b/arch/powerpc/cpu/mpc5xxx/Kconfig @@ -9,6 +9,7 @@ choice
config TARGET_A3M071 bool "Support a3m071" + select SUPPORT_SPL
config TARGET_A4M072 bool "Support a4m072" diff --git a/arch/powerpc/cpu/mpc83xx/Kconfig b/arch/powerpc/cpu/mpc83xx/Kconfig index 6de9265..2d5a424 100644 --- a/arch/powerpc/cpu/mpc83xx/Kconfig +++ b/arch/powerpc/cpu/mpc83xx/Kconfig @@ -24,6 +24,7 @@ config TARGET_MPC8308RDB
config TARGET_MPC8313ERDB bool "Support MPC8313ERDB" + select SUPPORT_SPL
config TARGET_MPC8315ERDB bool "Support MPC8315ERDB" diff --git a/arch/powerpc/cpu/mpc85xx/Kconfig b/arch/powerpc/cpu/mpc85xx/Kconfig index 8c1c01c..6dcc45a 100644 --- a/arch/powerpc/cpu/mpc85xx/Kconfig +++ b/arch/powerpc/cpu/mpc85xx/Kconfig @@ -18,15 +18,19 @@ config TARGET_HWW1U1A
config TARGET_B4860QDS bool "Support B4860QDS" + select SUPPORT_SPL
config TARGET_BSC9131RDB bool "Support BSC9131RDB" + select SUPPORT_SPL
config TARGET_BSC9132QDS bool "Support BSC9132QDS" + select SUPPORT_SPL
config TARGET_C29XPCIE bool "Support C29XPCIE" + select SUPPORT_SPL
config TARGET_P3041DS bool "Support P3041DS" @@ -72,18 +76,22 @@ config TARGET_MPC8572DS
config TARGET_P1010RDB bool "Support P1010RDB" + select SUPPORT_SPL
config TARGET_P1022DS bool "Support P1022DS" + select SUPPORT_SPL
config TARGET_P1023RDB bool "Support P1023RDB"
config TARGET_P1_P2_RDB bool "Support P1_P2_RDB" + select SUPPORT_SPL
config TARGET_P1_P2_RDB_PC bool "Support p1_p2_rdb_pc" + select SUPPORT_SPL
config TARGET_P1_TWR bool "Support p1_twr" @@ -105,18 +113,22 @@ config TARGET_T1040QDS
config TARGET_T104XRDB bool "Support T104xRDB" + select SUPPORT_SPL
config TARGET_T208XQDS bool "Support T208xQDS" + select SUPPORT_SPL
config TARGET_T208XRDB bool "Support T208xRDB" + select SUPPORT_SPL
config TARGET_T4240EMU bool "Support T4240EMU"
config TARGET_T4240QDS bool "Support T4240QDS" + select SUPPORT_SPL
config TARGET_T4240RDB bool "Support T4240RDB" diff --git a/arch/powerpc/cpu/ppc4xx/Kconfig b/arch/powerpc/cpu/ppc4xx/Kconfig index 41b525c..f525289 100644 --- a/arch/powerpc/cpu/ppc4xx/Kconfig +++ b/arch/powerpc/cpu/ppc4xx/Kconfig @@ -24,6 +24,7 @@ config TARGET_KORAT
config TARGET_LWMON5 bool "Support lwmon5" + select SUPPORT_SPL
config TARGET_PCS440EP bool "Support pcs440ep"