vpl: Ensure all VPL symbols in Kconfig have some VPL dependency

Tighten up symbol dependencies in a number of places.  Ensure that a VPL
specific option has at least a direct dependency on VPL.  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:40 -04:00
parent 8bea4bf7d3
commit 13ce351b9a
3 changed files with 5 additions and 11 deletions

View File

@ -92,6 +92,7 @@ config TPL_LOGLEVEL
config VPL_LOGLEVEL config VPL_LOGLEVEL
int "loglevel for VPL" int "loglevel for VPL"
depends on VPL
default LOGLEVEL default LOGLEVEL
help help
All Messages with a loglevel smaller than the console loglevel will All Messages with a loglevel smaller than the console loglevel will
@ -272,15 +273,6 @@ config LOG
if LOG if LOG
config VPL_LOG
bool "Enable logging support in VPL"
depends on LOG
help
This enables support for logging of status and debug messages. These
can be displayed on the console, recorded in a memory buffer, or
discarded if not needed. Logging supports various categories and
levels of severity.
config LOG_MAX_LEVEL config LOG_MAX_LEVEL
int "Maximum log level to record" int "Maximum log level to record"
default 6 default 6
@ -452,7 +444,7 @@ endif
config VPL_LOG config VPL_LOG
bool "Enable logging support in VPL" bool "Enable logging support in VPL"
depends on LOG depends on LOG && VPL
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

@ -534,6 +534,7 @@ endif
config VPL_OF_REAL config VPL_OF_REAL
def_bool y def_bool y
depends on VPL
help help
Indicates that a real devicetree is available which can be accessed Indicates that a real devicetree is available which can be accessed
at runtime. This means that dev_read_...() functions can be used to at runtime. This means that dev_read_...() functions can be used to

View File

@ -783,6 +783,7 @@ config TPL_OF_LIBFDT_ASSUME_MASK
config VPL_OF_LIBFDT config VPL_OF_LIBFDT
bool "Enable the FDT library for VPL" bool "Enable the FDT library for VPL"
depends on VPL
default y if VPL_OF_CONTROL && !VPL_OF_PLATDATA default y if VPL_OF_CONTROL && !VPL_OF_PLATDATA
help help
This enables the FDT library (libfdt). It provides functions for This enables the FDT library (libfdt). It provides functions for
@ -793,7 +794,7 @@ config VPL_OF_LIBFDT
config VPL_OF_LIBFDT_ASSUME_MASK config VPL_OF_LIBFDT_ASSUME_MASK
hex "Mask of conditions to assume for libfdt" hex "Mask of conditions to assume for libfdt"
depends on VPL_OF_LIBFDT || FIT depends on VPL_OF_LIBFDT || (FIT && VPL)
default 0xff default 0xff
help help
Use this to change the assumptions made by libfdt in SPL about the Use this to change the assumptions made by libfdt in SPL about the