Kconfigs: Various: Fix some SPL, TPL and ARM64 dependencies

Several options are presenting themselves on a various boards
where the options are clearly not used.  (ie, arm64 options on
arm9, or SPL/TPL options when SPL or TPL are not defined)

This patch is not attempting to be a complete list of items, but
more like low hanging fruit.

This patch attempts to reduce some of the menuconfig noise
by defining dependencies so they don't appear when not used.

Signed-off-by: Adam Ford <aford173@gmail.com>
This commit is contained in:
Adam Ford 2019-08-13 14:32:30 -05:00 committed by Tom Rini
parent 5484793363
commit 057055660f
3 changed files with 12 additions and 8 deletions

View file

@ -163,7 +163,7 @@ config SYS_MALLOC_LEN
config SPL_SYS_MALLOC_F_LEN config SPL_SYS_MALLOC_F_LEN
hex "Size of malloc() pool in SPL before relocation" hex "Size of malloc() pool in SPL before relocation"
depends on SYS_MALLOC_F depends on SYS_MALLOC_F && SPL
default 0x2800 if RCAR_GEN3 default 0x2800 if RCAR_GEN3
default SYS_MALLOC_F_LEN default SYS_MALLOC_F_LEN
help help
@ -174,7 +174,7 @@ config SPL_SYS_MALLOC_F_LEN
config TPL_SYS_MALLOC_F_LEN config TPL_SYS_MALLOC_F_LEN
hex "Size of malloc() pool in TPL before relocation" hex "Size of malloc() pool in TPL before relocation"
depends on SYS_MALLOC_F depends on SYS_MALLOC_F && TPL
default SYS_MALLOC_F_LEN default SYS_MALLOC_F_LEN
help help
Before relocation, memory is very limited on many platforms. Still, Before relocation, memory is very limited on many platforms. Still,
@ -238,6 +238,7 @@ config SPL_IMAGE
string "SPL image used in the combined SPL+U-Boot image" string "SPL image used in the combined SPL+U-Boot image"
default "spl/boot.bin" if ARCH_AT91 && SPL_NAND_SUPPORT default "spl/boot.bin" if ARCH_AT91 && SPL_NAND_SUPPORT
default "spl/u-boot-spl.bin" default "spl/u-boot-spl.bin"
depends on SPL
help help
Select the SPL build target that shall be generated by the SPL Select the SPL build target that shall be generated by the SPL
build process (default spl/u-boot-spl.bin). This image will be build process (default spl/u-boot-spl.bin). This image will be

View file

@ -367,7 +367,7 @@ config SYS_THUMB_BUILD
config SPL_SYS_THUMB_BUILD config SPL_SYS_THUMB_BUILD
bool "Build SPL using the Thumb instruction set" bool "Build SPL using the Thumb instruction set"
default y if SYS_THUMB_BUILD default y if SYS_THUMB_BUILD
depends on !ARM64 depends on !ARM64 && SPL
help help
Use this flag to build SPL using the Thumb instruction set for Use this flag to build SPL using the Thumb instruction set for
ARM architectures. Thumb instruction set provides better code ARM architectures. Thumb instruction set provides better code
@ -414,7 +414,7 @@ config USE_ARCH_MEMCPY
config SPL_USE_ARCH_MEMCPY config SPL_USE_ARCH_MEMCPY
bool "Use an assembly optimized implementation of memcpy for SPL" bool "Use an assembly optimized implementation of memcpy for SPL"
default y if USE_ARCH_MEMCPY default y if USE_ARCH_MEMCPY
depends on !ARM64 depends on !ARM64 && SPL
help help
Enable the generation of an optimized version of memcpy. Enable the generation of an optimized version of memcpy.
Such implementation may be faster under some conditions Such implementation may be faster under some conditions
@ -423,7 +423,7 @@ config SPL_USE_ARCH_MEMCPY
config TPL_USE_ARCH_MEMCPY config TPL_USE_ARCH_MEMCPY
bool "Use an assembly optimized implementation of memcpy for TPL" bool "Use an assembly optimized implementation of memcpy for TPL"
default y if USE_ARCH_MEMCPY default y if USE_ARCH_MEMCPY
depends on !ARM64 depends on !ARM64 && TPL
help help
Enable the generation of an optimized version of memcpy. Enable the generation of an optimized version of memcpy.
Such implementation may be faster under some conditions Such implementation may be faster under some conditions
@ -441,7 +441,7 @@ config USE_ARCH_MEMSET
config SPL_USE_ARCH_MEMSET config SPL_USE_ARCH_MEMSET
bool "Use an assembly optimized implementation of memset for SPL" bool "Use an assembly optimized implementation of memset for SPL"
default y if USE_ARCH_MEMSET default y if USE_ARCH_MEMSET
depends on !ARM64 depends on !ARM64 && SPL
help help
Enable the generation of an optimized version of memset. Enable the generation of an optimized version of memset.
Such implementation may be faster under some conditions Such implementation may be faster under some conditions
@ -450,7 +450,7 @@ config SPL_USE_ARCH_MEMSET
config TPL_USE_ARCH_MEMSET config TPL_USE_ARCH_MEMSET
bool "Use an assembly optimized implementation of memset for TPL" bool "Use an assembly optimized implementation of memset for TPL"
default y if USE_ARCH_MEMSET default y if USE_ARCH_MEMSET
depends on !ARM64 depends on !ARM64 && TPL
help help
Enable the generation of an optimized version of memset. Enable the generation of an optimized version of memset.
Such implementation may be faster under some conditions Such implementation may be faster under some conditions
@ -458,7 +458,8 @@ config TPL_USE_ARCH_MEMSET
config ARM64_SUPPORT_AARCH32 config ARM64_SUPPORT_AARCH32
bool "ARM64 system support AArch32 execution state" bool "ARM64 system support AArch32 execution state"
default y if ARM64 && !TARGET_THUNDERX_88XX depends on ARM64
default y if !TARGET_THUNDERX_88XX
help help
This ARM64 system supports AArch32 execution state. This ARM64 system supports AArch32 execution state.

View file

@ -208,6 +208,7 @@ config SPL_SYS_MALLOC_SIMPLE
config TPL_SYS_MALLOC_SIMPLE config TPL_SYS_MALLOC_SIMPLE
bool bool
prompt "Only use malloc_simple functions in the TPL" prompt "Only use malloc_simple functions in the TPL"
depends on TPL
help help
Say Y here to only use the *_simple malloc functions from Say Y here to only use the *_simple malloc functions from
malloc_simple.c, rather then using the versions from dlmalloc.c; malloc_simple.c, rather then using the versions from dlmalloc.c;
@ -261,6 +262,7 @@ config SPL_BANNER_PRINT
config TPL_BANNER_PRINT config TPL_BANNER_PRINT
bool "Enable output of the TPL banner 'U-Boot TPL ...'" bool "Enable output of the TPL banner 'U-Boot TPL ...'"
depends on TPL
default y default y
help help
If this option is enabled, SPL will not print the banner with version If this option is enabled, SPL will not print the banner with version