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>
diff --git a/common/Kconfig b/common/Kconfig
index e3a57e2..f08a8e7 100644
--- a/common/Kconfig
+++ b/common/Kconfig
@@ -92,6 +92,7 @@
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 @@
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 @@
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 f1d05cc..bc5f220 100644
--- a/dts/Kconfig
+++ b/dts/Kconfig
@@ -534,6 +534,7 @@
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 ccbc52d..c9f9ddc 100644
--- a/lib/Kconfig
+++ b/lib/Kconfig
@@ -783,6 +783,7 @@
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_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