[U-Boot] [PATCH v3 6/7] kconfig: remove unneeded dependency on !SPL_BUILD

Masahiro Yamada
2015-02-20T05:25:00Z

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>
---

Changes in v3: None
Changes in v2:
- Fix a typo in commit description

Kconfig | 12 ++----------
arch/arm/Kconfig | 7 +++----
arch/arm/cpu/arm1176/bcm2835/Kconfig | 6 +++---
arch/arm/cpu/armv7/exynos/Kconfig | 26 +++++++++++++-------------
arch/arm/cpu/armv7/omap3/Kconfig | 8 ++++----
arch/arm/cpu/armv7/s5pc1xx/Kconfig | 4 ++--
arch/arm/cpu/armv7/tegra-common/Kconfig | 12 ++++++------
arch/arm/cpu/armv7/uniphier/Kconfig | 1 -
board/compulab/cm_t335/Kconfig | 6 +++---
board/gumstix/pepper/Kconfig | 6 +++---
board/isee/igep0033/Kconfig | 6 +++---
board/phytec/pcm051/Kconfig | 6 +++---
board/samsung/goni/Kconfig | 6 +++---
board/samsung/smdkc100/Kconfig | 6 +++---
board/silica/pengwyn/Kconfig | 6 +++---
board/ti/am335x/Kconfig | 8 ++++----
common/Kconfig | 1 -
drivers/core/Kconfig | 16 ++++++----------
drivers/mtd/nand/Kconfig | 4 ----
dts/Kconfig | 1 -
include/config_uncmd_spl.h | 4 ++++
scripts/Makefile.uncmd_spl | 4 +++-
22 files changed, 71 insertions(+), 85 deletions(-)

diff --git a/Kconfig b/Kconfig
index bdaef56..a66a97f 100644
--- 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 41f3220..700e2a8 100644
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -739,9 +739,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"
@@ -833,7 +832,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 94f57d7..7d0fc67 100644
--- a/arch/arm/cpu/arm1176/bcm2835/Kconfig
+++ b/arch/arm/cpu/arm1176/bcm2835/Kconfig
@@ -1,12 +1,12 @@
if TARGET_RPI

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 23869ce..9e47ed3 100644
--- 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,22 +66,22 @@ 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

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 2e193ab..b3d5ef3 100644
--- a/arch/arm/cpu/armv7/omap3/Kconfig
+++ b/arch/arm/cpu/armv7/omap3/Kconfig
@@ -94,16 +94,16 @@ 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_SOC
default "omap3"
diff --git a/arch/arm/cpu/armv7/s5pc1xx/Kconfig b/arch/arm/cpu/armv7/s5pc1xx/Kconfig
index 6288134..bc73813 100644
--- 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/tegra-common/Kconfig b/arch/arm/cpu/armv7/tegra-common/Kconfig
index a3f5282..2003fc8 100644
--- a/arch/arm/cpu/armv7/tegra-common/Kconfig
+++ b/arch/arm/cpu/armv7/tegra-common/Kconfig
@@ -28,22 +28,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/cpu/armv7/tegra20/Kconfig"
source "arch/arm/cpu/armv7/tegra30/Kconfig"
diff --git a/arch/arm/cpu/armv7/uniphier/Kconfig b/arch/arm/cpu/armv7/uniphier/Kconfig
index afb3c55..b6dc75f 100644
--- a/arch/arm/cpu/armv7/uniphier/Kconfig
+++ b/arch/arm/cpu/armv7/uniphier/Kconfig
@@ -61,7 +61,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/board/compulab/cm_t335/Kconfig b/board/compulab/cm_t335/Kconfig
index aadbfbc..3a8f304 100644
--- 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 3099a9e..750db85 100644
--- 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 2fe2ef1..9a8421e 100644
--- 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 65094cf..bb98715 100644
--- 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 2c5d3fc..006e864 100644
--- 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 996fe3c..ea87166 100644
--- 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 6ecda80..2e9a2b3 100644
--- 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 cad10c2..8c45892 100644
--- a/board/ti/am335x/Kconfig
+++ b/board/ti/am335x/Kconfig
@@ -39,15 +39,15 @@ 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

endif
diff --git a/common/Kconfig b/common/Kconfig
index 2ca002d..f82bc88 100644
--- 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 f0d6110..75d182d 100644
--- 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 ccd8211..72825c3 100644
--- 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 5fe63f8..ca5bd6f 100644
--- 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 9f0fe44..a9106f4 100644
--- 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 0bb7d54..343c3fc 100644
--- a/scripts/Makefile.uncmd_spl
+++ b/scripts/Makefile.uncmd_spl
@@ -1,6 +1,6 @@
# Makefile version of include/config_uncmd_spl.h
#
-# Invent a better way
+# TODO: Invent a better way

ifdef CONFIG_SPL_BUILD
CONFIG_OF_CONTROL=
@@ -13,4 +13,6 @@ CONFIG_DM_SPI=
CONFIG_DM_SPI_FLASH=
endif

+CONFIG_DM_DEVICE_REMOVE=
+
endif
--
1.9.1