tpl: Ensure all TPL symbols in Kconfig have some TPL dependency

Tighten up symbol dependencies in a number of places.  Ensure that a TPL
specific option has at least a direct dependency on TPL.  In places
where it's clear that we depend on something more specific, use that
dependency instead.

Reported-by: Pali Rohár <pali@kernel.org>
Signed-off-by: Tom Rini <trini@konsulko.com>
This commit is contained in:
Tom Rini 2022-06-08 08:24:39 -04:00
parent 5858b90f50
commit 8bea4bf7d3
7 changed files with 9 additions and 5 deletions

View file

@ -956,6 +956,7 @@ config SPL_ACPI_GPE
config TPL_ACPI_GPE config TPL_ACPI_GPE
bool "Support ACPI general-purpose events in TPL" bool "Support ACPI general-purpose events in TPL"
depends on TPL
help help
Enable a driver for ACPI GPEs to allow peripherals to send interrupts Enable a driver for ACPI GPEs to allow peripherals to send interrupts
via ACPI to the OS. In U-Boot this is only used when U-Boot itself via ACPI to the OS. In U-Boot this is only used when U-Boot itself

View file

@ -622,7 +622,7 @@ config SPL_BOOTSTAGE
config TPL_BOOTSTAGE config TPL_BOOTSTAGE
bool "Boot timing and reported in TPL" bool "Boot timing and reported in TPL"
depends on BOOTSTAGE depends on BOOTSTAGE && TPL
help help
Enable recording of boot time in SPL. To make this visible to U-Boot Enable recording of boot time in SPL. To make this visible to U-Boot
proper, enable BOOTSTAGE_STASH as well. This will stash the timing proper, enable BOOTSTAGE_STASH as well. This will stash the timing

View file

@ -87,6 +87,7 @@ config SPL_LOGLEVEL
config TPL_LOGLEVEL config TPL_LOGLEVEL
int int
depends on TPL
default LOGLEVEL default LOGLEVEL
config VPL_LOGLEVEL config VPL_LOGLEVEL
@ -408,7 +409,7 @@ endif
config TPL_LOG config TPL_LOG
bool "Enable logging support in TPL" bool "Enable logging support in TPL"
depends on LOG depends on LOG && TPL
help help
This enables support for logging of status and debug messages. These This enables support for logging of status and debug messages. These
can be displayed on the console, recorded in a memory buffer, or can be displayed on the console, recorded in a memory buffer, or

View file

@ -224,7 +224,7 @@ config SPL_SYSCON
config TPL_SYSCON config TPL_SYSCON
bool "Support system controllers in TPL" bool "Support system controllers in TPL"
depends on SPL_REGMAP depends on TPL_REGMAP
help help
Many SoCs have a number of system controllers which are dealt with Many SoCs have a number of system controllers which are dealt with
as a group by a single driver. Some common functionality is provided as a group by a single driver. Some common functionality is provided

View file

@ -17,6 +17,7 @@ config SPL_ACPI_PMC
config TPL_ACPI_PMC config TPL_ACPI_PMC
bool "Power Manager (x86 PMC) support in TPL" bool "Power Manager (x86 PMC) support in TPL"
depends on TPL
default y if ACPI_PMC default y if ACPI_PMC
help help
Enable support for an x86-style power-management controller which Enable support for an x86-style power-management controller which

View file

@ -19,7 +19,7 @@ config SPL_RAM
config TPL_RAM config TPL_RAM
bool "Enable RAM support in TPL" bool "Enable RAM support in TPL"
depends on RAM depends on RAM && TPL
help help
The RAM subsystem adds a small amount of overhead to the image. The RAM subsystem adds a small amount of overhead to the image.
If this is acceptable and you have a need to use RAM drivers in If this is acceptable and you have a need to use RAM drivers in

View file

@ -248,6 +248,7 @@ config SPL_TINY_MEMSET
config TPL_TINY_MEMSET config TPL_TINY_MEMSET
bool "Use a very small memset() in TPL" bool "Use a very small memset() in TPL"
depends on TPL
help help
The faster memset() is the arch-specific one (if available) enabled The faster memset() is the arch-specific one (if available) enabled
by CONFIG_USE_ARCH_MEMSET. If that is not enabled, we can still get by CONFIG_USE_ARCH_MEMSET. If that is not enabled, we can still get
@ -771,7 +772,7 @@ config TPL_OF_LIBFDT
config TPL_OF_LIBFDT_ASSUME_MASK config TPL_OF_LIBFDT_ASSUME_MASK
hex "Mask of conditions to assume for libfdt" hex "Mask of conditions to assume for libfdt"
depends on TPL_OF_LIBFDT || FIT depends on TPL_OF_LIBFDT || (FIT && TPL)
default 0xff default 0xff
help help
Use this to change the assumptions made by libfdt in TPL about the Use this to change the assumptions made by libfdt in TPL about the