Kconfig: clean up skipping low-level initialization

Put all entries for skipping low-level initialization into a sub-menu.
Use different titles for main U-Boot, SPL, TPL.

Signed-off-by: Heinrich Schuchardt <heinrich.schuchardt@canonical.com>
Reviewed-by: Simon Glass <sjg@chromium.org>
Reviewed-by: Tom Rini <trini@konsulko.com>

diff --git a/arch/Kconfig b/arch/Kconfig
index 5f2b72f53500b86d173eec8be0c2944542ea438b..8fb87b7d857c8579b7a4b85e5e538b23d07178a0 100644 (file)
--- a/arch/Kconfig
+++ b/arch/Kconfig
@@ -384,9 +384,11 @@ config MONITOR_IS_IN_RAM
        bool "U-Boot is loaded in to RAM by a pre-loader"
        depends on M68K || NIOS2
 
-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
@@ -396,8 +398,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 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
@@ -407,7 +409,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 calls to certain low level initialization functions in TPL"
        depends on SPL && ARM
        help
          If enabled, then certain low level initializations (like setting up
@@ -418,7 +420,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
@@ -426,7 +428,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 call to lowlevel_init during early SPL boot ONLY"
        depends on SPL && ARM
        help
          This allows just the call to lowlevel_init() to be skipped. The
@@ -434,13 +436,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 call to lowlevel_init during early TPL 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)