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>
This commit is contained in:
		
							parent
							
								
									5f7a507eb3
								
							
						
					
					
						commit
						c394e8d0ee
					
				
							
								
								
									
										20
									
								
								arch/Kconfig
								
								
								
								
							
							
						
						
									
										20
									
								
								arch/Kconfig
								
								
								
								
							|  | @ -384,9 +384,11 @@ config MONITOR_IS_IN_RAM | ||||||
| 	bool "U-Boot is loaded in to RAM by a pre-loader" | 	bool "U-Boot is loaded in to RAM by a pre-loader" | ||||||
| 	depends on M68K || NIOS2 | 	depends on M68K || NIOS2 | ||||||
| 
 | 
 | ||||||
| config SKIP_LOWLEVEL_INIT | menu "Skipping low level initialization functions" | ||||||
| 	bool "Skip the calls to certain low level initialization functions" |  | ||||||
| 	depends on ARM || MIPS || RISCV | 	depends on ARM || MIPS || RISCV | ||||||
|  | 
 | ||||||
|  | config SKIP_LOWLEVEL_INIT | ||||||
|  | 	bool "Skip calls to certain low level initialization functions" | ||||||
| 	help | 	help | ||||||
| 	  If enabled, then certain low level initializations (like setting up | 	  If enabled, then certain low level initializations (like setting up | ||||||
| 	  the memory controller) are omitted and/or U-Boot does not relocate | 	  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. | 	  debugger which performs these initializations itself. | ||||||
| 
 | 
 | ||||||
| config SPL_SKIP_LOWLEVEL_INIT | config SPL_SKIP_LOWLEVEL_INIT | ||||||
| 	bool "Skip the calls to certain low level initialization functions" | 	bool "Skip calls to certain low level initialization functions in SPL" | ||||||
| 	depends on SPL && (ARM || MIPS || RISCV) | 	depends on SPL | ||||||
| 	help | 	help | ||||||
| 	  If enabled, then certain low level initializations (like setting up | 	  If enabled, then certain low level initializations (like setting up | ||||||
| 	  the memory controller) are omitted and/or U-Boot does not relocate | 	  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. | 	  debugger which performs these initializations itself. | ||||||
| 
 | 
 | ||||||
| config TPL_SKIP_LOWLEVEL_INIT | 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 | 	depends on SPL && ARM | ||||||
| 	help | 	help | ||||||
| 	  If enabled, then certain low level initializations (like setting up | 	  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. | 	  debugger which performs these initializations itself. | ||||||
| 
 | 
 | ||||||
| config SKIP_LOWLEVEL_INIT_ONLY | 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 | 	depends on ARM | ||||||
| 	help | 	help | ||||||
| 	  This allows just the call to lowlevel_init() to be skipped. The | 	  This allows just the call to lowlevel_init() to be skipped. The | ||||||
|  | @ -426,7 +428,7 @@ config SKIP_LOWLEVEL_INIT_ONLY | ||||||
| 	  performed. | 	  performed. | ||||||
| 
 | 
 | ||||||
| config SPL_SKIP_LOWLEVEL_INIT_ONLY | 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 | 	depends on SPL && ARM | ||||||
| 	help | 	help | ||||||
| 	  This allows just the call to lowlevel_init() to be skipped. The | 	  This allows just the call to lowlevel_init() to be skipped. The | ||||||
|  | @ -434,13 +436,15 @@ config SPL_SKIP_LOWLEVEL_INIT_ONLY | ||||||
| 	  performed. | 	  performed. | ||||||
| 
 | 
 | ||||||
| config TPL_SKIP_LOWLEVEL_INIT_ONLY | 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 | 	depends on TPL && ARM | ||||||
| 	help | 	help | ||||||
| 	  This allows just the call to lowlevel_init() to be skipped. The | 	  This allows just the call to lowlevel_init() to be skipped. The | ||||||
| 	  normal CP15 init (such as enabling the instruction cache) is still | 	  normal CP15 init (such as enabling the instruction cache) is still | ||||||
| 	  performed. | 	  performed. | ||||||
| 
 | 
 | ||||||
|  | endmenu | ||||||
|  | 
 | ||||||
| config SYS_HAS_NONCACHED_MEMORY | config SYS_HAS_NONCACHED_MEMORY | ||||||
| 	bool "Enable reserving a non-cached memory area for drivers" | 	bool "Enable reserving a non-cached memory area for drivers" | ||||||
| 	depends on (ARM || MIPS) && (RTL8169 || MEDIATEK_ETH) | 	depends on (ARM || MIPS) && (RTL8169 || MEDIATEK_ETH) | ||||||
|  |  | ||||||
		Loading…
	
		Reference in New Issue