Merge tag 'mmc-power-next-2025-12-24' of https://source.denx.de/u-boot/custodians/u-boot-mmc into next

- Various Kconfig prompt fixes for SPL from Quentin
- SPL_DM_REGULATOR_GPIO and REGULATOR_PWM dependency fix

4 files changed, 20 insertions, 27 deletions

diff --git a/Kconfig b/Kconfig
index 1d600342685..c435fb43182 100644
--- a/Kconfig
+++ b/Kconfig
@@ -140,6 +140,15 @@ config SPL_OPTIMIZE_INLINING
 	  do what it thinks is best, which is desirable in some cases for size
 	  reasons.
 
+config TPL_OPTIMIZE_INLINING
+	bool "Allow compiler to uninline functions marked 'inline' in TPL"
+	depends on TPL
+	help
+	  This option determines if U-Boot forces gcc to inline the functions
+	  developers have marked 'inline'. Doing so takes away freedom from gcc to
+	  do what it thinks is best, which is desirable in some cases for size
+	  reasons.
+
 config ARCH_SUPPORTS_LTO
 	bool
 
@@ -163,15 +172,6 @@ config LTO
 
 	  If unsure, say n.
 
-config TPL_OPTIMIZE_INLINING
-	bool "Allow compiler to uninline functions marked 'inline' in TPL"
-	depends on TPL
-	help
-	  This option determines if U-Boot forces gcc to inline the functions
-	  developers have marked 'inline'. Doing so takes away freedom from gcc to
-	  do what it thinks is best, which is desirable in some cases for size
-	  reasons.
-
 config CC_COVERAGE
 	bool "Enable code coverage analysis"
 	depends on SANDBOX
diff --git a/boot/Kconfig b/boot/Kconfig
index 1306fc076f0..644f398f1e9 100644
--- a/boot/Kconfig
+++ b/boot/Kconfig
@@ -246,7 +246,7 @@ config SPL_LOAD_FIT
 	     "linux" images are also supported with Falcon boot mode.
 
 config SPL_LOAD_FIT_ADDRESS
-	hex "load address of fit image"
+	hex "load address of fit image in SPL"
 	depends on SPL_LOAD_FIT
 	default 0x44000000 if ARCH_IMX8M
 	default 0x60080000 if ARCH_ROCKCHIP && SPL_TEXT_BASE = 0x60000000
@@ -269,7 +269,7 @@ config SPL_LOAD_FIT_APPLY_OVERLAY
 config SPL_LOAD_FIT_APPLY_OVERLAY_BUF_SZ
 	depends on SPL_LOAD_FIT_APPLY_OVERLAY
 	default 0x10000
-	hex "size of temporary buffer used to load the overlays"
+	hex "size of temporary buffer used to load the overlays within SPL"
 	help
 	  The size of the area where the overlays will be loaded and
 	  uncompress. Must be at least as large as biggest overlay
@@ -344,7 +344,7 @@ config VPL_LOAD_FIT
 	default y
 
 config VPL_LOAD_FIT_FULL
-	bool "Enable SPL loading U-Boot as a FIT (full fitImage features)"
+	bool "Enable VPL loading U-Boot as a FIT (full fitImage features)"
 	select VPL_FIT
 	help
 	  Normally with the SPL framework a legacy image is generated as part
@@ -362,13 +362,13 @@ config VPL_FIT_PRINT
 	  Support printing the content of the fitImage in a verbose manner in VPL.
 
 config VPL_FIT_FULL_CHECK
-	bool "Do a full check of the FIT before using it"
+	bool "Do a full check of the FIT within VPL before using it"
 	default y
 	help
-	  Enable this do a full check of the FIT to make sure it is valid. This
-	  helps to protect against carefully crafted FITs which take advantage
-	  of bugs or omissions in the code. This includes a bad structure,
-	  multiple root nodes and the like.
+	  Enable this do a full check of the FIT within VPL to make sure it is
+	  valid. This helps to protect against carefully crafted FITs which take
+	  advantage of bugs or omissions in the code. This includes a bad
+	  structure, multiple root nodes and the like.
 
 config VPL_FIT_SIGNATURE
 	bool "Enable signature verification of FIT firmware within VPL"
diff --git a/common/spl/Kconfig b/common/spl/Kconfig
index 9e0402f6827..4b10e9c3880 100644
--- a/common/spl/Kconfig
+++ b/common/spl/Kconfig
@@ -309,7 +309,7 @@ config SPL_LOAD_BLOCK
 	  to struct spl_load_info.
 
 config SPL_BOOTROM_SUPPORT
-	bool "Support returning to the BOOTROM"
+	bool "Support returning to the BOOTROM (from SPL)"
 	select SPL_LOAD_BLOCK if MACH_IMX
 	help
 	  Some platforms (e.g. the Rockchip RK3368) provide support in their
diff --git a/drivers/power/regulator/Kconfig b/drivers/power/regulator/Kconfig
index 1875e61967c..c6da459a212 100644
--- a/drivers/power/regulator/Kconfig
+++ b/drivers/power/regulator/Kconfig
@@ -133,7 +133,7 @@ config DM_REGULATOR_PFUZE100
 
 config REGULATOR_PWM
 	bool "Enable driver for PWM regulators"
-	depends on DM_REGULATOR
+	depends on DM_REGULATOR && DM_PWM
 	---help---
 	Enable support for the PWM regulator functions which voltage are
 	controlled by PWM duty ratio. Some of Rockchip board using this kind
@@ -141,13 +141,6 @@ config REGULATOR_PWM
 	This driver is controlled by a device tree node
 	which includes voltage limits.
 
-config SPL_REGULATOR_PWM
-	bool "Enable Driver for PWM regulators in SPL"
-	depends on SPL_DM_REGULATOR && SPL && SPL_DM_PWM
-	help
-	  This config enables implementation of driver-model regulator uclass
-	  features for PWM regulators in SPL.
-
 config DM_REGULATOR_MAX8907
 	bool "Enable Driver Model for REGULATOR MAX8907"
 	depends on DM_REGULATOR && DM_PMIC_MAX8907
@@ -249,7 +242,7 @@ config DM_REGULATOR_QCOM_USB_VBUS
 
 config SPL_DM_REGULATOR_GPIO
 	bool "Enable Driver Model for GPIO REGULATOR in SPL"
-	depends on DM_REGULATOR_GPIO && SPL_GPIO
+	depends on DM_REGULATOR_GPIO && SPL_DM_GPIO
 	select SPL_DM_REGULATOR_COMMON
 	---help---
 	This config enables implementation of driver-model regulator uclass