[U-Boot] Kconfig: Varios: Fix more SPL, TPL dependencies
diff mbox series

Message ID 20190824185034.30478-1-aford173@gmail.com
State Accepted
Commit a074667d52031b1074bc23ca59bf0b73c13ccf7c
Delegated to: Tom Rini
Headers show
Series
  • [U-Boot] Kconfig: Varios: Fix more SPL, TPL dependencies
Related show

Commit Message

Adam Ford Aug. 24, 2019, 6:50 p.m. UTC
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>

Comments

Tom Rini Aug. 27, 2019, 12:19 a.m. UTC | #1
On Sat, Aug 24, 2019 at 01:50:34PM -0500, Adam Ford wrote:

> 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 660aa66d84..5b70f1e4ff 100644

Applied to u-boot/master, thanks!

Patch
diff mbox series

diff --git a/common/spl/Kconfig b/common/spl/Kconfig
index 660aa66d84..5b70f1e4ff 100644
--- 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 82cd8f623c..95fe0aea2c 100644
--- 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 2d195ae35e..3b95b5387b 100644
--- 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 cb8b5c04db..8037b6ee2d 100644
--- 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 3942f035eb..02312273e2 100644
--- 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 8a447fd6e3..ae2d819ba9 100644
--- 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