Convert CONFIG_SYS_LOAD_ADDR to Kconfig

Now that we have consistent usage, migrate this symbol to Kconfig. Signed-off-by: Tom Rini <trini@konsulko.com> Reviewed-by: Rick Chen <rick@andestech.com>
2021-08-23 10:25:31 -04:00
parent 72d81360aa
commit 49c8ef0e45
935 changed files with 636 additions and 564 deletions
--- a/include/configs/10m50_devboard.h
+++ b/include/configs/10m50_devboard.h
@@ -57,9 +57,5 @@
 * (which is common practice).
 */

-/*
- * MISC
- */
-#define CONFIG_SYS_LOAD_ADDR		0xcc000000	/* Half of RAM */

 #endif /* __CONFIG_H */
--- a/include/configs/3c120_devboard.h
+++ b/include/configs/3c120_devboard.h
@@ -57,9 +57,5 @@
 * (which is common practice).
 */

-/*
- * MISC
- */
-#define CONFIG_SYS_LOAD_ADDR		0xd4000000	/* Half of RAM */

 #endif /* __CONFIG_H */
--- a/include/configs/M5208EVBE.h
+++ b/include/configs/M5208EVBE.h
@@ -66,8 +66,6 @@

 #define CONFIG_PRAM		512	/* 512 KB */

-#define CONFIG_SYS_LOAD_ADDR	0x40010000
-
 #define CONFIG_SYS_CLK		166666666	/* CPU Core Clock */
 #define CONFIG_SYS_PLL_ODR	0x36
 #define CONFIG_SYS_PLL_FDR	0x7D
--- a/include/configs/M5235EVB.h
+++ b/include/configs/M5235EVB.h
@@ -78,8 +78,6 @@

 #define CONFIG_PRAM		512	/* 512 KB */

-#define CONFIG_SYS_LOAD_ADDR		(CONFIG_SYS_SDRAM_BASE+0x20000)
-
 #define CONFIG_SYS_CLK			75000000
 #define CONFIG_SYS_CPU_CLK		CONFIG_SYS_CLK * 2

--- a/include/configs/M5249EVB.h
+++ b/include/configs/M5249EVB.h
@@ -31,8 +31,6 @@
 */
 #undef CONFIG_BOOTP_BOOTFILESIZE

-#define CONFIG_SYS_LOAD_ADDR		0x200000	/* default load address */
-
 /*
 * Clock configuration: enable only one of the following options
 */
--- a/include/configs/M5253DEMO.h
+++ b/include/configs/M5253DEMO.h
@@ -75,8 +75,6 @@
 #define CONFIG_SYS_I2C_PINMUX_CLR	(0xFFFFE7FF)
 #define CONFIG_SYS_I2C_PINMUX_SET	(0)

-#define CONFIG_SYS_LOAD_ADDR		0x00100000
-
 #undef CONFIG_SYS_PLL_BYPASS		/* bypass PLL for test purpose */
 #define CONFIG_SYS_FAST_CLK
 #ifdef CONFIG_SYS_FAST_CLK
--- a/include/configs/M5272C3.h
+++ b/include/configs/M5272C3.h
@@ -75,7 +75,6 @@
 	"save\0"				\
 	""

-#define CONFIG_SYS_LOAD_ADDR		0x20000
 #define CONFIG_SYS_CLK			66000000

 /*
--- a/include/configs/M5275EVB.h
+++ b/include/configs/M5275EVB.h
@@ -64,8 +64,6 @@
 #define CONFIG_SYS_I2C_PINMUX_CLR	(0xFFF0)
 #define CONFIG_SYS_I2C_PINMUX_SET	(0x000F)

-#define CONFIG_SYS_LOAD_ADDR		0x800000
-
 #define CONFIG_BOOTCOMMAND	"bootm ffe40000"

 #ifdef CONFIG_MCFFEC
--- a/include/configs/M5282EVB.h
+++ b/include/configs/M5282EVB.h
@@ -72,8 +72,6 @@
 	"save\0"				\
 	""

-#define CONFIG_SYS_LOAD_ADDR		0x20000
-
 #define	CONFIG_SYS_CLK			64000000

 /* PLL Configuration: Ext Clock * 6 (see table 9-4 of MCF user manual) */
--- a/include/configs/M53017EVB.h
+++ b/include/configs/M53017EVB.h
@@ -81,8 +81,6 @@

 #define CONFIG_PRAM		512	/* 512 KB */

-#define CONFIG_SYS_LOAD_ADDR	0x40010000
-
 #define CONFIG_SYS_CLK		80000000
 #define CONFIG_SYS_CPU_CLK	CONFIG_SYS_CLK * 3

--- a/include/configs/M5329EVB.h
+++ b/include/configs/M5329EVB.h
@@ -75,8 +75,6 @@

 #define CONFIG_PRAM		512	/* 512 KB */

-#define CONFIG_SYS_LOAD_ADDR		0x40010000
-
 #define CONFIG_SYS_CLK			80000000
 #define CONFIG_SYS_CPU_CLK		CONFIG_SYS_CLK * 3

--- a/include/configs/M5373EVB.h
+++ b/include/configs/M5373EVB.h
@@ -77,8 +77,6 @@

 #define CONFIG_PRAM		512	/* 512 KB */

-#define CONFIG_SYS_LOAD_ADDR		0x40010000
-
 #define CONFIG_SYS_CLK			80000000
 #define CONFIG_SYS_CPU_CLK		CONFIG_SYS_CLK * 3

--- a/include/configs/MCR3000.h
+++ b/include/configs/MCR3000.h
@@ -60,8 +60,6 @@

 /* Miscellaneous configurable options */

-#define	CONFIG_SYS_LOAD_ADDR		0x200000
-
 #define	CONFIG_SYS_HZ			1000

 /* Definitions for initial stack pointer and data area (in DPRAM) */
--- a/include/configs/MPC8349EMDS.h
+++ b/include/configs/MPC8349EMDS.h
@@ -230,7 +230,6 @@
 /*
 * Miscellaneous configurable options
 */
-#define CONFIG_SYS_LOAD_ADDR	0x2000000	/* default load address */

 /*
 * For booting Linux, the board info and command line data
--- a/include/configs/MPC8349EMDS_SDRAM.h
+++ b/include/configs/MPC8349EMDS_SDRAM.h
@@ -285,7 +285,6 @@
 /*
 * Miscellaneous configurable options
 */
-#define CONFIG_SYS_LOAD_ADDR	0x2000000	/* default load address */

 /*
 * For booting Linux, the board info and command line data
--- a/include/configs/MPC837XERDB.h
+++ b/include/configs/MPC837XERDB.h
@@ -315,7 +315,6 @@
 /*
 * Miscellaneous configurable options
 */
-#define CONFIG_SYS_LOAD_ADDR	0x2000000 /* default load address */

 /*
 * For booting Linux, the board info and command line data
--- a/include/configs/MPC8540ADS.h
+++ b/include/configs/MPC8540ADS.h
@@ -281,7 +281,6 @@
 /*
 * Miscellaneous configurable options
 */
-#define CONFIG_SYS_LOAD_ADDR	0x2000000	/* default load address */

 /*
 * For booting Linux, the board info and command line data
--- a/include/configs/MPC8548CDS.h
+++ b/include/configs/MPC8548CDS.h
@@ -407,7 +407,6 @@ extern unsigned long get_clock_freq(void);
 /*
 * Miscellaneous configurable options
 */
-#define CONFIG_SYS_LOAD_ADDR	0x2000000	/* default load address */

 /*
 * For booting Linux, the board info and command line data
--- a/include/configs/MPC8560ADS.h
+++ b/include/configs/MPC8560ADS.h
@@ -269,7 +269,6 @@
 /*
 * Miscellaneous configurable options
 */
-#define CONFIG_SYS_LOAD_ADDR	0x1000000	/* default load address */

 #define CONFIG_SYS_BARGSIZE	CONFIG_SYS_CBSIZE	/* Boot Argument Buffer Size */

--- a/include/configs/P1010RDB.h
+++ b/include/configs/P1010RDB.h
@@ -611,7 +611,6 @@ extern unsigned long get_sdram_size(void);
 /*
 * Miscellaneous configurable options
 */
-#define CONFIG_SYS_LOAD_ADDR	0x2000000	/* default load address */

 /*
 * For booting Linux, the board info and command line data
--- a/include/configs/P2041RDB.h
+++ b/include/configs/P2041RDB.h
@@ -460,7 +460,6 @@ unsigned long get_board_sys_clk(unsigned long dummy);
 /*
 * Miscellaneous configurable options
 */
-#define CONFIG_SYS_LOAD_ADDR	0x2000000	/* default load address */

 /*
 * For booting Linux, the board info and command line data
--- a/include/configs/SBx81LIFKW.h
+++ b/include/configs/SBx81LIFKW.h
@@ -89,6 +89,4 @@
 #define CONFIG_PHY_BASE_ADR	0x01
 #endif /* CONFIG_CMD_NET */

-#define CONFIG_SYS_LOAD_ADDR  0x1000000      /* default location for tftp and bootm */
-
 #endif /* _CONFIG_SBX81LIFKW_H */
--- a/include/configs/SBx81LIFXCAT.h
+++ b/include/configs/SBx81LIFXCAT.h
@@ -89,6 +89,4 @@
 #define CONFIG_PHY_BASE_ADR	0x01
 #endif /* CONFIG_CMD_NET */

-#define CONFIG_SYS_LOAD_ADDR  0x1000000      /* default location for tftp and bootm */
-
 #endif /* _CONFIG_SBX81LIFXCAT_H */
--- a/include/configs/T102xRDB.h
+++ b/include/configs/T102xRDB.h
@@ -592,7 +592,6 @@ unsigned long get_board_sys_clk(void);
 /*
 * Miscellaneous configurable options
 */
-#define CONFIG_SYS_LOAD_ADDR	0x2000000	/* default load address */

 /*
 * For booting Linux, the board info and command line data
--- a/include/configs/T104xRDB.h
+++ b/include/configs/T104xRDB.h
@@ -652,7 +652,6 @@ $(SRCTREE)/board/freescale/t104xrdb/t1042d4_sd_rcw.cfg
 /*
 * Miscellaneous configurable options
 */
-#define CONFIG_SYS_LOAD_ADDR	0x2000000	/* default load address */

 /*
 * For booting Linux, the board info and command line data
--- a/include/configs/T208xQDS.h
+++ b/include/configs/T208xQDS.h
@@ -588,7 +588,6 @@ unsigned long get_board_sys_clk(void);
 /*
 * Miscellaneous configurable options
 */
-#define CONFIG_SYS_LOAD_ADDR	0x2000000 /* default load address */

 /*
 * For booting Linux, the board info and command line data
--- a/include/configs/T208xRDB.h
+++ b/include/configs/T208xRDB.h
@@ -537,7 +537,6 @@ unsigned long get_board_sys_clk(void);
 /*
 * Miscellaneous configurable options
 */
-#define CONFIG_SYS_LOAD_ADDR	0x2000000 /* default load address */

 /*
 * For booting Linux, the board info and command line data
--- a/include/configs/T4240RDB.h
+++ b/include/configs/T4240RDB.h
@@ -208,7 +208,6 @@
 /*
 * Miscellaneous configurable options
 */
-#define CONFIG_SYS_LOAD_ADDR	0x2000000	/* default load address */

 /*
 * For booting Linux, the board info and command line data
--- a/include/configs/UCP1020.h
+++ b/include/configs/UCP1020.h
@@ -377,7 +377,6 @@
 /*
 * Miscellaneous configurable options
 */
-#define CONFIG_SYS_LOAD_ADDR	0x2000000	/* default load address */
 #define CONFIG_SYS_HZ		1000	/* decrementer freq: 1ms tick */

 /*
--- a/include/configs/adp-ae3xx.h
+++ b/include/configs/adp-ae3xx.h
@@ -104,14 +104,6 @@
 #define CONFIG_SYS_INIT_SP_ADDR		(CONFIG_SYS_SDRAM_BASE + 0xA0000 - \
 					GENERATED_GBL_DATA_SIZE)

-/*
- * Load address and memory test area should agree with
- * arch/nds32/config.mk. Be careful not to overwrite U-Boot itself.
- */
-#define CONFIG_SYS_LOAD_ADDR		0x300000
-
-/* memtest works on 63 MB in DRAM */
-
 /*
 * Static memory controller configuration
 */
--- a/include/configs/adp-ag101p.h
+++ b/include/configs/adp-ag101p.h
@@ -216,14 +216,6 @@
 					GENERATED_GBL_DATA_SIZE)
 #endif /* CONFIG_MEM_REMAP */

-/*
- * Load address and memory test area should agree with
- * arch/nds32/config.mk. Be careful not to overwrite U-Boot itself.
- */
-#define CONFIG_SYS_LOAD_ADDR		0x300000
-
-/* memtest works on 63 MB in DRAM */
-
 /*
 * Static memory controller configuration
 */
--- a/include/configs/amcore.h
+++ b/include/configs/amcore.h
@@ -28,10 +28,6 @@
 		"erase 0xfff00000 0xffffffff; "			\
 		"cp.b 0x20000 0xfff00000 ${filesize}\0"

-/* undef to save memory	*/
-
-#define CONFIG_SYS_LOAD_ADDR		0x20000	/* default load address */
-
 #define CONFIG_SYS_HZ			1000

 #define CONFIG_SYS_CLK			45000000
--- a/include/configs/ap121.h
+++ b/include/configs/ap121.h
@@ -16,7 +16,6 @@
 #define CONFIG_SYS_BOOTPARAMS_LEN       0x20000

 #define CONFIG_SYS_SDRAM_BASE           0x80000000
-#define CONFIG_SYS_LOAD_ADDR            0x81000000

 #define CONFIG_SYS_INIT_RAM_ADDR        0xbd000000
 #define CONFIG_SYS_INIT_RAM_SIZE        0x8000
--- a/include/configs/ap143.h
+++ b/include/configs/ap143.h
@@ -16,7 +16,6 @@
 #define CONFIG_SYS_BOOTPARAMS_LEN       0x20000

 #define CONFIG_SYS_SDRAM_BASE           0x80000000
-#define CONFIG_SYS_LOAD_ADDR            0x81000000

 #define CONFIG_SYS_INIT_RAM_ADDR        0xbd000000
 #define CONFIG_SYS_INIT_RAM_SIZE        0x2000
--- a/include/configs/ap152.h
+++ b/include/configs/ap152.h
@@ -16,7 +16,6 @@
 #define CONFIG_SYS_BOOTPARAMS_LEN       0x20000

 #define CONFIG_SYS_SDRAM_BASE           0x80000000
-#define CONFIG_SYS_LOAD_ADDR            0x81000000

 #define CONFIG_SYS_INIT_RAM_ADDR        0xbd000000
 #define CONFIG_SYS_INIT_RAM_SIZE        0x2000
--- a/include/configs/apalis-imx8.h
+++ b/include/configs/apalis-imx8.h
@@ -70,7 +70,6 @@
 		"${blkcnt}; fi\0"

 /* Link Definitions */
-#define CONFIG_SYS_LOAD_ADDR			0x80280000

 #define CONFIG_SYS_INIT_SP_ADDR		0x80200000

--- a/include/configs/apalis-imx8x.h
+++ b/include/configs/apalis-imx8x.h
@@ -97,7 +97,6 @@
 	"vidargs=video=imxdpufb5:off video=imxdpufb6:off video=imxdpufb7:off\0"

 /* Link Definitions */
-#define CONFIG_SYS_LOAD_ADDR			0x89000000

 #define CONFIG_SYS_INIT_SP_ADDR		0x80200000

--- a/include/configs/apalis_imx6.h
+++ b/include/configs/apalis_imx6.h
@@ -71,7 +71,6 @@
 #define CONFIG_NETMASK			255.255.255.0
 #undef CONFIG_SERVERIP
 #define CONFIG_SERVERIP			192.168.10.1
-#define CONFIG_SYS_LOAD_ADDR			0x12000000

 #ifndef CONFIG_SPL_BUILD
 #define BOOT_TARGET_DEVICES(func) \
--- a/include/configs/armadillo-800eva.h
+++ b/include/configs/armadillo-800eva.h
@@ -44,8 +44,6 @@

 #define CONFIG_SYS_SDRAM_BASE		(ARMADILLO_800EVA_SDRAM_BASE)
 #define CONFIG_SYS_SDRAM_SIZE		(ARMADILLO_800EVA_SDRAM_SIZE)
-#define CONFIG_SYS_LOAD_ADDR		(CONFIG_SYS_SDRAM_BASE + \
-					 64 * 1024 * 1024)

 #define CONFIG_SYS_MONITOR_BASE		0x00000000
 #define CONFIG_SYS_MONITOR_LEN		(256 * 1024)
--- a/include/configs/astro_mcf5373l.h
+++ b/include/configs/astro_mcf5373l.h
@@ -154,9 +154,6 @@
 #endif
 #endif

-/* default RAM address for user programs */
-#define CONFIG_SYS_LOAD_ADDR	0x20000
-
 #define CONFIG_FPGA_COUNT	1
 #define CONFIG_SYS_FPGA_PROG_FEEDBACK
 #define CONFIG_SYS_FPGA_WAIT		1000
--- a/include/configs/at91sam9260ek.h
+++ b/include/configs/at91sam9260ek.h
@@ -106,8 +106,6 @@
 #define CONFIG_SYS_USB_OHCI_SLOT_NAME		"at91sam9260"
 #define CONFIG_SYS_USB_OHCI_MAX_ROOT_PORTS	2

-#define CONFIG_SYS_LOAD_ADDR			0x22000000	/* load address */
-
 #ifdef CONFIG_SYS_USE_DATAFLASH_CS0

 /* bootstrap + u-boot + env + linux in dataflash on CS0 */
--- a/include/configs/at91sam9261ek.h
+++ b/include/configs/at91sam9261ek.h
@@ -93,8 +93,6 @@
 #endif
 #define CONFIG_SYS_USB_OHCI_MAX_ROOT_PORTS	2

-#define CONFIG_SYS_LOAD_ADDR			0x22000000	/* load address */
-
 #ifdef CONFIG_SYS_USE_DATAFLASH_CS0

 /* bootstrap + u-boot + env + linux in dataflash on CS0 */
--- a/include/configs/at91sam9263ek.h
+++ b/include/configs/at91sam9263ek.h
@@ -209,8 +209,6 @@
 #define CONFIG_SYS_USB_OHCI_SLOT_NAME		"at91sam9263"
 #define CONFIG_SYS_USB_OHCI_MAX_ROOT_PORTS	2

-#define CONFIG_SYS_LOAD_ADDR			0x22000000	/* load address */
-
 #ifdef CONFIG_SYS_USE_DATAFLASH

 /* bootstrap + u-boot + env + linux in dataflash on CS0 */
--- a/include/configs/at91sam9m10g45ek.h
+++ b/include/configs/at91sam9m10g45ek.h
@@ -67,8 +67,6 @@
 #define CONFIG_RESET_PHY_R
 #define CONFIG_AT91_WANTS_COMMON_PHY

-#define CONFIG_SYS_LOAD_ADDR		0x22000000	/* load address */
-
 #ifdef CONFIG_NAND_BOOT
 /* bootstrap + u-boot + env in nandflash */

--- a/include/configs/at91sam9n12ek.h
+++ b/include/configs/at91sam9n12ek.h
@@ -61,9 +61,6 @@
 	"bootargs_nand=rootfstype=ubifs ubi.mtd=7 root=ubi0:rootfs rw\0"\
 	"bootargs_mmc=root=/dev/mmcblk0p2 rw rootfstype=ext4 rootwait\0"

-/* Ethernet */
-#define CONFIG_SYS_LOAD_ADDR		0x22000000 /* load address */
-
 /* USB host */
 #ifdef CONFIG_CMD_USB
 #define CONFIG_USB_ATMEL
--- a/include/configs/at91sam9rlek.h
+++ b/include/configs/at91sam9rlek.h
@@ -62,10 +62,6 @@

 /* Ethernet - not present */

-/* USB - not supported */
-
-#define CONFIG_SYS_LOAD_ADDR			0x22000000	/* load address */
-
 #ifdef CONFIG_SYS_USE_DATAFLASH

 /* bootstrap + u-boot + env + linux in dataflash on CS0 */
--- a/include/configs/at91sam9x5ek.h
+++ b/include/configs/at91sam9x5ek.h
@@ -65,8 +65,6 @@
 #endif
 #endif

-#define CONFIG_SYS_LOAD_ADDR		0x22000000	/* load address */
-
 #ifdef CONFIG_NAND_BOOT
 /* bootstrap + u-boot + env + linux in nandflash */
 #define CONFIG_BOOTCOMMAND	"nand read " \
--- a/include/configs/ax25-ae350.h
+++ b/include/configs/ax25-ae350.h
@@ -79,20 +79,6 @@
 #define CONFIG_SYS_INIT_SP_ADDR		(CONFIG_SYS_SDRAM_BASE + 0x1000000 - \
 					GENERATED_GBL_DATA_SIZE)

-/*
- * Load address and memory test area should agree with
- * arch/riscv/config.mk. Be careful not to overwrite U-Boot itself.
- */
-#define CONFIG_SYS_LOAD_ADDR		0x100000	/* SDRAM */
-
-/*
- * memtest works on 512 MB in DRAM
- */
-
-/*
- * FLASH and environment organization
- */
-
 /* use CFI framework */

 #define CONFIG_SYS_FLASH_CFI_WIDTH	FLASH_CFI_16BIT
--- a/include/configs/axs10x.h
+++ b/include/configs/axs10x.h
@@ -29,7 +29,6 @@

 #define CONFIG_SYS_MALLOC_LEN		SZ_2M
 #define CONFIG_SYS_BOOTM_LEN		SZ_128M
-#define CONFIG_SYS_LOAD_ADDR		0x82000000

 /*
 * UART configuration
--- a/include/configs/bcm_ns3.h
+++ b/include/configs/bcm_ns3.h
@@ -16,7 +16,6 @@
 #define PHYS_SDRAM_1			V2M_BASE

 #define CONFIG_SYS_SDRAM_BASE		PHYS_SDRAM_1
-#define CONFIG_SYS_LOAD_ADDR		(PHYS_SDRAM_1 + 0x80000)

 /*
 * Initial SP before reloaction is placed at end of first DRAM bank,
--- a/include/configs/bcmstb.h
+++ b/include/configs/bcmstb.h
@@ -88,7 +88,6 @@ extern phys_addr_t prior_stage_fdt_address;
 #define CONFIG_SYS_INIT_SP_ADDR		(CONFIG_SYS_INIT_RAM_ADDR +	\
 					 CONFIG_SYS_INIT_RAM_SIZE -	\
 					 GENERATED_GBL_DATA_SIZE)
-#define CONFIG_SYS_LOAD_ADDR		0x2000000

 /*
 * CONFIG_SYS_LOAD_ADDR - 1 MiB.
--- a/include/configs/bg0900.h
+++ b/include/configs/bg0900.h
@@ -20,7 +20,6 @@
 /* Boot Linux */
 #define CONFIG_BOOTFILE		"uImage"
 #define CONFIG_BOOTCOMMAND	"bootm"
-#define CONFIG_SYS_LOAD_ADDR		0x42000000

 /* Extra Environment */
 #define CONFIG_EXTRA_ENV_SETTINGS					\
--- a/include/configs/bk4r1.h
+++ b/include/configs/bk4r1.h
@@ -80,7 +80,6 @@
 #define FSL_QSPI_FLASH_NUM		2
 #define CONFIG_SYS_FSL_QSPI_LE
 #endif
-#define CONFIG_SYS_LOAD_ADDR	0x82000000

 /* We boot from the gfxRAM area of the OCRAM. */
 #define CONFIG_BOARD_SIZE_LIMIT		520192
--- a/include/configs/bmips_bcm3380.h
+++ b/include/configs/bmips_bcm3380.h
@@ -15,7 +15,6 @@
 #define CONFIG_SYS_SDRAM_BASE		0x80000000

 /* U-Boot */
-#define CONFIG_SYS_LOAD_ADDR		CONFIG_SYS_SDRAM_BASE + SZ_1M

 #if defined(CONFIG_BMIPS_BOOT_RAM)
 #define CONFIG_SKIP_LOWLEVEL_INIT
--- a/include/configs/bmips_bcm6318.h
+++ b/include/configs/bmips_bcm6318.h
@@ -24,7 +24,6 @@
 #endif /* CONFIG_USB_OHCI_HCD */

 /* U-Boot */
-#define CONFIG_SYS_LOAD_ADDR		CONFIG_SYS_SDRAM_BASE + SZ_1M

 #if defined(CONFIG_BMIPS_BOOT_RAM)
 #define CONFIG_SKIP_LOWLEVEL_INIT
--- a/include/configs/bmips_bcm63268.h
+++ b/include/configs/bmips_bcm63268.h
@@ -24,7 +24,6 @@
 #endif /* CONFIG_USB_OHCI_HCD */

 /* U-Boot */
-#define CONFIG_SYS_LOAD_ADDR		CONFIG_SYS_SDRAM_BASE + SZ_1M

 #if defined(CONFIG_BMIPS_BOOT_RAM)
 #define CONFIG_SKIP_LOWLEVEL_INIT
--- a/include/configs/bmips_bcm6328.h
+++ b/include/configs/bmips_bcm6328.h
@@ -24,7 +24,6 @@
 #endif /* CONFIG_USB_OHCI_HCD */

 /* U-Boot */
-#define CONFIG_SYS_LOAD_ADDR		CONFIG_SYS_SDRAM_BASE + SZ_1M

 #if defined(CONFIG_BMIPS_BOOT_RAM)
 #define CONFIG_SKIP_LOWLEVEL_INIT
--- a/include/configs/bmips_bcm6338.h
+++ b/include/configs/bmips_bcm6338.h
@@ -15,7 +15,6 @@
 #define CONFIG_SYS_SDRAM_BASE		0x80000000

 /* U-Boot */
-#define CONFIG_SYS_LOAD_ADDR		CONFIG_SYS_SDRAM_BASE + SZ_1M

 #if defined(CONFIG_BMIPS_BOOT_RAM)
 #define CONFIG_SKIP_LOWLEVEL_INIT
--- a/include/configs/bmips_bcm6348.h
+++ b/include/configs/bmips_bcm6348.h
@@ -22,7 +22,6 @@
 #endif /* CONFIG_USB_OHCI_HCD */

 /* U-Boot */
-#define CONFIG_SYS_LOAD_ADDR		CONFIG_SYS_SDRAM_BASE + SZ_1M

 #if defined(CONFIG_BMIPS_BOOT_RAM)
 #define CONFIG_SKIP_LOWLEVEL_INIT
--- a/include/configs/bmips_bcm6358.h
+++ b/include/configs/bmips_bcm6358.h
@@ -24,7 +24,6 @@
 #endif /* CONFIG_USB_OHCI_HCD */

 /* U-Boot */
-#define CONFIG_SYS_LOAD_ADDR		CONFIG_SYS_SDRAM_BASE + SZ_1M

 #if defined(CONFIG_BMIPS_BOOT_RAM)
 #define CONFIG_SKIP_LOWLEVEL_INIT
--- a/include/configs/bmips_bcm6362.h
+++ b/include/configs/bmips_bcm6362.h
@@ -24,7 +24,6 @@
 #endif /* CONFIG_USB_OHCI_HCD */

 /* U-Boot */
-#define CONFIG_SYS_LOAD_ADDR		CONFIG_SYS_SDRAM_BASE + SZ_1M

 #if defined(CONFIG_BMIPS_BOOT_RAM)
 #define CONFIG_SKIP_LOWLEVEL_INIT
--- a/include/configs/bmips_bcm6368.h
+++ b/include/configs/bmips_bcm6368.h
@@ -24,7 +24,6 @@
 #endif /* CONFIG_USB_OHCI_HCD */

 /* U-Boot */
-#define CONFIG_SYS_LOAD_ADDR		CONFIG_SYS_SDRAM_BASE + SZ_1M

 #if defined(CONFIG_BMIPS_BOOT_RAM)
 #define CONFIG_SKIP_LOWLEVEL_INIT
--- a/include/configs/bmips_bcm6838.h
+++ b/include/configs/bmips_bcm6838.h
@@ -15,7 +15,6 @@
 #define CONFIG_SYS_SDRAM_BASE		0x80000000

 /* U-Boot */
-#define CONFIG_SYS_LOAD_ADDR		CONFIG_SYS_SDRAM_BASE + SZ_1M

 #if defined(CONFIG_BMIPS_BOOT_RAM)
 #define CONFIG_SKIP_LOWLEVEL_INIT
--- a/include/configs/boston.h
+++ b/include/configs/boston.h
@@ -33,8 +33,6 @@

 #define CONFIG_SYS_MONITOR_BASE		CONFIG_SYS_TEXT_BASE

-#define CONFIG_SYS_LOAD_ADDR		(CONFIG_SYS_SDRAM_BASE + 0x08000000)
-
 #define CONFIG_SYS_MALLOC_LEN		(256 * 1024)

 /*
--- a/include/configs/broadcom_bcm963158.h
+++ b/include/configs/broadcom_bcm963158.h
@@ -26,7 +26,6 @@

 /* U-Boot */
 #define CONFIG_SYS_INIT_SP_ADDR		(CONFIG_SYS_TEXT_BASE + SZ_16M)
-#define CONFIG_SYS_LOAD_ADDR		CONFIG_SYS_TEXT_BASE

 #define CONFIG_SKIP_LOWLEVEL_INIT

--- a/include/configs/broadcom_bcm968360bg.h
+++ b/include/configs/broadcom_bcm968360bg.h
@@ -25,7 +25,6 @@

 /* U-Boot */
 #define CONFIG_SYS_INIT_SP_ADDR		(CONFIG_SYS_TEXT_BASE + SZ_16M)
-#define CONFIG_SYS_LOAD_ADDR		CONFIG_SYS_TEXT_BASE

 #define CONFIG_SKIP_LOWLEVEL_INIT

--- a/include/configs/broadcom_bcm968580xref.h
+++ b/include/configs/broadcom_bcm968580xref.h
@@ -25,7 +25,6 @@

 /* U-Boot */
 #define CONFIG_SYS_INIT_SP_ADDR		(CONFIG_SYS_TEXT_BASE + SZ_16M)
-#define CONFIG_SYS_LOAD_ADDR		CONFIG_SYS_TEXT_BASE

 #define CONFIG_SKIP_LOWLEVEL_INIT

--- a/include/configs/brppt2.h
+++ b/include/configs/brppt2.h
@@ -20,8 +20,6 @@
 #define CONFIG_BOARD_POSTCLK_INIT
 #define CONFIG_MXC_GPT_HCLK

-#define CONFIG_SYS_LOAD_ADDR			0x10700000
-
 /* MMC */
 #define CONFIG_FSL_USDHC

--- a/include/configs/bur_am335x_common.h
+++ b/include/configs/bur_am335x_common.h
@@ -48,11 +48,6 @@
 #if !defined(CONFIG_SPL_BUILD) && !defined(CONFIG_NOR_BOOT)
 #define CONFIG_SKIP_LOWLEVEL_INIT
 #endif /* !CONFIG_SPL_BUILD, ... */
-/*
- * Our DDR memory always starts at 0x80000000 and U-Boot shall have
- * relocated itself to higher in memory by the time this value is used.
- */
-#define CONFIG_SYS_LOAD_ADDR		0x80000000
 /*
 * ----------------------------------------------------------------------------
 * DDR information.  We say (for simplicity) that we have 1 bank,
--- a/include/configs/capricorn-common.h
+++ b/include/configs/capricorn-common.h
@@ -127,7 +127,6 @@
 	"reset;"

 /* Default location for tftp and bootm */
-#define CONFIG_SYS_LOAD_ADDR			0x80280000
 #define CONFIG_SYS_INIT_SP_ADDR		0x80200000

 /* On CCP board, USDHC1 is for eMMC */
--- a/include/configs/cgtqmx8.h
+++ b/include/configs/cgtqmx8.h
@@ -147,7 +147,6 @@
 	   "else booti ${loadaddr} - ${fdt_addr}; fi"

 /* Link Definitions */
-#define CONFIG_SYS_LOAD_ADDR			0x80280000

 #define CONFIG_SYS_INIT_SP_ADDR		0x80200000

--- a/include/configs/ci20.h
+++ b/include/configs/ci20.h
@@ -23,7 +23,6 @@

 #define CONFIG_SYS_SDRAM_BASE		0x80000000 /* cached (KSEG0) address */
 #define CONFIG_SYS_INIT_SP_OFFSET	0x400000
-#define CONFIG_SYS_LOAD_ADDR		0x81000000

 #define CONFIG_SYS_MONITOR_BASE		CONFIG_SYS_TEXT_BASE

--- a/include/configs/cobra5272.h
+++ b/include/configs/cobra5272.h
@@ -135,9 +135,6 @@ enter a valid image address in flash */

 #endif

-#define CONFIG_SYS_LOAD_ADDR		0x20000		/*Defines default RAM address
-from which user programs will be started */
-
 /*---*/

 /*
--- a/include/configs/colibri-imx8x.h
+++ b/include/configs/colibri-imx8x.h
@@ -102,7 +102,6 @@
 	"vidargs=video=imxdpufb5:off video=imxdpufb6:off video=imxdpufb7:off\0"

 /* Link Definitions */
-#define CONFIG_SYS_LOAD_ADDR			0x80280000

 #define CONFIG_SYS_INIT_SP_ADDR		0x80200000

--- a/include/configs/colibri_imx6.h
+++ b/include/configs/colibri_imx6.h
@@ -60,8 +60,6 @@
 #undef CONFIG_SERVERIP
 #define CONFIG_SERVERIP			192.168.10.1

-#define CONFIG_SYS_LOAD_ADDR			0x12000000
-
 #ifndef CONFIG_SPL_BUILD
 #define BOOT_TARGET_DEVICES(func) \
 	func(MMC, mmc, 1) \
--- a/include/configs/colibri_pxa270.h
+++ b/include/configs/colibri_pxa270.h
@@ -82,7 +82,6 @@
 #define	CONFIG_SYS_DRAM_BASE		0xa0000000	/* CS0 */
 #define	CONFIG_SYS_DRAM_SIZE		0x04000000	/* 64 MB DRAM */

-#define	CONFIG_SYS_LOAD_ADDR		PHYS_SDRAM_1
 #define CONFIG_SYS_SDRAM_BASE		PHYS_SDRAM_1
 #define	CONFIG_SYS_INIT_SP_ADDR		0x5c010000

--- a/include/configs/colibri_vf.h
+++ b/include/configs/colibri_vf.h
@@ -38,7 +38,6 @@
 #define CONFIG_NETMASK		255.255.255.0
 #define CONFIG_SERVERIP		192.168.10.1

-#define CONFIG_SYS_LOAD_ADDR			0x80008000
 #define CONFIG_FDTADDR			0x84000000

 /* We boot from the gfxRAM area of the OCRAM. */
--- a/include/configs/corenet_ds.h
+++ b/include/configs/corenet_ds.h
@@ -468,7 +468,6 @@
 /*
 * Miscellaneous configurable options
 */
-#define CONFIG_SYS_LOAD_ADDR	0x2000000	/* default load address */

 /*
 * For booting Linux, the board info and command line data
--- a/include/configs/corvus.h
+++ b/include/configs/corvus.h
@@ -83,8 +83,6 @@
 /* DFU class support */
 #define DFU_MANIFEST_POLL_TIMEOUT	25000

-#define CONFIG_SYS_LOAD_ADDR	ATMEL_BASE_CS6
-
 /* bootstrap + u-boot + env in nandflash */

 #define CONFIG_BOOTCOMMAND						\
--- a/include/configs/da850evm.h
+++ b/include/configs/da850evm.h
@@ -173,7 +173,6 @@
 #define CONFIG_BOOTFILE		"uImage" /* Boot file name */
 #define CONFIG_SYS_CBSIZE	1024 /* Console I/O Buffer Size	*/
 #define CONFIG_SYS_BARGSIZE	CONFIG_SYS_CBSIZE /* Boot Args Buffer Size */
-#define CONFIG_SYS_LOAD_ADDR	(PHYS_SDRAM_1 + 0x700000)

 /*
 * Linux Information
--- a/include/configs/devkit3250.h
+++ b/include/configs/devkit3250.h
@@ -25,8 +25,6 @@
 #define CONFIG_SYS_SDRAM_BASE		EMC_DYCS0_BASE
 #define CONFIG_SYS_SDRAM_SIZE		SZ_64M

-#define CONFIG_SYS_LOAD_ADDR		(CONFIG_SYS_SDRAM_BASE + SZ_32K)
-
 #define CONFIG_SYS_INIT_SP_ADDR		(CONFIG_SYS_SDRAM_BASE + SZ_4K \
 					 - GENERATED_GBL_DATA_SIZE)

--- a/include/configs/dh_imx6.h
+++ b/include/configs/dh_imx6.h
@@ -81,8 +81,6 @@
 #define CONFIG_HW_WATCHDOG
 #endif

-#define CONFIG_SYS_LOAD_ADDR			0x12000000
-
 #ifndef CONFIG_SPL_BUILD
 #define CONFIG_EXTRA_ENV_SETTINGS	\
 	"console=ttymxc0,115200\0"	\
--- a/include/configs/dragonboard410c.h
+++ b/include/configs/dragonboard410c.h
@@ -20,7 +20,6 @@
 #define PHYS_SDRAM_1_SIZE		SZ_1G
 #define CONFIG_SYS_SDRAM_BASE		PHYS_SDRAM_1
 #define CONFIG_SYS_INIT_SP_ADDR		(CONFIG_SYS_SDRAM_BASE + 0x7fff0)
-#define CONFIG_SYS_LOAD_ADDR		(CONFIG_SYS_SDRAM_BASE + 0x80000)
 #define CONFIG_SYS_BOOTM_LEN		SZ_64M

 /* UART */
--- a/include/configs/dragonboard820c.h
+++ b/include/configs/dragonboard820c.h
@@ -21,7 +21,6 @@

 #define CONFIG_SYS_SDRAM_BASE		PHYS_SDRAM_1
 #define CONFIG_SYS_INIT_SP_ADDR		(CONFIG_SYS_SDRAM_BASE + 0x7fff0)
-#define CONFIG_SYS_LOAD_ADDR		(CONFIG_SYS_SDRAM_BASE + 0x80000)
 #define CONFIG_SYS_BOOTM_LEN		SZ_64M

 /* Generic Timer Definitions */
--- a/include/configs/durian.h
+++ b/include/configs/durian.h
@@ -13,8 +13,6 @@
 #define PHYS_SDRAM_1_SIZE		0x7B000000
 #define CONFIG_SYS_SDRAM_BASE   PHYS_SDRAM_1

-#define CONFIG_SYS_LOAD_ADDR	(CONFIG_SYS_SDRAM_BASE + 0x10000000)
-
 /* Size of Malloc Pool */
 #define CONFIG_SYS_MALLOC_LEN	(1 * 1024 * 1024  + CONFIG_ENV_SIZE)

--- a/include/configs/ea-lpc3250devkitv2.h
+++ b/include/configs/ea-lpc3250devkitv2.h
@@ -26,7 +26,6 @@
 /*
 * cmd
 */
-#define CONFIG_SYS_LOAD_ADDR 0x80100000
 #define CONFIG_SYS_INIT_SP_ADDR (CONFIG_SYS_SDRAM_BASE + SZ_4K - GENERATED_GBL_DATA_SIZE)

 /*
--- a/include/configs/eb_cpu5282.h
+++ b/include/configs/eb_cpu5282.h
@@ -47,8 +47,6 @@
 #define	CONFIG_SYS_CBSIZE	1024	/* Console I/O Buffer Size	*/
 #define CONFIG_SYS_BARGSIZE	CONFIG_SYS_CBSIZE

-#define CONFIG_SYS_LOAD_ADDR		0x20000
-
 /*#define CONFIG_SYS_DRAM_TEST		1 */
 #undef CONFIG_SYS_DRAM_TEST

--- a/include/configs/edison.h
+++ b/include/configs/edison.h
@@ -15,7 +15,6 @@
 #define CONFIG_SYS_BARGSIZE	CONFIG_SYS_CBSIZE

 /* Memory */
-#define CONFIG_SYS_LOAD_ADDR			0x100000
 #define CONFIG_PHYSMEM

 #define CONFIG_SYS_STACK_SIZE			(32 * 1024)
--- a/include/configs/edminiv2.h
+++ b/include/configs/edminiv2.h
@@ -169,7 +169,6 @@
 * Other required minimal configurations
 */

-#define CONFIG_SYS_LOAD_ADDR		0x00800000
 #define CONFIG_SYS_RESET_ADDRESS	0xffff0000

 /* Enable command line editing */
--- a/include/configs/emsdp.h
+++ b/include/configs/emsdp.h
@@ -16,7 +16,6 @@
 #define CONFIG_SYS_INIT_SP_ADDR		(CONFIG_SYS_SDRAM_BASE + SZ_1M)

 #define CONFIG_SYS_MALLOC_LEN		SZ_64K
-#define CONFIG_SYS_LOAD_ADDR		CONFIG_SYS_SDRAM_BASE

 /*
 * Environment
--- a/include/configs/ethernut5.h
+++ b/include/configs/ethernut5.h
@@ -34,7 +34,6 @@
 /* 128MB SDRAM in 1 bank */
 #define CONFIG_SYS_SDRAM_BASE		0x20000000
 #define CONFIG_SYS_SDRAM_SIZE		(128 << 20)
-#define CONFIG_SYS_LOAD_ADDR		CONFIG_SYS_SDRAM_BASE
 #define CONFIG_SYS_MALLOC_LEN		(CONFIG_ENV_SIZE + (1 << 20))

 /* 512kB on-chip NOR flash */
--- a/include/configs/evb_ast2500.h
+++ b/include/configs/evb_ast2500.h
@@ -13,7 +13,4 @@

 #define CONFIG_SYS_UBOOT_BASE		CONFIG_SYS_TEXT_BASE

-/* Memory Info */
-#define CONFIG_SYS_LOAD_ADDR		0x83000000
-
 #endif	/* __CONFIG_H */
--- a/include/configs/evb_ast2600.h
+++ b/include/configs/evb_ast2600.h
@@ -10,7 +10,4 @@

 #define CONFIG_SYS_UBOOT_BASE		CONFIG_SYS_TEXT_BASE

-/* Memory Info */
-#define CONFIG_SYS_LOAD_ADDR		0x83000000
-
 #endif	/* __CONFIG_H */
--- a/include/configs/exynos5-common.h
+++ b/include/configs/exynos5-common.h
@@ -45,12 +45,6 @@
 /* MMC SPL */
 #define COPY_BL2_FNPTR_ADDR	0x02020030

-/* specific .lds file */
-
-/* Boot Argument Buffer Size */
-/* memtest works on */
-#define CONFIG_SYS_LOAD_ADDR		(CONFIG_SYS_SDRAM_BASE + 0x3E00000)
-
 #define CONFIG_RD_LVL

 #define PHYS_SDRAM_1		CONFIG_SYS_SDRAM_BASE
--- a/include/configs/exynos7420-common.h
+++ b/include/configs/exynos7420-common.h
@@ -42,8 +42,6 @@

 /* select serial console configuration */

-#define CONFIG_SYS_LOAD_ADDR		(CONFIG_SYS_SDRAM_BASE + 0x3E00000)
-
 #define PHYS_SDRAM_1		CONFIG_SYS_SDRAM_BASE
 #define PHYS_SDRAM_1_SIZE	SDRAM_BANK_SIZE
 #define PHYS_SDRAM_2		(CONFIG_SYS_SDRAM_BASE + SDRAM_BANK_SIZE)
--- a/include/configs/flea3.h
+++ b/include/configs/flea3.h
@@ -49,8 +49,6 @@

 #define CONFIG_NET_RETRY_COUNT	100

-#define CONFIG_SYS_LOAD_ADDR		0x80800000	/* loadaddr env var */
-
 /*
 * Ethernet on SOC (FEC)
 */
--- a/include/configs/gardena-smart-gateway-at91sam.h
+++ b/include/configs/gardena-smart-gateway-at91sam.h
@@ -45,8 +45,6 @@
 #define CONFIG_SYS_NAND_ENABLE_PIN	AT91_PIN_PD4
 #define CONFIG_SYS_NAND_READY_PIN	AT91_PIN_PD5

-#define CONFIG_SYS_LOAD_ADDR		0x22000000	/* load address */
-
 /* SPL */
 #define CONFIG_SPL_MAX_SIZE		0x7000
 #define CONFIG_SPL_STACK		0x308000
--- a/include/configs/gardena-smart-gateway-mt7688.h
+++ b/include/configs/gardena-smart-gateway-mt7688.h
@@ -12,8 +12,6 @@
 /* RAM */
 #define CONFIG_SYS_SDRAM_BASE		0x80000000

-#define CONFIG_SYS_LOAD_ADDR		CONFIG_SYS_SDRAM_BASE + 0x100000
-
 #define CONFIG_SYS_INIT_SP_OFFSET	0x400000

 /* SPL */
--- a/include/configs/gazerbeam.h
+++ b/include/configs/gazerbeam.h
@@ -60,7 +60,6 @@
 /*
 * Miscellaneous configurable options
 */
-#define CONFIG_SYS_LOAD_ADDR		0x2000000 /* default load address */
 #define CONFIG_SYS_HZ		1000	/* decrementer freq: 1ms ticks */

 #define CONFIG_SYS_CBSIZE	1024 /* Console I/O Buffer Size */
--- a/include/configs/ge_bx50v3.h
+++ b/include/configs/ge_bx50v3.h
@@ -114,10 +114,6 @@
 #define CONFIG_BOOTCOMMAND MMCBOOTCOMMAND
 #endif

-
-/* Miscellaneous configurable options */
-#define CONFIG_SYS_LOAD_ADDR	0x12000000
-
 /* Physical Memory Map */
 #define PHYS_SDRAM                     MMDC0_ARB_BASE_ADDR

--- a/Show More
+++ b/Show More