kconfig: remove unneeded dependency on !SPL_BUILD

Now CONFIG_SPL_BUILD is not defined in Kconfig, so
"!depends on SPL_BUILD" and "if !SPL_BUILD" are redundant.

Signed-off-by: Masahiro Yamada <yamada.m@jp.panasonic.com>

diff --git a/Kconfig b/Kconfig
index bb9b5c27fff6da85d4131a72b2cfb1ff0c33fb93..d0318cc87975e719383457772da7a75bf85ffc26 100644 (file)
--- a/Kconfig
+++ b/Kconfig
@@ -15,7 +15,6 @@ menu "General setup"
 
 config LOCALVERSION
        string "Local version - append to U-Boot release"
-       depends on !SPL_BUILD
        help
          Append an extra string to the end of your U-Boot version.
          This will show up on your boot log, for example.
@@ -26,7 +25,6 @@ config LOCALVERSION
 
 config LOCALVERSION_AUTO
        bool "Automatically append version information to the version string"
-       depends on !SPL_BUILD
        default y
        help
          This will try to automatically determine if the current tree is a
@@ -47,7 +45,6 @@ config LOCALVERSION_AUTO
 
 config CC_OPTIMIZE_FOR_SIZE
        bool "Optimize for size"
-       depends on !SPL_BUILD
        default y
        help
          Enabling this option will pass "-Os" instead of "-O2" to gcc
@@ -95,23 +92,19 @@ config SUPPORT_TPL
 config SPL
        bool
        depends on SUPPORT_SPL
-       prompt "Enable SPL" if !SPL_BUILD
-       default y if SPL_BUILD
+       prompt "Enable SPL"
        help
          If you want to build SPL as well as the normal image, say Y.
 
 config TPL
        bool
        depends on SPL && SUPPORT_TPL
-       prompt "Enable TPL" if !SPL_BUILD
-       default y if TPL_BUILD
-       default n
+       prompt "Enable TPL"
        help
          If you want to build TPL as well as the normal image and SPL, say Y.
 
 config FIT
        bool "Support Flattened Image Tree"
-       depends on !SPL_BUILD
        help
          This option allows to boot the new uImage structrure,
          Flattened Image Tree.  FIT is formally a FDT, which can include
@@ -135,7 +128,6 @@ config FIT_SIGNATURE
 
 config SYS_EXTRA_OPTIONS
        string "Extra Options (DEPRECATED)"
-       depends on !SPL_BUILD
        help
          The old configuration infrastructure (= mkconfig + boards.cfg)
          provided the extra options field. If you have something like

diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index 820ba1ccabad8cd8650ea00cf4abc29e5b68f9f9..34083192b6377f18f5eaeceac04de396149d7c38 100644 (file)
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -620,9 +620,8 @@ config TEGRA
        bool "NVIDIA Tegra"
        select SUPPORT_SPL
        select SPL
-       select OF_CONTROL if !SPL_BUILD
-       select CPU_ARM720T if SPL_BUILD
-       select CPU_V7 if !SPL_BUILD
+       select OF_CONTROL
+       select CPU_V7
 
 config TARGET_VEXPRESS64_AEMV8A
        bool "Support vexpress_aemv8a"
@@ -714,7 +713,7 @@ config ARCH_UNIPHIER
        select CPU_V7
        select SUPPORT_SPL
        select SPL
-       select OF_CONTROL if !SPL_BUILD
+       select OF_CONTROL
 
 endchoice
 

diff --git a/arch/arm/cpu/arm1176/bcm2835/Kconfig b/arch/arm/cpu/arm1176/bcm2835/Kconfig
index 162f973f6cce1b8680b453fe3238fd3f200fb6f5..73cc72b41185c021c0ccde6cfbbd9aa8a7ddf18b 100644 (file)
--- a/arch/arm/cpu/arm1176/bcm2835/Kconfig
+++ b/arch/arm/cpu/arm1176/bcm2835/Kconfig
@@ -1,12 +1,12 @@
 if TARGET_RPI || TARGET_RPI_2
 
 config DM
-       default y if !SPL_BUILD
+       default y
 
 config DM_SERIAL
-       default y if !SPL_BUILD
+       default y
 
 config DM_GPIO
-       default y if !SPL_BUILD
+       default y
 
 endif

diff --git a/arch/arm/cpu/armv7/exynos/Kconfig b/arch/arm/cpu/armv7/exynos/Kconfig
index 2064efa761991b89488219b54019cefdd99064f7..eb86a7fe7dcb14d331d8472863592d0ca2b4fc2b 100644 (file)
--- a/arch/arm/cpu/armv7/exynos/Kconfig
+++ b/arch/arm/cpu/armv7/exynos/Kconfig
@@ -6,7 +6,7 @@ choice
 config TARGET_SMDKV310
        select SUPPORT_SPL
        bool "Exynos4210 SMDKV310 board"
-       select OF_CONTROL if !SPL_BUILD
+       select OF_CONTROL
 
 config TARGET_TRATS
        bool "Exynos4210 Trats board"
@@ -33,32 +33,32 @@ config TARGET_ARNDALE
        select CPU_V7_HAS_NONSEC
        select CPU_V7_HAS_VIRT
        select SUPPORT_SPL
-       select OF_CONTROL if !SPL_BUILD
+       select OF_CONTROL
 
 config TARGET_SMDK5250
        bool "SMDK5250 board"
        select SUPPORT_SPL
-       select OF_CONTROL if !SPL_BUILD
+       select OF_CONTROL
 
 config TARGET_SNOW
        bool "Snow board"
        select SUPPORT_SPL
-       select OF_CONTROL if !SPL_BUILD
+       select OF_CONTROL
 
 config TARGET_SMDK5420
        bool "SMDK5420 board"
        select SUPPORT_SPL
-       select OF_CONTROL if !SPL_BUILD
+       select OF_CONTROL
 
 config TARGET_PEACH_PI
        bool "Peach Pi board"
        select SUPPORT_SPL
-       select OF_CONTROL if !SPL_BUILD
+       select OF_CONTROL
 
 config TARGET_PEACH_PIT
        bool "Peach Pit board"
        select SUPPORT_SPL
-       select OF_CONTROL if !SPL_BUILD
+       select OF_CONTROL
 
 endchoice
 
@@ -66,25 +66,25 @@ config SYS_SOC
        default "exynos"
 
 config DM
-       default y if !SPL_BUILD
+       default y
 
 config DM_SERIAL
-       default y if !SPL_BUILD
+       default y
 
 config DM_SPI
-       default y if !SPL_BUILD
+       default y
 
 config DM_SPI_FLASH
-       default y if !SPL_BUILD
+       default y
 
 config DM_GPIO
-       default y if !SPL_BUILD
+       default y
 
 config SYS_MALLOC_F
-       default y if !SPL_BUILD
+       default y
 
 config SYS_MALLOC_F_LEN
-       default 0x400 if !SPL_BUILD
+       default 0x400
 
 source "board/samsung/smdkv310/Kconfig"
 source "board/samsung/trats/Kconfig"

diff --git a/arch/arm/cpu/armv7/omap3/Kconfig b/arch/arm/cpu/armv7/omap3/Kconfig
index 46440981b3744e315a2f424fb7ebb75ca485bb4d..4a0ac2c987a224dfe714d3f4da4045c07157e4c6 100644 (file)
--- a/arch/arm/cpu/armv7/omap3/Kconfig
+++ b/arch/arm/cpu/armv7/omap3/Kconfig
@@ -94,19 +94,19 @@ config TARGET_TWISTER
 endchoice
 
 config DM
-       default y if !SPL_BUILD
+       default y
 
 config DM_GPIO
-       default y if DM && !SPL_BUILD
+       default y if DM
 
 config DM_SERIAL
-       default y if DM && !SPL_BUILD
+       default y if DM
 
 config SYS_MALLOC_F
-       default y if DM && !SPL_BUILD
+       default y if DM
 
 config SYS_MALLOC_F_LEN
-       default 0x400 if DM && !SPL_BUILD
+       default 0x400 if DM
 
 config SYS_SOC
        default "omap3"

diff --git a/arch/arm/cpu/armv7/s5pc1xx/Kconfig b/arch/arm/cpu/armv7/s5pc1xx/Kconfig
index 628813423feffb85eb7f8a9883061d8aeabd6f82..bc738138328020020bad3a04ff8aea2d179b1dd2 100644 (file)
--- a/arch/arm/cpu/armv7/s5pc1xx/Kconfig
+++ b/arch/arm/cpu/armv7/s5pc1xx/Kconfig
@@ -5,11 +5,11 @@ choice
 
 config TARGET_S5P_GONI
        bool "S5P Goni board"
-       select OF_CONTROL if !SPL_BUILD
+       select OF_CONTROL
 
 config TARGET_SMDKC100
        bool "Support smdkc100 board"
-       select OF_CONTROL if !SPL_BUILD
+       select OF_CONTROL
 
 endchoice
 

diff --git a/arch/arm/cpu/armv7/uniphier/Kconfig b/arch/arm/cpu/armv7/uniphier/Kconfig
index 9bbc011eeea0dae0815569bc65dbc1f72af664b7..8335685e32949c47b2f0379532e98b8c08c3f851 100644 (file)
--- a/arch/arm/cpu/armv7/uniphier/Kconfig
+++ b/arch/arm/cpu/armv7/uniphier/Kconfig
@@ -64,7 +64,6 @@ config CMD_PINMON
 
 config CMD_DDRPHY_DUMP
        bool "Enable dump command of DDR PHY parameters"
-       depends on !SPL_BUILD
        help
          The command "ddrphy" shows the resulting parameters of DDR PHY
          training; it is useful for the evaluation of DDR PHY training.

diff --git a/arch/arm/mach-tegra/Kconfig b/arch/arm/mach-tegra/Kconfig
index 8569167369c5b709062fb1a72918c3995939b81b..8615248377e4927e1ec8490b99301727590291d4 100644 (file)
--- a/arch/arm/mach-tegra/Kconfig
+++ b/arch/arm/mach-tegra/Kconfig
@@ -27,22 +27,22 @@ config USE_PRIVATE_LIBGCC
        default y
 
 config DM
-       default y if !SPL_BUILD
+       default y
 
 config DM_SERIAL
-       default y if !SPL_BUILD
+       default y
 
 config DM_SPI
-       default y if !SPL_BUILD
+       default y
 
 config DM_SPI_FLASH
-       default y if !SPL_BUILD
+       default y
 
 config DM_I2C
-       default y if !SPL_BUILD
+       default y
 
 config DM_GPIO
-       default y if !SPL_BUILD
+       default y
 
 source "arch/arm/mach-tegra/tegra20/Kconfig"
 source "arch/arm/mach-tegra/tegra30/Kconfig"

diff --git a/board/compulab/cm_t335/Kconfig b/board/compulab/cm_t335/Kconfig
index aadbfbc84dc86cc44effb384bbb245e272726b68..3a8f304bd938cc32941de26be40a4a36d19a4198 100644 (file)
--- a/board/compulab/cm_t335/Kconfig
+++ b/board/compulab/cm_t335/Kconfig
@@ -13,12 +13,12 @@ config SYS_CONFIG_NAME
        default "cm_t335"
 
 config DM
-       default y if !SPL_BUILD
+       default y
 
 config DM_GPIO
-       default y if !SPL_BUILD
+       default y
 
 config DM_SERIAL
-       default y if !SPL_BUILD
+       default y
 
 endif

diff --git a/board/gumstix/pepper/Kconfig b/board/gumstix/pepper/Kconfig
index 3099a9eae153fb0f1c9b0c637ba56af666110d2c..750db8585d93e2f6b743bc5356c6706b3f71affd 100644 (file)
--- a/board/gumstix/pepper/Kconfig
+++ b/board/gumstix/pepper/Kconfig
@@ -13,12 +13,12 @@ config SYS_CONFIG_NAME
        default "pepper"
 
 config DM
-       default y if !SPL_BUILD
+       default y
 
 config DM_GPIO
-       default y if !SPL_BUILD
+       default y
 
 config DM_SERIAL
-       default y if !SPL_BUILD
+       default y
 
 endif

diff --git a/board/isee/igep0033/Kconfig b/board/isee/igep0033/Kconfig
index 2fe2ef17062ee39f07e01c3a9849a224c03d74fd..9a8421eb7a4f0879c7906e9cec59566efc89e1bc 100644 (file)
--- a/board/isee/igep0033/Kconfig
+++ b/board/isee/igep0033/Kconfig
@@ -13,12 +13,12 @@ config SYS_CONFIG_NAME
        default "am335x_igep0033"
 
 config DM
-       default y if !SPL_BUILD
+       default y
 
 config DM_GPIO
-       default y if !SPL_BUILD
+       default y
 
 config DM_SERIAL
-       default y if !SPL_BUILD
+       default y
 
 endif

diff --git a/board/phytec/pcm051/Kconfig b/board/phytec/pcm051/Kconfig
index 65094cf9fde2f330b89dc713fd5fc52e54ad684e..bb987156e6a676de228710676a7db25e8c1fac50 100644 (file)
--- a/board/phytec/pcm051/Kconfig
+++ b/board/phytec/pcm051/Kconfig
@@ -13,12 +13,12 @@ config SYS_CONFIG_NAME
        default "pcm051"
 
 config DM
-       default y if !SPL_BUILD
+       default y
 
 config DM_GPIO
-       default y if !SPL_BUILD
+       default y
 
 config DM_SERIAL
-       default y if !SPL_BUILD
+       default y
 
 endif

diff --git a/board/samsung/goni/Kconfig b/board/samsung/goni/Kconfig
index 2c5d3fc3be54cc9ebc8727846c3f89d16bcd575f..006e864e0b0413ea8c5d87e11a25ac05df9e04ba 100644 (file)
--- a/board/samsung/goni/Kconfig
+++ b/board/samsung/goni/Kconfig
@@ -13,12 +13,12 @@ config SYS_CONFIG_NAME
        default "s5p_goni"
 
 config DM
-       default y if !SPL_BUILD
+       default y
 
 config DM_GPIO
-       default y if !SPL_BUILD
+       default y
 
 config DM_SERIAL
-       default y if !SPL_BUILD
+       default y
 
 endif

diff --git a/board/samsung/smdkc100/Kconfig b/board/samsung/smdkc100/Kconfig
index 996fe3cc4506a410211ef998c1d30ef14d7e9652..ea87166d03726cf487f22de3759d00d63fc57e76 100644 (file)
--- a/board/samsung/smdkc100/Kconfig
+++ b/board/samsung/smdkc100/Kconfig
@@ -13,12 +13,12 @@ config SYS_CONFIG_NAME
        default "smdkc100"
 
 config DM
-       default y if !SPL_BUILD
+       default y
 
 config DM_GPIO
-       default y if !SPL_BUILD
+       default y
 
 config DM_SERIAL
-       default y if !SPL_BUILD
+       default y
 
 endif

diff --git a/board/silica/pengwyn/Kconfig b/board/silica/pengwyn/Kconfig
index 6ecda8041c9303282f018e2d8de966a06367cbc4..2e9a2b303f374128c1cf012d324a275cb2c8a849 100644 (file)
--- a/board/silica/pengwyn/Kconfig
+++ b/board/silica/pengwyn/Kconfig
@@ -13,12 +13,12 @@ config SYS_CONFIG_NAME
        default "pengwyn"
 
 config DM
-       default y if !SPL_BUILD
+       default y
 
 config DM_GPIO
-       default y if !SPL_BUILD
+       default y
 
 config DM_SERIAL
-       default y if !SPL_BUILD
+       default y
 
 endif

diff --git a/board/ti/am335x/Kconfig b/board/ti/am335x/Kconfig
index a20e0c1ab9545874199d4fb2262289cb6f30a26c..722f9d57c4d388ae6f08dad20bbfbff8357b1e5d 100644 (file)
--- a/board/ti/am335x/Kconfig
+++ b/board/ti/am335x/Kconfig
@@ -39,18 +39,18 @@ config NOR_BOOT
          NOR for environment.
 
 config DM
-       default y if !SPL_BUILD
+       default y
 
 config DM_GPIO
-       default y if DM && !SPL_BUILD
+       default y if DM
 
 config DM_SERIAL
-       default y if DM && !SPL_BUILD
+       default y if DM
 
 config SYS_MALLOC_F
-       default y if DM && !SPL_BUILD
+       default y if DM
 
 config SYS_MALLOC_F_LEN
-       default 0x400 if DM && !SPL_BUILD
+       default 0x400 if DM
 
 endif

diff --git a/common/Kconfig b/common/Kconfig
index 2ca002de27040094182cc3c80110fb4271184299..f82bc88a12b4f3bd9aa70373f07628aa3aeb0f17 100644 (file)
--- a/common/Kconfig
+++ b/common/Kconfig
@@ -1,5 +1,4 @@
 menu "Command line interface"
-       depends on !SPL_BUILD
 
 config HUSH_PARSER
        bool "Use hush shell"

diff --git a/drivers/core/Kconfig b/drivers/core/Kconfig
index f0d611007af98921f4ca85cb2f770faf560e74ad..75d182d27f7e14bf41a962337d70cf9df5f03dee 100644 (file)
--- a/drivers/core/Kconfig
+++ b/drivers/core/Kconfig
@@ -1,6 +1,5 @@
 config DM
        bool "Enable Driver Model"
-       depends on !SPL_BUILD
        help
          This config option enables Driver Model. This brings in the core
          support, including scanning of platform data on start-up. If
@@ -22,31 +21,28 @@ config SPL_DM
 
 config DM_WARN
        bool "Enable warnings in driver model"
+       depends on DM
+       default y
        help
          The dm_warn() function can use up quite a bit of space for its
          strings. By default this is disabled for SPL builds to save space.
          This will cause dm_warn() to be compiled out - it will do nothing
          when called.
-       depends on DM
-       default y if !SPL_BUILD
-       default n if SPL_BUILD
 
 config DM_DEVICE_REMOVE
        bool "Support device removal"
+       depends on DM
+       default y
        help
          We can save some code space by dropping support for removing a
          device. This is not normally required in SPL, so by default this
          option is disabled for SPL.
-       depends on DM
-       default y if !SPL_BUILD
-       default n if SPL_BUILD
 
 config DM_STDIO
        bool "Support stdio registration"
+       depends on DM
+       default y
        help
          Normally serial drivers register with stdio so that they can be used
          as normal output devices. In SPL we don't normally use stdio, so
          we can omit this feature.
-       depends on DM
-       default y if !SPL_BUILD
-       default n if SPL_BUILD

diff --git a/drivers/mtd/nand/Kconfig b/drivers/mtd/nand/Kconfig
index ccd8211eb29827e9ce98c20633e99eca7806d12e..72825c3e2edf1fa689c04ec474b3057b9e5a6f99 100644 (file)
--- a/drivers/mtd/nand/Kconfig
+++ b/drivers/mtd/nand/Kconfig
@@ -6,8 +6,6 @@ config SYS_NAND_SELF_INIT
          This option, if enabled, provides more flexible and linux-like
          NAND initialization process.
 
-if !SPL_BUILD
-
 config NAND_DENALI
        bool "Support Denali NAND controller"
        select SYS_NAND_SELF_INIT
@@ -34,8 +32,6 @@ config NAND_DENALI_SPARE_AREA_SKIP_BYTES
          of OOB area before last ECC sector data starts.  This is potentially
          used to preserve the bad block marker in the OOB area.
 
-endif
-
 if SPL
 
 config SPL_NAND_DENALI

diff --git a/dts/Kconfig b/dts/Kconfig
index 5fe63f8025879a7fca596cd403a409f601ca97e8..ca5bd6fb46626eafb7b0f15d023d243b79783f93 100644 (file)
--- a/dts/Kconfig
+++ b/dts/Kconfig
@@ -9,7 +9,6 @@ config SUPPORT_OF_CONTROL
        bool
 
 menu "Device Tree Control"
-       depends on !SPL_BUILD
        depends on SUPPORT_OF_CONTROL
 
 config OF_CONTROL

diff --git a/include/config_uncmd_spl.h b/include/config_uncmd_spl.h
index 9f0fe44443319ecdcf501122da15a3be3bf87155..a9106f4f3b7eb072239dbf2545bd4ac2f057a03d 100644 (file)
--- a/include/config_uncmd_spl.h
+++ b/include/config_uncmd_spl.h
@@ -29,5 +29,9 @@
 #undef CONFIG_DM_SPI
 #endif
 
+#undef CONFIG_DM_WARN
+#undef CONFIG_DM_DEVICE_REMOVE
+#undef CONFIG_DM_STDIO
+
 #endif /* CONFIG_SPL_BUILD */
 #endif /* __CONFIG_UNCMD_SPL_H__ */

diff --git a/scripts/Makefile.uncmd_spl b/scripts/Makefile.uncmd_spl
index 86c938e1f9da1c0cac867ac5a45c807518071911..343c3fc199329ff5146dbc424253537cf3cf2c9f 100644 (file)
--- a/scripts/Makefile.uncmd_spl
+++ b/scripts/Makefile.uncmd_spl
@@ -13,4 +13,6 @@ CONFIG_DM_SPI=
 CONFIG_DM_SPI_FLASH=
 endif
 
+CONFIG_DM_DEVICE_REMOVE=
+
 endif