From 863280eca06bc2e98492795a5bd9513438a60a0a Mon Sep 17 00:00:00 2001 From: Quentin Schulz Date: Fri, 12 Dec 2025 19:13:13 +0100 Subject: Kconfig: put TPL_OPTIMIZE_INLINING next to SPL_OPTIMIZE_INLINING Right now LTO is in-between both when using menuconfig. Signed-off-by: Quentin Schulz Reviewed-by: Anshul Dalal Reviewed-by: Kory Maincent Signed-off-by: Peng Fan --- Kconfig | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 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 -- cgit v1.3.1 From ed31533f0febf3453f1b93ed5414aa62654fe7ca Mon Sep 17 00:00:00 2001 From: Quentin Schulz Date: Fri, 12 Dec 2025 19:13:14 +0100 Subject: boot: fix prompt for SPL_LOAD_FIT_ADDRESS The prompt is missing the indication this applies for the SPL loading a FIT image, and not any other stage. Signed-off-by: Quentin Schulz Reviewed-by: xypron.glpk@gmx.de Reviewed-by: Udit Kumar Reviewed-by: Anshul Dalal Reviewed-by: Kory Maincent Signed-off-by: Peng Fan --- boot/Kconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/boot/Kconfig b/boot/Kconfig index 1306fc076f0..f05b73af651 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 -- cgit v1.3.1 From b6b463a3377fbea91c0a5b95c8d3fae9e2e7c8bf Mon Sep 17 00:00:00 2001 From: Quentin Schulz Date: Fri, 12 Dec 2025 19:13:15 +0100 Subject: boot: fix prompt for SPL_LOAD_FIT_APPLY_OVERLAY_BUF_SZ The prompt currently doesn't specify this applies to the SPL stage only, so let's fix this oversight. Signed-off-by: Quentin Schulz Reviewed-by: Anshul Dalal Reviewed-by: Kory Maincent Signed-off-by: Peng Fan --- boot/Kconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/boot/Kconfig b/boot/Kconfig index f05b73af651..7e97874e77a 100644 --- a/boot/Kconfig +++ b/boot/Kconfig @@ -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 -- cgit v1.3.1 From 6d77c5a1445e00b8674dac59a07ac00fb94da7bc Mon Sep 17 00:00:00 2001 From: Quentin Schulz Date: Fri, 12 Dec 2025 19:13:16 +0100 Subject: boot: fix prompt for VPL_LOAD_FIT_FULL The prompt wrongly specifies this applies to SPL while this symbol is for VPL, let's fix this oversight. Fixes: 8dfbd798122b ("boot: Allow use of FIT in TPL and VPL") Signed-off-by: Quentin Schulz Acked-by: Udit Kumar Reviewed-by: Anshul Dalal Reviewed-by: Kory Maincent Signed-off-by: Peng Fan --- boot/Kconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/boot/Kconfig b/boot/Kconfig index 7e97874e77a..c1cbef3b29d 100644 --- a/boot/Kconfig +++ b/boot/Kconfig @@ -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 -- cgit v1.3.1 From df724f1e3c3970f26a74d32772b3e450c4395989 Mon Sep 17 00:00:00 2001 From: Quentin Schulz Date: Fri, 12 Dec 2025 19:13:17 +0100 Subject: boot: specify VPL_FIT_FULL_CHECK applies to VPL VPL_FIT_FULL_CHECK currently shares its description and help text with FIT_FULL_CHECK which is quite confusing, so let's specify this applies to VPL. Fixes: 4218456b3fac ("vbe: Add Kconfig options for VPL") Signed-off-by: Quentin Schulz Reviewed-by: Anshul Dalal Reviewed-by: Kory Maincent Signed-off-by: Peng Fan --- boot/Kconfig | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/boot/Kconfig b/boot/Kconfig index c1cbef3b29d..644f398f1e9 100644 --- a/boot/Kconfig +++ b/boot/Kconfig @@ -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" -- cgit v1.3.1 From a56270310af18db96fd45a2d59a0dc1ec2e26328 Mon Sep 17 00:00:00 2001 From: Quentin Schulz Date: Fri, 12 Dec 2025 19:13:18 +0100 Subject: spl: fix prompt for SPL_BOOTROM_SUPPORT SPL_BOOTROM_SUPPORT currently doesn't specify it enables returning to BootROM *from SPL*, which TPL_BOOTROM_SUPPORT does say. So let's align the prompts so that both say from which stage you can return to the BootROM. Fixes: 225d30b70846 ("spl: add a 'return to bootrom' boot method") Signed-off-by: Quentin Schulz Reviewed-by: Anshul Dalal Reviewed-by: Kory Maincent Signed-off-by: Peng Fan --- common/spl/Kconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 -- cgit v1.3.1 From 2c01c4b72064e8832ab1076c0384ff52aab8cd7d Mon Sep 17 00:00:00 2001 From: Quentin Schulz Date: Fri, 12 Dec 2025 19:13:19 +0100 Subject: power: regulator: fix dependency for REGULATOR_PWM The PWM regulator driver is a uclass driver, thus requiring DM_PWM to be enabled to be actually usable (and with the appropriate PWM controller driver enabled as well, but that we cannot enforce easily), so let's add this missing dependency. Fixes: 1a01695615f9 ("power: regulator: add pwm regulator") Signed-off-by: Quentin Schulz Reviewed-by: Udit Kumar Reviewed-by: Anshul Dalal Reviewed-by: Kory Maincent Signed-off-by: Peng Fan --- drivers/power/regulator/Kconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/power/regulator/Kconfig b/drivers/power/regulator/Kconfig index 1875e61967c..d6b451ca407 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 -- cgit v1.3.1 From 8d3e8af93649f4b2d8e00475695bdf59545fd589 Mon Sep 17 00:00:00 2001 From: Quentin Schulz Date: Fri, 12 Dec 2025 19:13:20 +0100 Subject: power: regulator: remove SPL_REGULATOR_PWM due to unmeetable SPL_DM_PWM dependency SPL_DM_PWM option simply doesn't exist. Moreover, drivers/pwm is only included by drivers/Makefile for non-xPL stages so making SPL_REGULATOR_PWM properly build for SPL/xPL is more involved than just adding an SPL_DM_PWM option. Reading the original commit (ddc824f89aa8 ("power: regulator: Allow PWM regulator to be omitted from SPL."), the intent seemingly wasn't to allow building support in XPL but rather to allow removing it which is done by using $(PHASE_) ($(SPL_) at that time) in the Makefile. If anyone needs that, let them figure out what they need to do without misleading potential users of this symbol by simply removing it. Fixes: 2a846e04c622 ("power: regulator: Correct dependencies on SPL_REGULATOR_PWM") Signed-off-by: Quentin Schulz Reviewed-by: Anshul Dalal Reviewed-by: Kory Maincent Signed-off-by: Peng Fan --- drivers/power/regulator/Kconfig | 7 ------- 1 file changed, 7 deletions(-) diff --git a/drivers/power/regulator/Kconfig b/drivers/power/regulator/Kconfig index d6b451ca407..124b0b34c41 100644 --- a/drivers/power/regulator/Kconfig +++ b/drivers/power/regulator/Kconfig @@ -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 -- cgit v1.3.1 From 3f495781dd06007eeaba61fec9f71908fa491ec9 Mon Sep 17 00:00:00 2001 From: Peng Fan Date: Thu, 11 Dec 2025 18:01:19 +0800 Subject: power: regulator: Fix dependency of SPL_DM_REGULATOR_GPIO gpio-regulator uses dm gpio API, so it depends on SPL_DM_GPIO, not SPL_GPIO. Reported-by: Tom Rini Reviewed-by: Tom Rini Signed-off-by: Peng Fan --- drivers/power/regulator/Kconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/power/regulator/Kconfig b/drivers/power/regulator/Kconfig index 124b0b34c41..c6da459a212 100644 --- a/drivers/power/regulator/Kconfig +++ b/drivers/power/regulator/Kconfig @@ -242,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 -- cgit v1.3.1