redonkable
/
remarkable-uboot
1
0
Fork 0
Code Releases Activity

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>
utp
Masahiro Yamada 2015-02-24 22:26:21 +09:00 committed by Tom Rini
parent e02ee2548a
commit d648964fc2
22 changed files with 73 additions and 87 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
Kconfig
View File

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

7
arch/arm/Kconfig
View File

@ -620,9 +620,8 @@ config TEGRA
bool "NVIDIA Tegra" bool "NVIDIA Tegra"
select SUPPORT_SPL select SUPPORT_SPL
select SPL select SPL
select OF_CONTROL if !SPL_BUILD select OF_CONTROL
select CPU_ARM720T if SPL_BUILD select CPU_V7
select CPU_V7 if !SPL_BUILD
config TARGET_VEXPRESS64_AEMV8A config TARGET_VEXPRESS64_AEMV8A
bool "Support vexpress_aemv8a" bool "Support vexpress_aemv8a"
@ -714,7 +713,7 @@ config ARCH_UNIPHIER
select CPU_V7 select CPU_V7
select SUPPORT_SPL select SUPPORT_SPL
select SPL select SPL
select OF_CONTROL if !SPL_BUILD select OF_CONTROL
endchoice endchoice

6
arch/arm/cpu/arm1176/bcm2835/Kconfig
View File

@ -1,12 +1,12 @@
if TARGET_RPI || TARGET_RPI_2 if TARGET_RPI || TARGET_RPI_2
config DM config DM
default y if !SPL_BUILD default y
config DM_SERIAL config DM_SERIAL
default y if !SPL_BUILD default y
config DM_GPIO config DM_GPIO
default y if !SPL_BUILD default y
endif endif

28
arch/arm/cpu/armv7/exynos/Kconfig
View File

@ -6,7 +6,7 @@ choice
config TARGET_SMDKV310 config TARGET_SMDKV310
select SUPPORT_SPL select SUPPORT_SPL
bool "Exynos4210 SMDKV310 board" bool "Exynos4210 SMDKV310 board"
select OF_CONTROL if !SPL_BUILD select OF_CONTROL
config TARGET_TRATS config TARGET_TRATS
bool "Exynos4210 Trats board" bool "Exynos4210 Trats board"
@ -33,32 +33,32 @@ config TARGET_ARNDALE
select CPU_V7_HAS_NONSEC select CPU_V7_HAS_NONSEC
select CPU_V7_HAS_VIRT select CPU_V7_HAS_VIRT
select SUPPORT_SPL select SUPPORT_SPL
select OF_CONTROL if !SPL_BUILD select OF_CONTROL
config TARGET_SMDK5250 config TARGET_SMDK5250
bool "SMDK5250 board" bool "SMDK5250 board"
select SUPPORT_SPL select SUPPORT_SPL
select OF_CONTROL if !SPL_BUILD select OF_CONTROL
config TARGET_SNOW config TARGET_SNOW
bool "Snow board" bool "Snow board"
select SUPPORT_SPL select SUPPORT_SPL
select OF_CONTROL if !SPL_BUILD select OF_CONTROL
config TARGET_SMDK5420 config TARGET_SMDK5420
bool "SMDK5420 board" bool "SMDK5420 board"
select SUPPORT_SPL select SUPPORT_SPL
select OF_CONTROL if !SPL_BUILD select OF_CONTROL
config TARGET_PEACH_PI config TARGET_PEACH_PI
bool "Peach Pi board" bool "Peach Pi board"
select SUPPORT_SPL select SUPPORT_SPL
select OF_CONTROL if !SPL_BUILD select OF_CONTROL
config TARGET_PEACH_PIT config TARGET_PEACH_PIT
bool "Peach Pit board" bool "Peach Pit board"
select SUPPORT_SPL select SUPPORT_SPL
select OF_CONTROL if !SPL_BUILD select OF_CONTROL
endchoice endchoice
@ -66,25 +66,25 @@ config SYS_SOC
default "exynos" default "exynos"
config DM config DM
default y if !SPL_BUILD default y
config DM_SERIAL config DM_SERIAL
default y if !SPL_BUILD default y
config DM_SPI config DM_SPI
default y if !SPL_BUILD default y
config DM_SPI_FLASH config DM_SPI_FLASH
default y if !SPL_BUILD default y
config DM_GPIO config DM_GPIO
default y if !SPL_BUILD default y
config SYS_MALLOC_F config SYS_MALLOC_F
default y if !SPL_BUILD default y
config SYS_MALLOC_F_LEN config SYS_MALLOC_F_LEN
default 0x400 if !SPL_BUILD default 0x400
source "board/samsung/smdkv310/Kconfig" source "board/samsung/smdkv310/Kconfig"
source "board/samsung/trats/Kconfig" source "board/samsung/trats/Kconfig"

10
arch/arm/cpu/armv7/omap3/Kconfig
View File

@ -94,19 +94,19 @@ config TARGET_TWISTER
endchoice endchoice
config DM config DM
default y if !SPL_BUILD default y
config DM_GPIO config DM_GPIO
default y if DM && !SPL_BUILD default y if DM
config DM_SERIAL config DM_SERIAL
default y if DM && !SPL_BUILD default y if DM
config SYS_MALLOC_F config SYS_MALLOC_F
default y if DM && !SPL_BUILD default y if DM
config SYS_MALLOC_F_LEN config SYS_MALLOC_F_LEN
default 0x400 if DM && !SPL_BUILD default 0x400 if DM
config SYS_SOC config SYS_SOC
default "omap3" default "omap3"

4
arch/arm/cpu/armv7/s5pc1xx/Kconfig
View File

@ -5,11 +5,11 @@ choice
config TARGET_S5P_GONI config TARGET_S5P_GONI
bool "S5P Goni board" bool "S5P Goni board"
select OF_CONTROL if !SPL_BUILD select OF_CONTROL
config TARGET_SMDKC100 config TARGET_SMDKC100
bool "Support smdkc100 board" bool "Support smdkc100 board"
select OF_CONTROL if !SPL_BUILD select OF_CONTROL
endchoice endchoice

1
arch/arm/cpu/armv7/uniphier/Kconfig
View File

@ -64,7 +64,6 @@ config CMD_PINMON
config CMD_DDRPHY_DUMP config CMD_DDRPHY_DUMP
bool "Enable dump command of DDR PHY parameters" bool "Enable dump command of DDR PHY parameters"
depends on !SPL_BUILD
help help
The command "ddrphy" shows the resulting parameters of DDR PHY The command "ddrphy" shows the resulting parameters of DDR PHY
training; it is useful for the evaluation of DDR PHY training. training; it is useful for the evaluation of DDR PHY training.

12
arch/arm/mach-tegra/Kconfig
View File

@ -27,22 +27,22 @@ config USE_PRIVATE_LIBGCC
default y default y
config DM config DM
default y if !SPL_BUILD default y
config DM_SERIAL config DM_SERIAL
default y if !SPL_BUILD default y
config DM_SPI config DM_SPI
default y if !SPL_BUILD default y
config DM_SPI_FLASH config DM_SPI_FLASH
default y if !SPL_BUILD default y
config DM_I2C config DM_I2C
default y if !SPL_BUILD default y
config DM_GPIO config DM_GPIO
default y if !SPL_BUILD default y
source "arch/arm/mach-tegra/tegra20/Kconfig" source "arch/arm/mach-tegra/tegra20/Kconfig"
source "arch/arm/mach-tegra/tegra30/Kconfig" source "arch/arm/mach-tegra/tegra30/Kconfig"

6
board/compulab/cm_t335/Kconfig
View File

@ -13,12 +13,12 @@ config SYS_CONFIG_NAME
default "cm_t335" default "cm_t335"
config DM config DM
default y if !SPL_BUILD default y
config DM_GPIO config DM_GPIO
default y if !SPL_BUILD default y
config DM_SERIAL config DM_SERIAL
default y if !SPL_BUILD default y
endif endif

6
board/gumstix/pepper/Kconfig
View File

@ -13,12 +13,12 @@ config SYS_CONFIG_NAME
default "pepper" default "pepper"
config DM config DM
default y if !SPL_BUILD default y
config DM_GPIO config DM_GPIO
default y if !SPL_BUILD default y
config DM_SERIAL config DM_SERIAL
default y if !SPL_BUILD default y
endif endif

6
board/isee/igep0033/Kconfig
View File

@ -13,12 +13,12 @@ config SYS_CONFIG_NAME
default "am335x_igep0033" default "am335x_igep0033"
config DM config DM
default y if !SPL_BUILD default y
config DM_GPIO config DM_GPIO
default y if !SPL_BUILD default y
config DM_SERIAL config DM_SERIAL
default y if !SPL_BUILD default y
endif endif

6
board/phytec/pcm051/Kconfig
View File

@ -13,12 +13,12 @@ config SYS_CONFIG_NAME
default "pcm051" default "pcm051"
config DM config DM
default y if !SPL_BUILD default y
config DM_GPIO config DM_GPIO
default y if !SPL_BUILD default y
config DM_SERIAL config DM_SERIAL
default y if !SPL_BUILD default y
endif endif

6
board/samsung/goni/Kconfig
View File

@ -13,12 +13,12 @@ config SYS_CONFIG_NAME
default "s5p_goni" default "s5p_goni"
config DM config DM
default y if !SPL_BUILD default y
config DM_GPIO config DM_GPIO
default y if !SPL_BUILD default y
config DM_SERIAL config DM_SERIAL
default y if !SPL_BUILD default y
endif endif

6
board/samsung/smdkc100/Kconfig
View File

@ -13,12 +13,12 @@ config SYS_CONFIG_NAME
default "smdkc100" default "smdkc100"
config DM config DM
default y if !SPL_BUILD default y
config DM_GPIO config DM_GPIO
default y if !SPL_BUILD default y
config DM_SERIAL config DM_SERIAL
default y if !SPL_BUILD default y
endif endif

6
board/silica/pengwyn/Kconfig
View File

@ -13,12 +13,12 @@ config SYS_CONFIG_NAME
default "pengwyn" default "pengwyn"
config DM config DM
default y if !SPL_BUILD default y
config DM_GPIO config DM_GPIO
default y if !SPL_BUILD default y
config DM_SERIAL config DM_SERIAL
default y if !SPL_BUILD default y
endif endif

10
board/ti/am335x/Kconfig
View File

@ -39,18 +39,18 @@ config NOR_BOOT
NOR for environment. NOR for environment.
config DM config DM
default y if !SPL_BUILD default y
config DM_GPIO config DM_GPIO
default y if DM && !SPL_BUILD default y if DM
config DM_SERIAL config DM_SERIAL
default y if DM && !SPL_BUILD default y if DM
config SYS_MALLOC_F config SYS_MALLOC_F
default y if DM && !SPL_BUILD default y if DM
config SYS_MALLOC_F_LEN config SYS_MALLOC_F_LEN
default 0x400 if DM && !SPL_BUILD default 0x400 if DM
endif endif

1
common/Kconfig
View File

@ -1,5 +1,4 @@
menu "Command line interface" menu "Command line interface"
depends on !SPL_BUILD
config HUSH_PARSER config HUSH_PARSER
bool "Use hush shell" bool "Use hush shell"

16
drivers/core/Kconfig
View File

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

4
drivers/mtd/nand/Kconfig
View File

@ -6,8 +6,6 @@ config SYS_NAND_SELF_INIT
This option, if enabled, provides more flexible and linux-like This option, if enabled, provides more flexible and linux-like
NAND initialization process. NAND initialization process.
if !SPL_BUILD
config NAND_DENALI config NAND_DENALI
bool "Support Denali NAND controller" bool "Support Denali NAND controller"
select SYS_NAND_SELF_INIT 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 of OOB area before last ECC sector data starts. This is potentially
used to preserve the bad block marker in the OOB area. used to preserve the bad block marker in the OOB area.
endif
if SPL if SPL
config SPL_NAND_DENALI config SPL_NAND_DENALI

1
dts/Kconfig
View File

@ -9,7 +9,6 @@ config SUPPORT_OF_CONTROL
bool bool
menu "Device Tree Control" menu "Device Tree Control"
depends on !SPL_BUILD
depends on SUPPORT_OF_CONTROL depends on SUPPORT_OF_CONTROL
config OF_CONTROL config OF_CONTROL

4
include/config_uncmd_spl.h
View File

@ -29,5 +29,9 @@
#undef CONFIG_DM_SPI #undef CONFIG_DM_SPI
#endif #endif
#undef CONFIG_DM_WARN
#undef CONFIG_DM_DEVICE_REMOVE
#undef CONFIG_DM_STDIO
#endif /* CONFIG_SPL_BUILD */ #endif /* CONFIG_SPL_BUILD */
#endif /* __CONFIG_UNCMD_SPL_H__ */ #endif /* __CONFIG_UNCMD_SPL_H__ */

2
scripts/Makefile.uncmd_spl
View File

@ -13,4 +13,6 @@ CONFIG_DM_SPI=
CONFIG_DM_SPI_FLASH= CONFIG_DM_SPI_FLASH=
endif endif
CONFIG_DM_DEVICE_REMOVE=
endif endif