[PATCH 1/1] Kconfig: clean up skipping low-level initialization

It is confusing if multiple Kconfig entries have the same title.
Use different titles for main U-Boot, SPL, TPL. Put all entries for skipping low-level initialization into a sub-menu.
Fixes: a2ac2b964bfb ("Convert CONFIG_SKIP_LOWLEVEL_INIT et al to Kconfig") Signed-off-by: Heinrich Schuchardt heinrich.schuchardt@canonical.com --- arch/Kconfig | 20 ++++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-)
diff --git a/arch/Kconfig b/arch/Kconfig index 102956d24c..112dcfe00f 100644 --- a/arch/Kconfig +++ b/arch/Kconfig @@ -381,9 +381,11 @@ config SYS_IMMR Address for the Internal Memory-Mapped Registers (IMMR) window used to configure the features of many Freescale / NXP SoCs.
-config SKIP_LOWLEVEL_INIT - bool "Skip the calls to certain low level initialization functions" +menu "Skipping low level initialization functions" depends on ARM || MIPS || RISCV + +config SKIP_LOWLEVEL_INIT + bool "Skip calls to certain low level initialization functions" help If enabled, then certain low level initializations (like setting up the memory controller) are omitted and/or U-Boot does not relocate @@ -393,8 +395,8 @@ config SKIP_LOWLEVEL_INIT debugger which performs these initializations itself.
config SPL_SKIP_LOWLEVEL_INIT - bool "Skip the calls to certain low level initialization functions" - depends on SPL && (ARM || MIPS || RISCV) + bool "Skip SPL calls to certain low level initialization functions" + depends on SPL help If enabled, then certain low level initializations (like setting up the memory controller) are omitted and/or U-Boot does not relocate @@ -404,7 +406,7 @@ config SPL_SKIP_LOWLEVEL_INIT debugger which performs these initializations itself.
config TPL_SKIP_LOWLEVEL_INIT - bool "Skip the calls to certain low level initialization functions" + bool "Skip TPL calls to certain low level initialization functions" depends on SPL && ARM help If enabled, then certain low level initializations (like setting up @@ -415,7 +417,7 @@ config TPL_SKIP_LOWLEVEL_INIT debugger which performs these initializations itself.
config SKIP_LOWLEVEL_INIT_ONLY - bool "Skip the call to lowlevel_init during early boot ONLY" + bool "Skip call to lowlevel_init during early boot ONLY" depends on ARM help This allows just the call to lowlevel_init() to be skipped. The @@ -423,7 +425,7 @@ config SKIP_LOWLEVEL_INIT_ONLY performed.
config SPL_SKIP_LOWLEVEL_INIT_ONLY - bool "Skip the call to lowlevel_init during early boot ONLY" + bool "Skip SPL call to lowlevel_init during early boot ONLY" depends on SPL && ARM help This allows just the call to lowlevel_init() to be skipped. The @@ -431,13 +433,15 @@ config SPL_SKIP_LOWLEVEL_INIT_ONLY performed.
config TPL_SKIP_LOWLEVEL_INIT_ONLY - bool "Skip the call to lowlevel_init during early boot ONLY" + bool "Skip TPL call to lowlevel_init during early boot ONLY" depends on TPL && ARM help This allows just the call to lowlevel_init() to be skipped. The normal CP15 init (such as enabling the instruction cache) is still performed.
+endmenu + config SYS_HAS_NONCACHED_MEMORY bool "Enable reserving a non-cached memory area for drivers" depends on (ARM || MIPS) && (RTL8169 || MEDIATEK_ETH)

Hi Heinrich,
On Fri, 30 Dec 2022 at 08:01, Heinrich Schuchardt heinrich.schuchardt@canonical.com wrote:
It is confusing if multiple Kconfig entries have the same title.
Use different titles for main U-Boot, SPL, TPL. Put all entries for skipping low-level initialization into a sub-menu.
Fixes: a2ac2b964bfb ("Convert CONFIG_SKIP_LOWLEVEL_INIT et al to Kconfig") Signed-off-by: Heinrich Schuchardt heinrich.schuchardt@canonical.com
arch/Kconfig | 20 ++++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-)
Reviewed-by: Simon Glass sjg@chromium.org
See below
diff --git a/arch/Kconfig b/arch/Kconfig index 102956d24c..112dcfe00f 100644 --- a/arch/Kconfig +++ b/arch/Kconfig @@ -381,9 +381,11 @@ config SYS_IMMR Address for the Internal Memory-Mapped Registers (IMMR) window used to configure the features of many Freescale / NXP SoCs.
-config SKIP_LOWLEVEL_INIT
bool "Skip the calls to certain low level initialization functions"
+menu "Skipping low level initialization functions" depends on ARM || MIPS || RISCV
+config SKIP_LOWLEVEL_INIT
bool "Skip calls to certain low level initialization functions" help If enabled, then certain low level initializations (like setting up the memory controller) are omitted and/or U-Boot does not relocate
@@ -393,8 +395,8 @@ config SKIP_LOWLEVEL_INIT debugger which performs these initializations itself.
config SPL_SKIP_LOWLEVEL_INIT
bool "Skip the calls to certain low level initialization functions"
depends on SPL && (ARM || MIPS || RISCV)
bool "Skip SPL calls to certain low level initialization functions"
This sounds like SPL calls are a thing, but really all calls in SPL are SPL calls.
So how about: Skip calls to certain low-level-initialization functions in SPL
?
depends on SPL help If enabled, then certain low level initializations (like setting up the memory controller) are omitted and/or U-Boot does not relocate
@@ -404,7 +406,7 @@ config SPL_SKIP_LOWLEVEL_INIT debugger which performs these initializations itself.
config TPL_SKIP_LOWLEVEL_INIT
bool "Skip the calls to certain low level initialization functions"
bool "Skip TPL calls to certain low level initialization functions" depends on SPL && ARM help If enabled, then certain low level initializations (like setting up
@@ -415,7 +417,7 @@ config TPL_SKIP_LOWLEVEL_INIT debugger which performs these initializations itself.
config SKIP_LOWLEVEL_INIT_ONLY
bool "Skip the call to lowlevel_init during early boot ONLY"
bool "Skip call to lowlevel_init during early boot ONLY" depends on ARM help This allows just the call to lowlevel_init() to be skipped. The
@@ -423,7 +425,7 @@ config SKIP_LOWLEVEL_INIT_ONLY performed.
config SPL_SKIP_LOWLEVEL_INIT_ONLY
bool "Skip the call to lowlevel_init during early boot ONLY"
bool "Skip SPL call to lowlevel_init during early boot ONLY"
Can we use lowlevel_init() consistently, since this is a function?
depends on SPL && ARM help This allows just the call to lowlevel_init() to be skipped. The
@@ -431,13 +433,15 @@ config SPL_SKIP_LOWLEVEL_INIT_ONLY performed.
config TPL_SKIP_LOWLEVEL_INIT_ONLY
bool "Skip the call to lowlevel_init during early boot ONLY"
bool "Skip TPL call to lowlevel_init during early boot ONLY" depends on TPL && ARM help This allows just the call to lowlevel_init() to be skipped. The normal CP15 init (such as enabling the instruction cache) is still performed.
+endmenu
config SYS_HAS_NONCACHED_MEMORY bool "Enable reserving a non-cached memory area for drivers" depends on (ARM || MIPS) && (RTL8169 || MEDIATEK_ETH) -- 2.37.2

On Fri, Dec 30, 2022 at 11:51:14AM -0600, Simon Glass wrote:
Hi Heinrich,
On Fri, 30 Dec 2022 at 08:01, Heinrich Schuchardt heinrich.schuchardt@canonical.com wrote:
It is confusing if multiple Kconfig entries have the same title.
Use different titles for main U-Boot, SPL, TPL. Put all entries for skipping low-level initialization into a sub-menu.
Fixes: a2ac2b964bfb ("Convert CONFIG_SKIP_LOWLEVEL_INIT et al to Kconfig") Signed-off-by: Heinrich Schuchardt heinrich.schuchardt@canonical.com
arch/Kconfig | 20 ++++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-)
Reviewed-by: Simon Glass sjg@chromium.org
See below
diff --git a/arch/Kconfig b/arch/Kconfig index 102956d24c..112dcfe00f 100644 --- a/arch/Kconfig +++ b/arch/Kconfig @@ -381,9 +381,11 @@ config SYS_IMMR Address for the Internal Memory-Mapped Registers (IMMR) window used to configure the features of many Freescale / NXP SoCs.
-config SKIP_LOWLEVEL_INIT
bool "Skip the calls to certain low level initialization functions"
+menu "Skipping low level initialization functions" depends on ARM || MIPS || RISCV
+config SKIP_LOWLEVEL_INIT
bool "Skip calls to certain low level initialization functions" help If enabled, then certain low level initializations (like setting up the memory controller) are omitted and/or U-Boot does not relocate
@@ -393,8 +395,8 @@ config SKIP_LOWLEVEL_INIT debugger which performs these initializations itself.
config SPL_SKIP_LOWLEVEL_INIT
bool "Skip the calls to certain low level initialization functions"
depends on SPL && (ARM || MIPS || RISCV)
bool "Skip SPL calls to certain low level initialization functions"
This sounds like SPL calls are a thing, but really all calls in SPL are SPL calls.
So how about: Skip calls to certain low-level-initialization functions in SPL
Yes please, as that's the form all of the other wordings like this take.
participants (3)
-
Heinrich Schuchardt
-
Simon Glass
-
Tom Rini