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 --- common/Kconfig | 12 ++---------- dts/Kconfig | 1 + lib/Kconfig | 3 ++- 3 files changed, 5 insertions(+), 11 deletions(-)
diff --git a/common/Kconfig b/common/Kconfig index ac88d9bf9eab..e7914ca750a3 100644 --- a/common/Kconfig +++ b/common/Kconfig @@ -93,6 +93,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 @@ -273,15 +274,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 @@ -453,7 +445,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 f1d05cc0803f..bc5f22029ff9 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 fef71606766e..7dd777b56a79 100644 --- a/lib/Kconfig +++ b/lib/Kconfig @@ -789,6 +789,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 @@ -799,7 +800,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