Skip to content

Commit 13ce351

Browse files
committed
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 <[email protected]> Signed-off-by: Tom Rini <[email protected]>
1 parent 8bea4bf commit 13ce351

File tree

3 files changed

+5
-11
lines changed

3 files changed

+5
-11
lines changed

common/Kconfig

+2-10
Original file line numberDiff line numberDiff line change
@@ -92,6 +92,7 @@ config TPL_LOGLEVEL
9292

9393
config VPL_LOGLEVEL
9494
int "loglevel for VPL"
95+
depends on VPL
9596
default LOGLEVEL
9697
help
9798
All Messages with a loglevel smaller than the console loglevel will
@@ -272,15 +273,6 @@ config LOG
272273

273274
if LOG
274275

275-
config VPL_LOG
276-
bool "Enable logging support in VPL"
277-
depends on LOG
278-
help
279-
This enables support for logging of status and debug messages. These
280-
can be displayed on the console, recorded in a memory buffer, or
281-
discarded if not needed. Logging supports various categories and
282-
levels of severity.
283-
284276
config LOG_MAX_LEVEL
285277
int "Maximum log level to record"
286278
default 6
@@ -452,7 +444,7 @@ endif
452444

453445
config VPL_LOG
454446
bool "Enable logging support in VPL"
455-
depends on LOG
447+
depends on LOG && VPL
456448
help
457449
This enables support for logging of status and debug messages. These
458450
can be displayed on the console, recorded in a memory buffer, or

dts/Kconfig

+1
Original file line numberDiff line numberDiff line change
@@ -534,6 +534,7 @@ endif
534534

535535
config VPL_OF_REAL
536536
def_bool y
537+
depends on VPL
537538
help
538539
Indicates that a real devicetree is available which can be accessed
539540
at runtime. This means that dev_read_...() functions can be used to

lib/Kconfig

+2-1
Original file line numberDiff line numberDiff line change
@@ -783,6 +783,7 @@ config TPL_OF_LIBFDT_ASSUME_MASK
783783

784784
config VPL_OF_LIBFDT
785785
bool "Enable the FDT library for VPL"
786+
depends on VPL
786787
default y if VPL_OF_CONTROL && !VPL_OF_PLATDATA
787788
help
788789
This enables the FDT library (libfdt). It provides functions for
@@ -793,7 +794,7 @@ config VPL_OF_LIBFDT
793794

794795
config VPL_OF_LIBFDT_ASSUME_MASK
795796
hex "Mask of conditions to assume for libfdt"
796-
depends on VPL_OF_LIBFDT || FIT
797+
depends on VPL_OF_LIBFDT || (FIT && VPL)
797798
default 0xff
798799
help
799800
Use this to change the assumptions made by libfdt in SPL about the

0 commit comments

Comments
 (0)