mirror of
				https://github.com/smaeul/u-boot.git
				synced 2025-10-31 12:08:19 +00:00 
			
		
		
		
	We have flipped CONFIG_SPL_DISABLE_OF_CONTROL. We have cleansing devices, $(SPL_) and CONFIG_IS_ENABLED(), so we are ready to clear away the ugly logic in include/fdtdec.h: #ifdef CONFIG_OF_CONTROL # if defined(CONFIG_SPL_BUILD) && !defined(SPL_OF_CONTROL) # define OF_CONTROL 0 # else # define OF_CONTROL 1 # endif #else # define OF_CONTROL 0 #endif Now CONFIG_IS_ENABLED(OF_CONTROL) is the substitute. It refers to CONFIG_OF_CONTROL for U-boot proper and CONFIG_SPL_OF_CONTROL for SPL. Also, we no longer have to cancel CONFIG_OF_CONTROL in include/config_uncmd_spl.h and scripts/Makefile.spl. Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com> Reviewed-by: Tom Rini <trini@konsulko.com> Reviewed-by: Simon Glass <sjg@chromium.org> Acked-by: Linus Walleij <linus.walleij@linaro.org>
		
			
				
	
	
		
			37 lines
		
	
	
		
			762 B
		
	
	
	
		
			C
		
	
	
	
	
	
			
		
		
	
	
			37 lines
		
	
	
		
			762 B
		
	
	
	
		
			C
		
	
	
	
	
	
| /*
 | |
|  * (C) Copyright 2012
 | |
|  * Ilya Yanok, ilya.yanok@gmail.com
 | |
|  *
 | |
|  * SPDX-License-Identifier:	GPL-2.0+
 | |
|  */
 | |
| 
 | |
| #ifndef __CONFIG_UNCMD_SPL_H__
 | |
| #define __CONFIG_UNCMD_SPL_H__
 | |
| 
 | |
| #ifdef CONFIG_SPL_BUILD
 | |
| /* SPL needs only BOOTP + TFTP so undefine other stuff to save space */
 | |
| #undef CONFIG_CMD_CDP
 | |
| #undef CONFIG_CMD_DHCP
 | |
| #undef CONFIG_CMD_DNS
 | |
| #undef CONFIG_CMD_LINK_LOCAL
 | |
| #undef CONFIG_CMD_NFS
 | |
| #undef CONFIG_CMD_PING
 | |
| #undef CONFIG_CMD_RARP
 | |
| #undef CONFIG_CMD_SNTP
 | |
| #undef CONFIG_CMD_TFTPPUT
 | |
| #undef CONFIG_CMD_TFTPSRV
 | |
| 
 | |
| #ifndef CONFIG_SPL_DM
 | |
| #undef CONFIG_DM_SERIAL
 | |
| #undef CONFIG_DM_GPIO
 | |
| #undef CONFIG_DM_I2C
 | |
| #undef CONFIG_DM_SPI
 | |
| #endif
 | |
| 
 | |
| #undef CONFIG_DM_WARN
 | |
| #undef CONFIG_DM_SEQ_ALIAS
 | |
| #undef CONFIG_DM_STDIO
 | |
| 
 | |
| #endif /* CONFIG_SPL_BUILD */
 | |
| #endif /* __CONFIG_UNCMD_SPL_H__ */
 |