Kconfig: Varios: Fix more SPL, TPL dependencies

Several options are presenting themselves on a various boards
where the options are clearly not used.  (ie, SPL/TPL options
when SPL or TPL are not defined)

This patch is not attempting to be a complete list of items, but
more like low hanging fruit.  In some instances, I wasn't sure
of DM was required, so I simply made them SPL or TPL.

This patch attempts to reduce some of the menuconfig noise
by defining dependencies so they don't appear when not used.

Signed-off-by: Adam Ford <aford173@gmail.com>

diff --git a/common/spl/Kconfig b/common/spl/Kconfig
index 94dcdff806e468f200fcdf6df5d1694f6867fa3e..e48419825e9b26c266fd6ca1f7aaf312e4aebd98 100644 (file)
--- a/common/spl/Kconfig
+++ b/common/spl/Kconfig
@@ -435,6 +435,7 @@ config SPL_HASH_SUPPORT
 
 config TPL_HASH_SUPPORT
        bool "Support hashing drivers in TPL"
+       depends on TPL
        select SHA1
        select SHA256
        help

diff --git a/drivers/clk/Kconfig b/drivers/clk/Kconfig
index 82cd8f623c45f5f45a3c53460c5a1eb07854c18d..95fe0aea2ce8cd885facd35d75f2b06cdc43cf73 100644 (file)
--- a/drivers/clk/Kconfig
+++ b/drivers/clk/Kconfig
@@ -48,6 +48,7 @@ config CLK_BOSTON
 
 config SPL_CLK_CCF
        bool "SPL Common Clock Framework [CCF] support "
+       depends on SPL
        help
          Enable this option if you want to (re-)use the Linux kernel's Common
          Clock Framework [CCF] code in U-Boot's SPL.

diff --git a/drivers/core/Kconfig b/drivers/core/Kconfig
index 2d195ae35ed526b7a0d73b226278b494d3feaf51..3b95b5387b928aee550bd98e739bedc676ed6144 100644 (file)
--- a/drivers/core/Kconfig
+++ b/drivers/core/Kconfig
@@ -92,7 +92,7 @@ config DM_SEQ_ALIAS
 
 config SPL_DM_SEQ_ALIAS
        bool "Support numbered aliases in device tree in SPL"
-       depends on DM
+       depends on SPL_DM
        default n
        help
          Most boards will have a '/aliases' node containing the path to

diff --git a/drivers/misc/Kconfig b/drivers/misc/Kconfig
index cb8b5c04dbc464cae22f9621f762eea0f31be3aa..8037b6ee2d75351a38cbe08f511dc8c8260436ae 100644 (file)
--- a/drivers/misc/Kconfig
+++ b/drivers/misc/Kconfig
@@ -88,6 +88,7 @@ config CROS_EC
 
 config SPL_CROS_EC
        bool "Enable Chrome OS EC in SPL"
+       depends on SPL
        help
          Enable access to the Chrome OS EC in SPL. This is a separate
          microcontroller typically available on a SPI bus on Chromebooks. It
@@ -97,6 +98,7 @@ config SPL_CROS_EC
 
 config TPL_CROS_EC
        bool "Enable Chrome OS EC in TPL"
+       depends on TPL
        help
          Enable access to the Chrome OS EC in TPL. This is a separate
          microcontroller typically available on a SPI bus on Chromebooks. It

diff --git a/drivers/phy/Kconfig b/drivers/phy/Kconfig
index 3942f035ebb5117775cba9b3bea719de17d00d4d..02312273e27e9e5fb01c8c0956c67091cdf0ce3f 100644 (file)
--- a/drivers/phy/Kconfig
+++ b/drivers/phy/Kconfig
@@ -19,7 +19,7 @@ config PHY
 
 config SPL_PHY
        bool "PHY Core in SPL"
-       depends on DM
+       depends on DM && SPL
        help
          PHY support in SPL.
 

diff --git a/drivers/serial/Kconfig b/drivers/serial/Kconfig
index 8a447fd6e30b25ce6ffe74dcb14fef9885bacf97..ae2d819ba9506978cf3139c171b6cd582e56dd57 100644 (file)
--- a/drivers/serial/Kconfig
+++ b/drivers/serial/Kconfig
@@ -45,7 +45,7 @@ config SERIAL_PRESENT
 
 config SPL_SERIAL_PRESENT
        bool "Provide a serial driver in SPL"
-       depends on DM_SERIAL
+       depends on DM_SERIAL && SPL
        default y
        help
          In very space-constrained devices even the full UART driver is too
@@ -55,7 +55,7 @@ config SPL_SERIAL_PRESENT
 
 config TPL_SERIAL_PRESENT
        bool "Provide a serial driver in TPL"
-       depends on DM_SERIAL
+       depends on DM_SERIAL && TPL
        default y
        help
          In very space-constrained devices even the full UART driver is too