diff options
| author | Tom Rini <trini@konsulko.com> | 2022-06-08 08:24:40 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2022-06-28 17:03:31 -0400 |
| commit | 13ce351b9a292a758415ef8eba3c349c28cf4697 (patch) | |
| tree | e74c5573000a664edef03c57a7674d51b0538e9e | |
| parent | 8bea4bf7d31d2ab8a4a0162755b79a4a59a90dcd (diff) | |
| download | u-boot-13ce351b9a292a758415ef8eba3c349c28cf4697.tar.gz u-boot-13ce351b9a292a758415ef8eba3c349c28cf4697.tar.bz2 u-boot-13ce351b9a292a758415ef8eba3c349c28cf4697.zip | |
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>
| -rw-r--r-- | common/Kconfig | 12 | ||||
| -rw-r--r-- | dts/Kconfig | 1 | ||||
| -rw-r--r-- | lib/Kconfig | 3 |
3 files changed, 5 insertions, 11 deletions
diff --git a/common/Kconfig b/common/Kconfig index e3a57e2082..f08a8e7493 100644 --- a/common/Kconfig +++ b/common/Kconfig @@ -92,6 +92,7 @@ config TPL_LOGLEVEL config VPL_LOGLEVEL int "loglevel for VPL" + depends on VPL default LOGLEVEL help All Messages with a loglevel smaller than the console loglevel will @@ -272,15 +273,6 @@ config 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 int "Maximum log level to record" default 6 @@ -452,7 +444,7 @@ endif config VPL_LOG bool "Enable logging support in VPL" - depends on LOG + depends on LOG && VPL help This enables support for logging of status and debug messages. These can be displayed on the console, recorded in a memory buffer, or diff --git a/dts/Kconfig b/dts/Kconfig index f1d05cc080..bc5f22029f 100644 --- a/dts/Kconfig +++ b/dts/Kconfig @@ -534,6 +534,7 @@ endif config VPL_OF_REAL def_bool y + depends on VPL help Indicates that a real devicetree is available which can be accessed at runtime. This means that dev_read_...() functions can be used to diff --git a/lib/Kconfig b/lib/Kconfig index ccbc52de89..c9f9ddce7d 100644 --- a/lib/Kconfig +++ b/lib/Kconfig @@ -783,6 +783,7 @@ config TPL_OF_LIBFDT_ASSUME_MASK config VPL_OF_LIBFDT bool "Enable the FDT library for VPL" + depends on VPL default y if VPL_OF_CONTROL && !VPL_OF_PLATDATA help This enables the FDT library (libfdt). It provides functions for @@ -793,7 +794,7 @@ config VPL_OF_LIBFDT config VPL_OF_LIBFDT_ASSUME_MASK hex "Mask of conditions to assume for libfdt" - depends on VPL_OF_LIBFDT || FIT + depends on VPL_OF_LIBFDT || (FIT && VPL) default 0xff help Use this to change the assumptions made by libfdt in SPL about the |