tpl: Ensure all TPL symbols in Kconfig have some TPL dependency

Tighten up symbol dependencies in a number of places.  Ensure that a TPL
specific option has at least a direct dependency on TPL.  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/arch/x86/Kconfig b/arch/x86/Kconfig
index 7cbfd6c9720877d4045516d327acf8f9e2c7c089..1ac43e98bb6bd63099678b1c26ed3d320df5a940 100644 (file)
--- a/arch/x86/Kconfig
+++ b/arch/x86/Kconfig
@@ -956,6 +956,7 @@ config SPL_ACPI_GPE
 
 config TPL_ACPI_GPE
        bool "Support ACPI general-purpose events in TPL"
+       depends on TPL
        help
          Enable a driver for ACPI GPEs to allow peripherals to send interrupts
          via ACPI to the OS. In U-Boot this is only used when U-Boot itself

diff --git a/boot/Kconfig b/boot/Kconfig
index 08451c65a56b9c6882f71faa47ebf74259653b23..38fc71c6f79f9c9e91101d8be98524aae0206bde 100644 (file)
--- a/boot/Kconfig
+++ b/boot/Kconfig
@@ -622,7 +622,7 @@ config SPL_BOOTSTAGE
 
 config TPL_BOOTSTAGE
        bool "Boot timing and reported in TPL"
-       depends on BOOTSTAGE
+       depends on BOOTSTAGE && TPL
        help
          Enable recording of boot time in SPL. To make this visible to U-Boot
          proper, enable BOOTSTAGE_STASH as well. This will stash the timing

diff --git a/common/Kconfig b/common/Kconfig
index 84db2e43f155c51c3692a6160e1564b899562a84..e3a57e20820fba1ec04b8e410fc1a41043ddbeed 100644 (file)
--- a/common/Kconfig
+++ b/common/Kconfig
@@ -87,6 +87,7 @@ config SPL_LOGLEVEL
 
 config TPL_LOGLEVEL
        int
+       depends on TPL
        default LOGLEVEL
 
 config VPL_LOGLEVEL
@@ -408,7 +409,7 @@ endif
 
 config TPL_LOG
        bool "Enable logging support in TPL"
-       depends on LOG
+       depends on LOG && TPL
        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/drivers/core/Kconfig b/drivers/core/Kconfig
index 9b9a7148a1a48457c9d0996a7461f484ff41221e..d3fe1d4093d90657a996fab4d40494ae84e0d499 100644 (file)
--- a/drivers/core/Kconfig
+++ b/drivers/core/Kconfig
@@ -224,7 +224,7 @@ config SPL_SYSCON
 
 config TPL_SYSCON
        bool "Support system controllers in TPL"
-       depends on SPL_REGMAP
+       depends on TPL_REGMAP
        help
          Many SoCs have a number of system controllers which are dealt with
          as a group by a single driver. Some common functionality is provided

diff --git a/drivers/power/acpi_pmc/Kconfig b/drivers/power/acpi_pmc/Kconfig
index fcd50e36cad424cdd1cc73863fc9f0f7324f96e0..355d1618c61a2eb4f147dbf609e89ae8ca3c6f6c 100644 (file)
--- a/drivers/power/acpi_pmc/Kconfig
+++ b/drivers/power/acpi_pmc/Kconfig
@@ -17,6 +17,7 @@ config SPL_ACPI_PMC
 
 config TPL_ACPI_PMC
        bool "Power Manager (x86 PMC) support in TPL"
+       depends on TPL
        default y if ACPI_PMC
        help
          Enable support for an x86-style power-management controller which

diff --git a/drivers/ram/Kconfig b/drivers/ram/Kconfig
index a4f9f1aad2ae5c871ef1d3f793c559a99880651f..7c346180baef5a88d425e71aeaec734a431b4354 100644 (file)
--- a/drivers/ram/Kconfig
+++ b/drivers/ram/Kconfig
@@ -19,7 +19,7 @@ config SPL_RAM
 
 config TPL_RAM
        bool "Enable RAM support in TPL"
-       depends on RAM
+       depends on RAM && TPL
        help
          The RAM subsystem adds a small amount of overhead to the image.
          If this is acceptable and you have a need to use RAM drivers in

diff --git a/lib/Kconfig b/lib/Kconfig
index 884569f9b154558129344d5424fd715dbe82b5ca..ccbc52de894b4e5904639cb95d8e9d23dec05118 100644 (file)
--- a/lib/Kconfig
+++ b/lib/Kconfig
@@ -248,6 +248,7 @@ config SPL_TINY_MEMSET
 
 config TPL_TINY_MEMSET
        bool "Use a very small memset() in TPL"
+       depends on TPL
        help
          The faster memset() is the arch-specific one (if available) enabled
          by CONFIG_USE_ARCH_MEMSET. If that is not enabled, we can still get
@@ -771,7 +772,7 @@ config TPL_OF_LIBFDT
 
 config TPL_OF_LIBFDT_ASSUME_MASK
        hex "Mask of conditions to assume for libfdt"
-       depends on TPL_OF_LIBFDT || FIT
+       depends on TPL_OF_LIBFDT || (FIT && TPL)
        default 0xff
        help
          Use this to change the assumptions made by libfdt in TPL about the