mirror of
				https://github.com/smaeul/u-boot.git
				synced 2025-11-04 05:50:17 +00:00 
			
		
		
		
	configs: meson: remove unnecessary MESON_FDTFILE_SETTING
MESON_FDTFILE_SETTING is used to define the default name of the fdt file in u-boot environment. We can easily derive it from CONFIG_DEFAULT_DEVICE_TREE instead. This will help factorize the code a bit Signed-off-by: Jerome Brunet <jbrunet@baylibre.com> Signed-off-by: Neil Armstrong <narmstrong@baylibre.com>
This commit is contained in:
		
							parent
							
								
									32caa1e2f1
								
							
						
					
					
						commit
						e4623f75e4
					
				@ -9,8 +9,6 @@
 | 
			
		||||
#ifndef __CONFIG_H
 | 
			
		||||
#define __CONFIG_H
 | 
			
		||||
 | 
			
		||||
#define MESON_FDTFILE_SETTING "fdtfile=amlogic/meson-gxl-s905x-khadas-vim.dtb\0"
 | 
			
		||||
 | 
			
		||||
#include <configs/meson-gx-common.h>
 | 
			
		||||
 | 
			
		||||
#endif /* __CONFIG_H */
 | 
			
		||||
 | 
			
		||||
@ -9,8 +9,6 @@
 | 
			
		||||
#ifndef __CONFIG_H
 | 
			
		||||
#define __CONFIG_H
 | 
			
		||||
 | 
			
		||||
#define MESON_FDTFILE_SETTING "fdtfile=amlogic/meson-gxl-s905x-libretech-cc.dtb\0"
 | 
			
		||||
 | 
			
		||||
#include <configs/meson-gx-common.h>
 | 
			
		||||
 | 
			
		||||
#endif /* __CONFIG_H */
 | 
			
		||||
 | 
			
		||||
@ -44,7 +44,7 @@
 | 
			
		||||
	"kernel_addr_r=0x01080000\0" \
 | 
			
		||||
	"pxefile_addr_r=0x01080000\0" \
 | 
			
		||||
	"ramdisk_addr_r=0x13000000\0" \
 | 
			
		||||
	MESON_FDTFILE_SETTING \
 | 
			
		||||
	"fdtfile=amlogic/" CONFIG_DEFAULT_DEVICE_TREE ".dtb\0" \
 | 
			
		||||
	BOOTENV
 | 
			
		||||
 | 
			
		||||
#define CONFIG_SYS_BOOTM_LEN    (64 << 20)      /* 64 MiB */
 | 
			
		||||
 | 
			
		||||
@ -7,10 +7,6 @@
 | 
			
		||||
#ifndef __CONFIG_H
 | 
			
		||||
#define __CONFIG_H
 | 
			
		||||
 | 
			
		||||
/* Serial setup */
 | 
			
		||||
 | 
			
		||||
#define MESON_FDTFILE_SETTING "fdtfile=amlogic/meson-gxbb-nanopi-k2.dtb\0"
 | 
			
		||||
 | 
			
		||||
#include <configs/meson-gx-common.h>
 | 
			
		||||
 | 
			
		||||
#endif /* __CONFIG_H */
 | 
			
		||||
 | 
			
		||||
@ -7,10 +7,6 @@
 | 
			
		||||
#ifndef __CONFIG_H
 | 
			
		||||
#define __CONFIG_H
 | 
			
		||||
 | 
			
		||||
/* Serial setup */
 | 
			
		||||
 | 
			
		||||
#define MESON_FDTFILE_SETTING "fdtfile=amlogic/meson-gxbb-odroidc2.dtb\0"
 | 
			
		||||
 | 
			
		||||
#include <configs/meson-gx-common.h>
 | 
			
		||||
 | 
			
		||||
#endif /* __CONFIG_H */
 | 
			
		||||
 | 
			
		||||
@ -9,10 +9,6 @@
 | 
			
		||||
#ifndef __CONFIG_H
 | 
			
		||||
#define __CONFIG_H
 | 
			
		||||
 | 
			
		||||
/* Serial setup */
 | 
			
		||||
 | 
			
		||||
#define MESON_FDTFILE_SETTING "fdtfile=amlogic/meson-gxl-s905x-p212.dtb\0"
 | 
			
		||||
 | 
			
		||||
#include <configs/meson-gx-common.h>
 | 
			
		||||
 | 
			
		||||
#endif /* __CONFIG_H */
 | 
			
		||||
 | 
			
		||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user