global: Convert CONFIG_LOADADDR to CONFIG_SYS_LOADADDR

- In most of the codebase, we reference CONFIG_SYS_LOAD_ADDR and not
  CONFIG_LOADADDR.
- Generally, CONFIG_SYS_LOADADDR is set to CONFIG_LOADADDR and then as
  noted, we use CONFIG_SYS_LOADADDR.

Signed-off-by: Tom Rini <trini@konsulko.com>

diff --git a/include/configs/10m50_devboard.h b/include/configs/10m50_devboard.h
index 3ffc744..d8ed227 100644 (file)
--- a/include/configs/10m50_devboard.h
+++ b/include/configs/10m50_devboard.h
@@ -61,6 +61,5 @@
  * MISC
  */
 #define CONFIG_SYS_LOAD_ADDR           0xcc000000      /* Half of RAM */
-#define CONFIG_LOADADDR                        CONFIG_SYS_LOAD_ADDR
 
 #endif /* __CONFIG_H */

diff --git a/include/configs/3c120_devboard.h b/include/configs/3c120_devboard.h
index 3f065ff..b9a17ad 100644 (file)
--- a/include/configs/3c120_devboard.h
+++ b/include/configs/3c120_devboard.h
@@ -61,6 +61,5 @@
  * MISC
  */
 #define CONFIG_SYS_LOAD_ADDR           0xd4000000      /* Half of RAM */
-#define CONFIG_LOADADDR                        CONFIG_SYS_LOAD_ADDR
 
 #endif /* __CONFIG_H */

diff --git a/include/configs/MPC8349EMDS.h b/include/configs/MPC8349EMDS.h
index 9612c70..6286d5e 100644 (file)
--- a/include/configs/MPC8349EMDS.h
+++ b/include/configs/MPC8349EMDS.h
@@ -274,8 +274,6 @@
 #define CONFIG_ROOTPATH                "/nfsroot/rootfs"
 #define CONFIG_BOOTFILE                "uImage"
 
-#define CONFIG_LOADADDR        800000  /* default location for tftp and bootm */
-
 #define        CONFIG_EXTRA_ENV_SETTINGS                                       \
        "netdev=eth0\0"                                                 \
        "hostname=mpc8349emds\0"                                        \

diff --git a/include/configs/MPC8349EMDS_SDRAM.h b/include/configs/MPC8349EMDS_SDRAM.h
index b3887f5..45d2208 100644 (file)
--- a/include/configs/MPC8349EMDS_SDRAM.h
+++ b/include/configs/MPC8349EMDS_SDRAM.h
@@ -331,8 +331,6 @@
 #define CONFIG_ROOTPATH                "/nfsroot/rootfs"
 #define CONFIG_BOOTFILE                "uImage"
 
-#define CONFIG_LOADADDR        800000  /* default location for tftp and bootm */
-
 #define        CONFIG_EXTRA_ENV_SETTINGS                                       \
        "netdev=eth0\0"                                                 \
        "hostname=mpc8349emds\0"                                        \

diff --git a/include/configs/MPC837XERDB.h b/include/configs/MPC837XERDB.h
index 569c66e..e299437 100644 (file)
--- a/include/configs/MPC837XERDB.h
+++ b/include/configs/MPC837XERDB.h
@@ -347,9 +347,6 @@
 #define CONFIG_UBOOTPATH       "u-boot.bin"
 #define CONFIG_FDTFILE         "mpc8379_rdb.dtb"
 
-                               /* default location for tftp and bootm */
-#define CONFIG_LOADADDR                800000
-
 #define CONFIG_EXTRA_ENV_SETTINGS \
        "netdev=" CONFIG_NETDEV "\0"                            \
        "uboot=" CONFIG_UBOOTPATH "\0"                                  \

diff --git a/include/configs/MPC8540ADS.h b/include/configs/MPC8540ADS.h
index 1e620ac..82527da 100644 (file)
--- a/include/configs/MPC8540ADS.h
+++ b/include/configs/MPC8540ADS.h
@@ -316,8 +316,6 @@
 #define CONFIG_GATEWAYIP 192.168.1.1
 #define CONFIG_NETMASK   255.255.255.0
 
-#define CONFIG_LOADADDR  200000        /* default location for tftp and bootm */
-
 #define        CONFIG_EXTRA_ENV_SETTINGS                                       \
    "netdev=eth0\0"                                                      \
    "consoledev=ttyS0\0"                                                 \

diff --git a/include/configs/MPC8548CDS.h b/include/configs/MPC8548CDS.h
index d7e6b6c..289283a 100644 (file)
--- a/include/configs/MPC8548CDS.h
+++ b/include/configs/MPC8548CDS.h
@@ -442,8 +442,6 @@ extern unsigned long get_clock_freq(void);
 #define CONFIG_GATEWAYIP 192.168.1.1
 #define CONFIG_NETMASK  255.255.255.0
 
-#define CONFIG_LOADADDR        1000000 /*default location for tftp and bootm*/
-
 #define        CONFIG_EXTRA_ENV_SETTINGS               \
        "hwconfig=fsl_ddr:ecc=off\0"            \
        "netdev=eth0\0"                         \

diff --git a/include/configs/MPC8560ADS.h b/include/configs/MPC8560ADS.h
index 27a17bb..f1828a2 100644 (file)
--- a/include/configs/MPC8560ADS.h
+++ b/include/configs/MPC8560ADS.h
@@ -305,8 +305,6 @@
 #define CONFIG_GATEWAYIP 192.168.1.1
 #define CONFIG_NETMASK   255.255.255.0
 
-#define CONFIG_LOADADDR  200000        /* default location for tftp and bootm */
-
 #define        CONFIG_EXTRA_ENV_SETTINGS                                       \
        "netdev=eth0\0"                                                 \
        "consoledev=ttyCPM\0"                                           \

diff --git a/include/configs/P1010RDB.h b/include/configs/P1010RDB.h
index 9528961..ea3c39e 100644 (file)
--- a/include/configs/P1010RDB.h
+++ b/include/configs/P1010RDB.h
@@ -639,9 +639,6 @@ extern unsigned long get_sdram_size(void);
 #define CONFIG_BOOTFILE                "uImage"
 #define CONFIG_UBOOTPATH       u-boot.bin/* U-Boot image on TFTP server */
 
-/* default location for tftp and bootm */
-#define CONFIG_LOADADDR                1000000
-
 #define        CONFIG_EXTRA_ENV_SETTINGS                               \
        "hwconfig=" __stringify(CONFIG_DEF_HWCONFIG)  "\0"      \
        "netdev=eth0\0"                                         \

diff --git a/include/configs/P2041RDB.h b/include/configs/P2041RDB.h
index e4e4390..52b9cf5 100644 (file)
--- a/include/configs/P2041RDB.h
+++ b/include/configs/P2041RDB.h
@@ -481,9 +481,6 @@ unsigned long get_board_sys_clk(unsigned long dummy);
 #define CONFIG_BOOTFILE                "uImage"
 #define CONFIG_UBOOTPATH       u-boot.bin
 
-/* default location for tftp and bootm */
-#define CONFIG_LOADADDR                1000000
-
 #define __USB_PHY_TYPE utmi
 
 #define        CONFIG_EXTRA_ENV_SETTINGS                               \

diff --git a/include/configs/T102xRDB.h b/include/configs/T102xRDB.h
index d21e402..4fb2253 100644 (file)
--- a/include/configs/T102xRDB.h
+++ b/include/configs/T102xRDB.h
@@ -612,7 +612,6 @@ unsigned long get_board_sys_clk(void);
 #define CONFIG_ROOTPATH                "/opt/nfsroot"
 #define CONFIG_BOOTFILE                "uImage"
 #define CONFIG_UBOOTPATH       u-boot.bin /* U-Boot image on TFTP server */
-#define CONFIG_LOADADDR                1000000 /* default location for tftp, bootm */
 #define __USB_PHY_TYPE         utmi
 
 #ifdef CONFIG_ARCH_T1024

diff --git a/include/configs/T104xRDB.h b/include/configs/T104xRDB.h
index 8ef13fc..d1b4deb 100644 (file)
--- a/include/configs/T104xRDB.h
+++ b/include/configs/T104xRDB.h
@@ -677,9 +677,6 @@ $(SRCTREE)/board/freescale/t104xrdb/t1042d4_sd_rcw.cfg
 #define CONFIG_BOOTFILE                "uImage"
 #define CONFIG_UBOOTPATH       "u-boot.bin"    /* U-Boot image on TFTP server*/
 
-/* default location for tftp and bootm */
-#define CONFIG_LOADADDR                1000000
-
 #define __USB_PHY_TYPE utmi
 #define RAMDISKFILE    "t104xrdb/ramdisk.uboot"
 

diff --git a/include/configs/T208xQDS.h b/include/configs/T208xQDS.h
index 74f372a..edf2ed8 100644 (file)
--- a/include/configs/T208xQDS.h
+++ b/include/configs/T208xQDS.h
@@ -610,8 +610,6 @@ unsigned long get_board_sys_clk(void);
 #define CONFIG_BOOTFILE         "uImage"
 #define CONFIG_UBOOTPATH "u-boot.bin"  /* U-Boot image on TFTP server */
 
-/* default location for tftp and bootm */
-#define CONFIG_LOADADDR                1000000
 #define __USB_PHY_TYPE         utmi
 
 #define        CONFIG_EXTRA_ENV_SETTINGS                               \

diff --git a/include/configs/T208xRDB.h b/include/configs/T208xRDB.h
index 6821cd3..9664115 100644 (file)
--- a/include/configs/T208xRDB.h
+++ b/include/configs/T208xRDB.h
@@ -559,8 +559,6 @@ unsigned long get_board_sys_clk(void);
 #define CONFIG_BOOTFILE         "uImage"
 #define CONFIG_UBOOTPATH "u-boot.bin"  /* U-Boot image on TFTP server */
 
-/* default location for tftp and bootm */
-#define CONFIG_LOADADDR                1000000
 #define __USB_PHY_TYPE         utmi
 
 #define        CONFIG_EXTRA_ENV_SETTINGS                               \

diff --git a/include/configs/T4240RDB.h b/include/configs/T4240RDB.h
index d5bf813..0486264 100644 (file)
--- a/include/configs/T4240RDB.h
+++ b/include/configs/T4240RDB.h
@@ -229,9 +229,6 @@
 #define CONFIG_BOOTFILE                "uImage"
 #define CONFIG_UBOOTPATH       "u-boot.bin"    /* U-Boot image on TFTP server*/
 
-/* default location for tftp and bootm */
-#define CONFIG_LOADADDR                1000000
-
 #define HVBOOT                                 \
        "setenv bootargs config-addr=0x60000000; "      \
        "bootm 0x01000000 - 0x00f00000"

diff --git a/include/configs/UCP1020.h b/include/configs/UCP1020.h
index 5108356..9231676 100644 (file)
--- a/include/configs/UCP1020.h
+++ b/include/configs/UCP1020.h
@@ -430,9 +430,6 @@
 #define CONFIG_BOOTFILE                "uImage"
 #define CONFIG_UBOOTPATH       u-boot.bin /* U-Boot image on TFTP server */
 
-/* default location for tftp and bootm */
-#define CONFIG_LOADADDR                1000000
-
 #if defined(CONFIG_DONGLE)
 
 #define        CONFIG_EXTRA_ENV_SETTINGS                                       \

diff --git a/include/configs/apalis-imx8.h b/include/configs/apalis-imx8.h
index b04a03f..d5bf92a 100644 (file)
--- a/include/configs/apalis-imx8.h
+++ b/include/configs/apalis-imx8.h
@@ -70,9 +70,7 @@
                "${blkcnt}; fi\0"
 
 /* Link Definitions */
-#define CONFIG_LOADADDR                        0x80280000
-
-#define CONFIG_SYS_LOAD_ADDR           CONFIG_LOADADDR
+#define CONFIG_SYS_LOAD_ADDR                   0x80280000
 
 #define CONFIG_SYS_INIT_SP_ADDR                0x80200000
 

diff --git a/include/configs/apalis-imx8x.h b/include/configs/apalis-imx8x.h
index 2ad4ca3..483cf09 100644 (file)
--- a/include/configs/apalis-imx8x.h
+++ b/include/configs/apalis-imx8x.h
@@ -97,9 +97,7 @@
        "vidargs=video=imxdpufb5:off video=imxdpufb6:off video=imxdpufb7:off\0"
 
 /* Link Definitions */
-#define CONFIG_LOADADDR                        0x89000000
-
-#define CONFIG_SYS_LOAD_ADDR           CONFIG_LOADADDR
+#define CONFIG_SYS_LOAD_ADDR                   0x89000000
 
 #define CONFIG_SYS_INIT_SP_ADDR                0x80200000
 

diff --git a/include/configs/apalis_imx6.h b/include/configs/apalis_imx6.h
index d1d7455..b736d19 100644 (file)
--- a/include/configs/apalis_imx6.h
+++ b/include/configs/apalis_imx6.h
@@ -71,8 +71,7 @@
 #define CONFIG_NETMASK                 255.255.255.0
 #undef CONFIG_SERVERIP
 #define CONFIG_SERVERIP                        192.168.10.1
-
-#define CONFIG_LOADADDR                        0x12000000
+#define CONFIG_SYS_LOAD_ADDR                   0x12000000
 
 #ifndef CONFIG_SPL_BUILD
 #define BOOT_TARGET_DEVICES(func) \
@@ -154,7 +153,7 @@
                "load ${interface} ${drive}:1 ${loadaddr} flash_blk.img && " \
                "source ${loadaddr}\0" \
        "splashpos=m,m\0" \
-       "splashimage=" __stringify(CONFIG_LOADADDR) "\0" \
+       "splashimage=" __stringify(CONFIG_SYS_LOAD_ADDR) "\0" \
        "vidargs=mxc_hdmi.only_cea=1 fbmem=32M\0"
 
 /* Miscellaneous configurable options */
@@ -163,8 +162,6 @@
 #undef CONFIG_SYS_MAXARGS
 #define CONFIG_SYS_MAXARGS             48
 
-#define CONFIG_SYS_LOAD_ADDR           CONFIG_LOADADDR
-
 /* Physical Memory Map */
 #define PHYS_SDRAM                     MMDC0_ARB_BASE_ADDR
 

diff --git a/include/configs/axs10x.h b/include/configs/axs10x.h
index 0c5a3af..96a1c64 100644 (file)
--- a/include/configs/axs10x.h
+++ b/include/configs/axs10x.h
@@ -63,7 +63,6 @@
  * Environment configuration
  */
 #define CONFIG_BOOTFILE                        "uImage"
-#define CONFIG_LOADADDR                        CONFIG_SYS_LOAD_ADDR
 
 /*
  * Console configuration

diff --git a/include/configs/bg0900.h b/include/configs/bg0900.h
index b541236..aacc70c 100644 (file)
--- a/include/configs/bg0900.h
+++ b/include/configs/bg0900.h
@@ -20,8 +20,7 @@
 /* Boot Linux */
 #define CONFIG_BOOTFILE                "uImage"
 #define CONFIG_BOOTCOMMAND     "bootm"
-#define CONFIG_LOADADDR                0x42000000
-#define CONFIG_SYS_LOAD_ADDR   CONFIG_LOADADDR
+#define CONFIG_SYS_LOAD_ADDR           0x42000000
 
 /* Extra Environment */
 #define CONFIG_EXTRA_ENV_SETTINGS                                      \

diff --git a/include/configs/bk4r1.h b/include/configs/bk4r1.h
index 2abbe7b..a3ec719 100644 (file)
--- a/include/configs/bk4r1.h
+++ b/include/configs/bk4r1.h
@@ -80,8 +80,7 @@
 #define FSL_QSPI_FLASH_NUM             2
 #define CONFIG_SYS_FSL_QSPI_LE
 #endif
-
-#define CONFIG_LOADADDR        0x82000000
+#define CONFIG_SYS_LOAD_ADDR   0x82000000
 
 /* We boot from the gfxRAM area of the OCRAM. */
 #define CONFIG_BOARD_SIZE_LIMIT                520192
@@ -230,10 +229,6 @@
                        "source to NAND\0" \
        "active_workset=1\0"
 
-/* Miscellaneous configurable options */
-
-#define CONFIG_SYS_LOAD_ADDR           CONFIG_LOADADDR
-
 /* Physical memory map */
 #define PHYS_SDRAM                     (0x80000000)
 #define PHYS_SDRAM_SIZE                (SZ_512M)

diff --git a/include/configs/brppt2.h b/include/configs/brppt2.h
index 333d3f4..e30b365 100644 (file)
--- a/include/configs/brppt2.h
+++ b/include/configs/brppt2.h
@@ -20,8 +20,7 @@
 #define CONFIG_BOARD_POSTCLK_INIT
 #define CONFIG_MXC_GPT_HCLK
 
-#define CONFIG_LOADADDR                        0x10700000
-#define CONFIG_SYS_LOAD_ADDR           CONFIG_LOADADDR
+#define CONFIG_SYS_LOAD_ADDR                   0x10700000
 
 /* MMC */
 #define CONFIG_FSL_USDHC

diff --git a/include/configs/capricorn-common.h b/include/configs/capricorn-common.h
index 37d4bee..bca995e 100644 (file)
--- a/include/configs/capricorn-common.h
+++ b/include/configs/capricorn-common.h
@@ -127,8 +127,7 @@
        "reset;"
 
 /* Default location for tftp and bootm */
-#define CONFIG_LOADADDR                        0x80280000
-#define CONFIG_SYS_LOAD_ADDR           CONFIG_LOADADDR
+#define CONFIG_SYS_LOAD_ADDR                   0x80280000
 #define CONFIG_SYS_INIT_SP_ADDR                0x80200000
 
 /* On CCP board, USDHC1 is for eMMC */

diff --git a/include/configs/cgtqmx8.h b/include/configs/cgtqmx8.h
index 15c5027..585834c 100644 (file)
--- a/include/configs/cgtqmx8.h
+++ b/include/configs/cgtqmx8.h
@@ -147,9 +147,7 @@
           "else booti ${loadaddr} - ${fdt_addr}; fi"
 
 /* Link Definitions */
-#define CONFIG_LOADADDR                        0x80280000
-
-#define CONFIG_SYS_LOAD_ADDR           CONFIG_LOADADDR
+#define CONFIG_SYS_LOAD_ADDR                   0x80280000
 
 #define CONFIG_SYS_INIT_SP_ADDR                0x80200000
 

diff --git a/include/configs/ci20.h b/include/configs/ci20.h
index 6e46d29..8f9e9f8 100644 (file)
--- a/include/configs/ci20.h
+++ b/include/configs/ci20.h
@@ -24,7 +24,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_LOADADDR                        CONFIG_SYS_LOAD_ADDR
 
 #define CONFIG_SYS_MONITOR_BASE                CONFIG_SYS_TEXT_BASE
 

diff --git a/include/configs/cl-som-imx7.h b/include/configs/cl-som-imx7.h
index 51d18c5..e8495b3 100644 (file)
--- a/include/configs/cl-som-imx7.h
+++ b/include/configs/cl-som-imx7.h
@@ -97,7 +97,6 @@
        "echo eMMC boot attempt ...; run emmcbootscript; run emmcboot; " \
        "echo USB boot attempt ...; run usbbootscript; "
 
-#define CONFIG_SYS_LOAD_ADDR           CONFIG_LOADADDR
 #define CONFIG_SYS_HZ                  1000
 
 /* Physical Memory Map */

diff --git a/include/configs/cm_fx6.h b/include/configs/cm_fx6.h
index 41ec15f..e569b90 100644 (file)
--- a/include/configs/cm_fx6.h
+++ b/include/configs/cm_fx6.h
@@ -43,9 +43,9 @@
        "initrd_high=0xffffffff\0" \
        "fdt_addr_r=0x18000000\0" \
        "ramdisk_addr_r=0x13000000\0" \
-       "kernel_addr_r=" __stringify(CONFIG_LOADADDR) "\0" \
-       "pxefile_addr_r=" __stringify(CONFIG_LOADADDR) "\0" \
-       "scriptaddr=" __stringify(CONFIG_LOADADDR) "\0" \
+       "kernel_addr_r=" __stringify(CONFIG_SYS_LOAD_ADDR) "\0" \
+       "pxefile_addr_r=" __stringify(CONFIG_SYS_LOAD_ADDR) "\0" \
+       "scriptaddr=" __stringify(CONFIG_SYS_LOAD_ADDR) "\0" \
        "fdtfile=undefined\0" \
        "stdin=serial,usbkbd\0" \
        "stdout=serial,vidconsole\0" \

diff --git a/include/configs/colibri-imx6ull.h b/include/configs/colibri-imx6ull.h
index 3799b4a..4351bfe 100644 (file)
--- a/include/configs/colibri-imx6ull.h
+++ b/include/configs/colibri-imx6ull.h
@@ -103,11 +103,10 @@
                "fatload ${interface} 0:1 ${loadaddr} " \
                "${board}/flash_blk.img && source ${loadaddr}\0" \
        "splashpos=m,m\0" \
-       "splashimage=" __stringify(CONFIG_LOADADDR) "\0" \
+       "splashimage=" __stringify(CONFIG_SYS_LOAD_ADDR) "\0" \
        "videomode=video=ctfb:x:640,y:480,depth:18,pclk:39722,le:48,ri:16,up:33,lo:10,hs:96,vs:2,sync:0,vmode:0\0" \
        "vidargs=video=mxsfb:640x480M-16@60"
 
-#define CONFIG_SYS_LOAD_ADDR           CONFIG_LOADADDR
 
 /* Physical Memory Map */
 #define PHYS_SDRAM                     MMDC0_ARB_BASE_ADDR

diff --git a/include/configs/colibri-imx8x.h b/include/configs/colibri-imx8x.h
index cb22b3c..27edb90 100644 (file)
--- a/include/configs/colibri-imx8x.h
+++ b/include/configs/colibri-imx8x.h
@@ -102,9 +102,7 @@
        "vidargs=video=imxdpufb5:off video=imxdpufb6:off video=imxdpufb7:off\0"
 
 /* Link Definitions */
-#define CONFIG_LOADADDR                        0x80280000
-
-#define CONFIG_SYS_LOAD_ADDR           CONFIG_LOADADDR
+#define CONFIG_SYS_LOAD_ADDR                   0x80280000
 
 #define CONFIG_SYS_INIT_SP_ADDR                0x80200000
 

diff --git a/include/configs/colibri_imx6.h b/include/configs/colibri_imx6.h
index 2b2ee95..ca3709b 100644 (file)
--- a/include/configs/colibri_imx6.h
+++ b/include/configs/colibri_imx6.h
@@ -60,7 +60,7 @@
 #undef CONFIG_SERVERIP
 #define CONFIG_SERVERIP                        192.168.10.1
 
-#define CONFIG_LOADADDR                        0x12000000
+#define CONFIG_SYS_LOAD_ADDR                   0x12000000
 
 #ifndef CONFIG_SPL_BUILD
 #define BOOT_TARGET_DEVICES(func) \
@@ -134,7 +134,7 @@
                "load ${interface} ${drive}:1 ${loadaddr} flash_blk.img && " \
                "source ${loadaddr}\0" \
        "splashpos=m,m\0" \
-       "splashimage=" __stringify(CONFIG_LOADADDR) "\0" \
+       "splashimage=" __stringify(CONFIG_SYS_LOAD_ADDR) "\0" \
        "vidargs=fbmem=8M\0"
 
 /* Miscellaneous configurable options */
@@ -143,8 +143,6 @@
 #undef CONFIG_SYS_MAXARGS
 #define CONFIG_SYS_MAXARGS             48
 
-#define CONFIG_SYS_LOAD_ADDR           CONFIG_LOADADDR
-
 /* Physical Memory Map */
 #define PHYS_SDRAM                     MMDC0_ARB_BASE_ADDR
 

diff --git a/include/configs/colibri_imx7.h b/include/configs/colibri_imx7.h
index 5a7919e..4d9de07 100644 (file)
--- a/include/configs/colibri_imx7.h
+++ b/include/configs/colibri_imx7.h
@@ -167,13 +167,12 @@
                "fatload ${interface} 0:1 ${loadaddr} " \
                "${board}/flash_blk.img && source ${loadaddr}\0" \
        "splashpos=m,m\0" \
-       "splashimage=" __stringify(CONFIG_LOADADDR) "\0" \
+       "splashimage=" __stringify(CONFIG_SYS_LOAD_ADDR) "\0" \
        "videomode=video=ctfb:x:640,y:480,depth:18,pclk:39722,le:48,ri:16,up:33,lo:10,hs:96,vs:2,sync:0,vmode:0\0" \
        "updlevel=2\0"
 
 /* Miscellaneous configurable options */
 
-#define CONFIG_SYS_LOAD_ADDR           CONFIG_LOADADDR
 #define CONFIG_SYS_HZ                  1000
 
 /* Physical Memory Map */

diff --git a/include/configs/colibri_vf.h b/include/configs/colibri_vf.h
index 5bd440f..96fef9f 100644 (file)
--- a/include/configs/colibri_vf.h
+++ b/include/configs/colibri_vf.h
@@ -38,7 +38,7 @@
 #define CONFIG_NETMASK         255.255.255.0
 #define CONFIG_SERVERIP                192.168.10.1
 
-#define CONFIG_LOADADDR                        0x80008000
+#define CONFIG_SYS_LOAD_ADDR                   0x80008000
 #define CONFIG_FDTADDR                 0x84000000
 
 /* We boot from the gfxRAM area of the OCRAM. */
@@ -117,7 +117,6 @@
 #define CONFIG_SYS_CBSIZE              1024    /* Console I/O Buffer Size */
 #define CONFIG_SYS_BARGSIZE            CONFIG_SYS_CBSIZE
 
-#define CONFIG_SYS_LOAD_ADDR           CONFIG_LOADADDR
 #define CONFIG_SYS_HZ                  1000
 
 /* Physical memory map */

diff --git a/include/configs/controlcenterdc.h b/include/configs/controlcenterdc.h
index d03527f..58d83e5 100644 (file)
--- a/include/configs/controlcenterdc.h
+++ b/include/configs/controlcenterdc.h
@@ -20,8 +20,6 @@
  * U-Boot into it.
  */
 
-#define CONFIG_LOADADDR                1000000
-
 /*
  * SATA/SCSI/AHCI configuration
  */

diff --git a/include/configs/corenet_ds.h b/include/configs/corenet_ds.h
index e920529..1919002 100644 (file)
--- a/include/configs/corenet_ds.h
+++ b/include/configs/corenet_ds.h
@@ -489,9 +489,6 @@
 #define CONFIG_BOOTFILE                "uImage"
 #define CONFIG_UBOOTPATH       u-boot.bin      /* U-Boot image on TFTP server */
 
-/* default location for tftp and bootm */
-#define CONFIG_LOADADDR                1000000
-
 #ifdef CONFIG_TARGET_P4080DS
 #define __USB_PHY_TYPE ulpi
 #else

diff --git a/include/configs/dart_6ul.h b/include/configs/dart_6ul.h
index 12ae1b7..79b0cd7 100644 (file)
--- a/include/configs/dart_6ul.h
+++ b/include/configs/dart_6ul.h
@@ -50,7 +50,6 @@
 
 /* Miscellaneous configurable options */
 
-#define CONFIG_SYS_LOAD_ADDR           CONFIG_LOADADDR
 #define CONFIG_SYS_HZ                  1000
 
 /* Physical Memory Map */

diff --git a/include/configs/devkit3250.h b/include/configs/devkit3250.h
index 9cfeb5a..ab1fbc8 100644 (file)
--- a/include/configs/devkit3250.h
+++ b/include/configs/devkit3250.h
@@ -126,7 +126,6 @@
 #define CONFIG_SETUP_MEMORY_TAGS
 
 #define CONFIG_BOOTFILE                        "uImage"
-#define CONFIG_LOADADDR                        0x80008000
 
 /*
  * SPL specific defines

diff --git a/include/configs/dh_imx6.h b/include/configs/dh_imx6.h
index d9be1c3..8e4296b 100644 (file)
--- a/include/configs/dh_imx6.h
+++ b/include/configs/dh_imx6.h
@@ -81,8 +81,7 @@
 #define CONFIG_HW_WATCHDOG
 #endif
 
-#define CONFIG_LOADADDR                        0x12000000
-#define CONFIG_SYS_LOAD_ADDR           CONFIG_LOADADDR
+#define CONFIG_SYS_LOAD_ADDR                   0x12000000
 
 #ifndef CONFIG_SPL_BUILD
 #define CONFIG_EXTRA_ENV_SETTINGS      \

diff --git a/include/configs/ds414.h b/include/configs/ds414.h
index 8a78ab3..3b74aa9 100644 (file)
--- a/include/configs/ds414.h
+++ b/include/configs/ds414.h
@@ -64,7 +64,6 @@
 #define CONFIG_SPL_BOOTROM_SAVE                (CONFIG_SPL_STACK + 4)
 
 /* Default Environment */
-#define CONFIG_LOADADDR                0x80000
 #define CONFIG_BOOTCOMMAND                                     \
        "sf probe; "                                            \
        "sf read ${loadaddr} 0xd0000 0x2d0000; "                \

diff --git a/include/configs/el6x_common.h b/include/configs/el6x_common.h
index 3b535e5..220da5b 100644 (file)
--- a/include/configs/el6x_common.h
+++ b/include/configs/el6x_common.h
@@ -47,9 +47,9 @@
        "fdt_addr_r=0x18000000\0" \
        "fdt_addr=0x18000000\0" \
        "findfdt=setenv fdtfile " CONFIG_DEFAULT_FDT_FILE "\0"                  \
-       "kernel_addr_r=" __stringify(CONFIG_LOADADDR) "\0" \
-       "scriptaddr=" __stringify(CONFIG_LOADADDR) "\0" \
-       "pxefile_addr_r=" __stringify(CONFIG_LOADADDR) "\0" \
+       "kernel_addr_r=" __stringify(CONFIG_SYS_LOAD_ADDR) "\0" \
+       "scriptaddr=" __stringify(CONFIG_SYS_LOAD_ADDR) "\0" \
+       "pxefile_addr_r=" __stringify(CONFIG_SYS_LOAD_ADDR) "\0" \
        BOOTENV
 
 #define BOOT_TARGET_DEVICES(func) \

diff --git a/include/configs/emsdp.h b/include/configs/emsdp.h
index a872d48..8685f6c 100644 (file)
--- a/include/configs/emsdp.h
+++ b/include/configs/emsdp.h
@@ -22,7 +22,6 @@
  * Environment
  */
 #define CONFIG_BOOTFILE                        "app.bin"
-#define CONFIG_LOADADDR                        CONFIG_SYS_LOAD_ADDR
 
 #define CONFIG_EXTRA_ENV_SETTINGS \
        "upgrade_image=u-boot.bin\0" \

diff --git a/include/configs/ethernut5.h b/include/configs/ethernut5.h
index e650cf6..dc01de7 100644 (file)
--- a/include/configs/ethernut5.h
+++ b/include/configs/ethernut5.h
@@ -35,7 +35,6 @@
 #define CONFIG_SYS_SDRAM_BASE          0x20000000
 #define CONFIG_SYS_SDRAM_SIZE          (128 << 20)
 #define CONFIG_SYS_LOAD_ADDR           CONFIG_SYS_SDRAM_BASE
-#define CONFIG_LOADADDR                        CONFIG_SYS_LOAD_ADDR
 #define CONFIG_SYS_MALLOC_LEN          (CONFIG_ENV_SIZE + (1 << 20))
 
 /* 512kB on-chip NOR flash */

diff --git a/include/configs/flea3.h b/include/configs/flea3.h
index b4b34fd..6caeff2 100644 (file)
--- a/include/configs/flea3.h
+++ b/include/configs/flea3.h
@@ -49,8 +49,7 @@
 
 #define CONFIG_NET_RETRY_COUNT 100
 
-
-#define CONFIG_LOADADDR                0x80800000      /* loadaddr env var */
+#define CONFIG_SYS_LOAD_ADDR           0x80800000      /* loadaddr env var */
 
 /*
  * Ethernet on SOC (FEC)
@@ -69,8 +68,6 @@
 /* Print Buffer Size */
 #define CONFIG_SYS_MAXARGS     32      /* max number of command args */
 
-#define CONFIG_SYS_LOAD_ADDR           CONFIG_LOADADDR
-
 /*
  * Physical Memory Map
  */

diff --git a/include/configs/gazerbeam.h b/include/configs/gazerbeam.h
index f031f15..4bf0c60 100644 (file)
--- a/include/configs/gazerbeam.h
+++ b/include/configs/gazerbeam.h
@@ -84,8 +84,6 @@
 #define CONFIG_HAS_ETH0
 #define CONFIG_HAS_ETH1
 
-#define CONFIG_LOADADDR        800000  /* default location for tftp and bootm */
-
 /* TODO: Turn into string option and migrate to Kconfig */
 #define CONFIG_HOSTNAME                "gazerbeam"
 #define CONFIG_ROOTPATH                "/opt/nfsroot"

diff --git a/include/configs/ge_bx50v3.h b/include/configs/ge_bx50v3.h
index 8570b92..ba0432f 100644 (file)
--- a/include/configs/ge_bx50v3.h
+++ b/include/configs/ge_bx50v3.h
@@ -33,10 +33,6 @@
 #define CONFIG_LBA48
 #endif
 
-/* Serial Flash */
-
-#define CONFIG_LOADADDR        0x12000000
-
 #ifdef CONFIG_CMD_NFS
 #define NETWORKBOOT \
         "setnetworkboot=" \
@@ -120,8 +116,7 @@
 
 
 /* Miscellaneous configurable options */
-
-#define CONFIG_SYS_LOAD_ADDR           CONFIG_LOADADDR
+#define CONFIG_SYS_LOAD_ADDR   0x12000000
 
 /* Physical Memory Map */
 #define PHYS_SDRAM                     MMDC0_ARB_BASE_ADDR

diff --git a/include/configs/hsdk-4xd.h b/include/configs/hsdk-4xd.h
index 5678f0a..8eb3bb9 100644 (file)
--- a/include/configs/hsdk-4xd.h
+++ b/include/configs/hsdk-4xd.h
@@ -107,7 +107,6 @@ setenv core_iccm_3 0x6; setenv core_dccm_3 0x6;\0"
  * Environment configuration
  */
 #define CONFIG_BOOTFILE                        "uImage"
-#define CONFIG_LOADADDR                        CONFIG_SYS_LOAD_ADDR
 
 /* Cli configuration */
 #define CONFIG_SYS_CBSIZE              SZ_2K

diff --git a/include/configs/hsdk.h b/include/configs/hsdk.h
index 3cc3b8c..06577df 100644 (file)
--- a/include/configs/hsdk.h
+++ b/include/configs/hsdk.h
@@ -106,7 +106,6 @@ setenv core_iccm_3 0x6; setenv core_dccm_3 0x6;\0"
  * Environment configuration
  */
 #define CONFIG_BOOTFILE                        "uImage"
-#define CONFIG_LOADADDR                        CONFIG_SYS_LOAD_ADDR
 
 /* Cli configuration */
 #define CONFIG_SYS_CBSIZE              SZ_2K

diff --git a/include/configs/ids8313.h b/include/configs/ids8313.h
index d4f4910..be37b50 100644 (file)
--- a/include/configs/ids8313.h
+++ b/include/configs/ids8313.h
@@ -224,7 +224,6 @@
 #define CONFIG_BOOTFILE                "ids8313/uImage"
 #define CONFIG_UBOOTPATH               "ids8313/u-boot.bin"
 #define CONFIG_FDTFILE                 "ids8313/ids8313.dtb"
-#define CONFIG_LOADADDR                0x400000
 #define CONFIG_ENV_FLAGS_LIST_STATIC "ethaddr:mo,eth1addr:mo"
 
 /* Initial Memory map for Linux*/

diff --git a/include/configs/imx27lite-common.h b/include/configs/imx27lite-common.h
index 8c5c061..c63e2d5 100644 (file)
--- a/include/configs/imx27lite-common.h
+++ b/include/configs/imx27lite-common.h
@@ -120,8 +120,7 @@
 /* Boot Argument Buffer Size */
 #define CONFIG_SYS_BARGSIZE    CONFIG_SYS_CBSIZE
 
-#define CONFIG_LOADADDR                0xa0800000      /* loadaddr env var */
-#define CONFIG_SYS_LOAD_ADDR           CONFIG_LOADADDR
+#define CONFIG_SYS_LOAD_ADDR           0xa0800000      /* loadaddr env var */
 
 #define        CONFIG_EXTRA_ENV_SETTINGS                                       \
        "netdev=eth0\0"                                                 \

diff --git a/include/configs/imx6-engicam.h b/include/configs/imx6-engicam.h
index bfe83b8..50ebc15 100644 (file)
--- a/include/configs/imx6-engicam.h
+++ b/include/configs/imx6-engicam.h
@@ -30,7 +30,7 @@
 #define CONFIG_EXTRA_ENV_SETTINGS \
        "script=boot.scr\0" \
        "splashpos=m,m\0" \
-       "splashimage=" __stringify(CONFIG_LOADADDR) "\0" \
+       "splashimage=" __stringify(CONFIG_SYS_LOAD_ADDR) "\0" \
        "image=uImage\0" \
        "fit_image=fit.itb\0" \
        "fdt_high=0xffffffff\0" \
@@ -103,7 +103,6 @@
 
 /* Miscellaneous configurable options */
 
-#define CONFIG_SYS_LOAD_ADDR           CONFIG_LOADADDR
 #define CONFIG_SYS_HZ                  1000
 
 #ifdef CONFIG_MX6UL

diff --git a/include/configs/imx6_logic.h b/include/configs/imx6_logic.h
index 6b992f9..cdca31e 100644 (file)
--- a/include/configs/imx6_logic.h
+++ b/include/configs/imx6_logic.h
@@ -36,7 +36,7 @@
        "bootm_size=0x10000000\0" \
        "fdt_addr_r=0x14000000\0" \
        "ramdisk_addr_r=0x14080000\0" \
-       "kernel_addr_r=" __stringify(CONFIG_LOADADDR) "\0" \
+       "kernel_addr_r=" __stringify(CONFIG_SYS_LOAD_ADDR) "\0" \
        "ramdisk_file=rootfs.cpio.uboot\0" \
        "boot_fdt=try\0" \
        "ip_dyn=yes\0" \

diff --git a/include/configs/imx6dl-mamoj.h b/include/configs/imx6dl-mamoj.h
index 4027f32..e5af32a 100644 (file)
--- a/include/configs/imx6dl-mamoj.h
+++ b/include/configs/imx6dl-mamoj.h
@@ -65,7 +65,6 @@
 
 /* Miscellaneous configurable options */
 
-#define CONFIG_SYS_LOAD_ADDR           CONFIG_LOADADDR
 #define CONFIG_SYS_HZ                  1000
 
 /* Physical Memory Map */

diff --git a/include/configs/imx7-cm.h b/include/configs/imx7-cm.h
index 4a3706d..a390bff 100644 (file)
--- a/include/configs/imx7-cm.h
+++ b/include/configs/imx7-cm.h
@@ -75,7 +75,6 @@
 
 #define CONFIG_BOOTCOMMAND "run boot${boot-mode}"
 
-#define CONFIG_SYS_LOAD_ADDR           CONFIG_LOADADDR
 #define CONFIG_SYS_HZ                          1000
 
 /* Physical Memory Map */

diff --git a/include/configs/imx8mm-cl-iot-gate.h b/include/configs/imx8mm-cl-iot-gate.h
index f5b3b67..c994d71 100644 (file)
--- a/include/configs/imx8mm-cl-iot-gate.h
+++ b/include/configs/imx8mm-cl-iot-gate.h
@@ -140,9 +140,7 @@
 #endif
 
 /* Link Definitions */
-#define CONFIG_LOADADDR                        0x40480000
-
-#define CONFIG_SYS_LOAD_ADDR           CONFIG_LOADADDR
+#define CONFIG_SYS_LOAD_ADDR                   0x40480000
 
 #define CONFIG_SYS_INIT_RAM_ADDR       0x40000000
 #define CONFIG_SYS_INIT_RAM_SIZE       0x80000

diff --git a/include/configs/imx8mm_beacon.h b/include/configs/imx8mm_beacon.h
index 13705f6..7423e28 100644 (file)
--- a/include/configs/imx8mm_beacon.h
+++ b/include/configs/imx8mm_beacon.h
@@ -93,9 +93,7 @@
           "fi;"
 
 /* Link Definitions */
-#define CONFIG_LOADADDR                        0x40480000
-
-#define CONFIG_SYS_LOAD_ADDR           CONFIG_LOADADDR
+#define CONFIG_SYS_LOAD_ADDR                   0x40480000
 
 #define CONFIG_SYS_INIT_RAM_ADDR        0x40000000
 #define CONFIG_SYS_INIT_RAM_SIZE        0x200000

diff --git a/include/configs/imx8mm_evk.h b/include/configs/imx8mm_evk.h
index 9cd0746..6aa7c2a 100644 (file)
--- a/include/configs/imx8mm_evk.h
+++ b/include/configs/imx8mm_evk.h
@@ -44,8 +44,8 @@
 /* Initial environment variables */
 #define CONFIG_EXTRA_ENV_SETTINGS              \
        BOOTENV \
-       "scriptaddr=" __stringify(CONFIG_LOADADDR) "\0" \
-       "kernel_addr_r=" __stringify(CONFIG_LOADADDR) "\0" \
+       "scriptaddr=" __stringify(CONFIG_SYS_LOAD_ADDR) "\0" \
+       "kernel_addr_r=" __stringify(CONFIG_SYS_LOAD_ADDR) "\0" \
        "image=Image\0" \
        "console=ttymxc1,115200\0" \
        "fdt_addr_r=0x43000000\0"                       \
@@ -57,9 +57,7 @@
        "mmcroot=" CONFIG_MMCROOT " rootwait rw\0" \
 
 /* Link Definitions */
-#define CONFIG_LOADADDR                        0x40480000
-
-#define CONFIG_SYS_LOAD_ADDR           CONFIG_LOADADDR
+#define CONFIG_SYS_LOAD_ADDR                   0x40480000
 
 #define CONFIG_SYS_INIT_RAM_ADDR        0x40000000
 #define CONFIG_SYS_INIT_RAM_SIZE        0x200000

diff --git a/include/configs/imx8mm_icore_mx8mm.h b/include/configs/imx8mm_icore_mx8mm.h
index 6d822fa..9d63b8c 100644 (file)
--- a/include/configs/imx8mm_icore_mx8mm.h
+++ b/include/configs/imx8mm_icore_mx8mm.h
@@ -56,8 +56,7 @@
        BOOTENV
 
 /* Link Definitions */
-#define CONFIG_LOADADDR                        0x40480000
-#define CONFIG_SYS_LOAD_ADDR           CONFIG_LOADADDR
+#define CONFIG_SYS_LOAD_ADDR                   0x40480000
 
 #define CONFIG_SYS_INIT_RAM_ADDR        0x40000000
 #define CONFIG_SYS_INIT_RAM_SIZE        SZ_2M

diff --git a/include/configs/imx8mm_venice.h b/include/configs/imx8mm_venice.h
index a0cc2c8..ed33071 100644 (file)
--- a/include/configs/imx8mm_venice.h
+++ b/include/configs/imx8mm_venice.h
@@ -37,8 +37,7 @@
        "scriptaddr=0x46000000\0"
 
 /* Link Definitions */
-#define CONFIG_LOADADDR                        0x40480000
-#define CONFIG_SYS_LOAD_ADDR           CONFIG_LOADADDR
+#define CONFIG_SYS_LOAD_ADDR                   0x40480000
 
 /* Enable Distro Boot */
 #ifndef CONFIG_SPL_BUILD

diff --git a/include/configs/imx8mn_beacon.h b/include/configs/imx8mn_beacon.h
index 9ce60fd..0975e78 100644 (file)
--- a/include/configs/imx8mn_beacon.h
+++ b/include/configs/imx8mn_beacon.h
@@ -108,9 +108,7 @@
           "else booti ${loadaddr} - ${fdt_addr}; fi"
 
 /* Link Definitions */
-#define CONFIG_LOADADDR                        0x40480000
-
-#define CONFIG_SYS_LOAD_ADDR           CONFIG_LOADADDR
+#define CONFIG_SYS_LOAD_ADDR                   0x40480000
 
 #define CONFIG_SYS_INIT_RAM_ADDR        0x40000000
 #define CONFIG_SYS_INIT_RAM_SIZE        0x200000

diff --git a/include/configs/imx8mn_evk.h b/include/configs/imx8mn_evk.h
index 42f9041..feb96b4 100644 (file)
--- a/include/configs/imx8mn_evk.h
+++ b/include/configs/imx8mn_evk.h
@@ -44,8 +44,8 @@
 #define CONFIG_EXTRA_ENV_SETTINGS              \
        "image=Image\0" \
        BOOTENV \
-       "scriptaddr=" __stringify(CONFIG_LOADADDR) "\0" \
-       "kernel_addr_r=" __stringify(CONFIG_LOADADDR) "\0" \
+       "scriptaddr=" __stringify(CONFIG_SYS_LOAD_ADDR) "\0" \
+       "kernel_addr_r=" __stringify(CONFIG_SYS_LOAD_ADDR) "\0" \
        "console=ttymxc1,115200\0" \
        "fdt_addr_r=0x43000000\0"                       \
        "boot_fit=no\0" \
@@ -56,9 +56,7 @@
        "mmcroot=" CONFIG_MMCROOT " rootwait rw\0" \
 
 /* Link Definitions */
-#define CONFIG_LOADADDR                        0x40480000
-
-#define CONFIG_SYS_LOAD_ADDR           CONFIG_LOADADDR
+#define CONFIG_SYS_LOAD_ADDR                   0x40480000
 
 #define CONFIG_SYS_INIT_RAM_ADDR        0x40000000
 #define CONFIG_SYS_INIT_RAM_SIZE        0x200000

diff --git a/include/configs/imx8mp_evk.h b/include/configs/imx8mp_evk.h
index da5cf3d..32c50cd 100644 (file)
--- a/include/configs/imx8mp_evk.h
+++ b/include/configs/imx8mp_evk.h
@@ -66,8 +66,8 @@
 /* Initial environment variables */
 #define CONFIG_EXTRA_ENV_SETTINGS              \
        BOOTENV \
-       "scriptaddr=" __stringify(CONFIG_LOADADDR) "\0" \
-       "kernel_addr_r=" __stringify(CONFIG_LOADADDR) "\0" \
+       "scriptaddr=" __stringify(CONFIG_SYS_LOAD_ADDR) "\0" \
+       "kernel_addr_r=" __stringify(CONFIG_SYS_LOAD_ADDR) "\0" \
        "image=Image\0" \
        "console=ttymxc1,115200 earlycon=ec_imx6q,0x30890000,115200\0" \
        "fdt_addr_r=0x43000000\0"                       \
@@ -79,9 +79,7 @@
        "mmcroot=" CONFIG_MMCROOT " rootwait rw\0" \
 
 /* Link Definitions */
-#define CONFIG_LOADADDR                        0x40480000
-
-#define CONFIG_SYS_LOAD_ADDR           CONFIG_LOADADDR
+#define CONFIG_SYS_LOAD_ADDR                   0x40480000
 
 #define CONFIG_SYS_INIT_RAM_ADDR       0x40000000
 #define CONFIG_SYS_INIT_RAM_SIZE       0x80000

diff --git a/include/configs/imx8mq_cm.h b/include/configs/imx8mq_cm.h
index 9db3bd5..a3267c4 100644 (file)
--- a/include/configs/imx8mq_cm.h
+++ b/include/configs/imx8mq_cm.h
@@ -65,9 +65,7 @@
        "mmcroot=" CONFIG_MMCROOT " rootwait rw\0" \
 
 /* Link Definitions */
-#define CONFIG_LOADADDR                                        0x40480000
-
-#define CONFIG_SYS_LOAD_ADDR                   CONFIG_LOADADDR
+#define CONFIG_SYS_LOAD_ADDR                                   0x40480000
 
 #define CONFIG_SYS_INIT_RAM_ADDR        0x40000000
 #define CONFIG_SYS_INIT_RAM_SIZE        0x80000

diff --git a/include/configs/imx8mq_evk.h b/include/configs/imx8mq_evk.h
index 54e0560..fc86ba3 100644 (file)
--- a/include/configs/imx8mq_evk.h
+++ b/include/configs/imx8mq_evk.h
@@ -94,9 +94,7 @@
        "mmcroot=" CONFIG_MMCROOT " rootwait rw\0" \
 
 /* Link Definitions */
-#define CONFIG_LOADADDR                        0x40480000
-
-#define CONFIG_SYS_LOAD_ADDR           CONFIG_LOADADDR
+#define CONFIG_SYS_LOAD_ADDR                   0x40480000
 
 #define CONFIG_SYS_INIT_RAM_ADDR        0x40000000
 #define CONFIG_SYS_INIT_RAM_SIZE        0x80000

diff --git a/include/configs/imx8mq_phanbell.h b/include/configs/imx8mq_phanbell.h
index 7f86f2b..d246115 100644 (file)
--- a/include/configs/imx8mq_phanbell.h
+++ b/include/configs/imx8mq_phanbell.h
@@ -137,9 +137,7 @@
           "else booti ${loadaddr} - ${fdt_addr}; fi"
 
 /* Link Definitions */
-#define CONFIG_LOADADDR                        0x40480000
-
-#define CONFIG_SYS_LOAD_ADDR           CONFIG_LOADADDR
+#define CONFIG_SYS_LOAD_ADDR                   0x40480000
 
 #define CONFIG_SYS_INIT_RAM_ADDR        0x40000000
 #define CONFIG_SYS_INIT_RAM_SIZE        0x80000

diff --git a/include/configs/imx8qm_mek.h b/include/configs/imx8qm_mek.h
index 99e73a9..04ad3db 100644 (file)
--- a/include/configs/imx8qm_mek.h
+++ b/include/configs/imx8qm_mek.h
@@ -145,9 +145,7 @@
           "else booti ${loadaddr} - ${fdt_addr}; fi"
 
 /* Link Definitions */
-#define CONFIG_LOADADDR                        0x80280000
-
-#define CONFIG_SYS_LOAD_ADDR           CONFIG_LOADADDR
+#define CONFIG_SYS_LOAD_ADDR                   0x80280000
 
 #define CONFIG_SYS_INIT_SP_ADDR         0x80200000
 

diff --git a/include/configs/imx8qm_rom7720.h b/include/configs/imx8qm_rom7720.h
index fcbf8ee..9c7bf4b 100644 (file)
--- a/include/configs/imx8qm_rom7720.h
+++ b/include/configs/imx8qm_rom7720.h
@@ -122,9 +122,7 @@
           "else booti ${loadaddr} - ${fdt_addr}; fi"
 
 /* Link Definitions */
-#define CONFIG_LOADADDR                        0x80280000
-
-#define CONFIG_SYS_LOAD_ADDR           CONFIG_LOADADDR
+#define CONFIG_SYS_LOAD_ADDR                   0x80280000
 
 #define CONFIG_SYS_INIT_SP_ADDR                0x80200000
 

diff --git a/include/configs/imx8qxp_mek.h b/include/configs/imx8qxp_mek.h
index a7d623a..bab8021 100644 (file)
--- a/include/configs/imx8qxp_mek.h
+++ b/include/configs/imx8qxp_mek.h
@@ -144,9 +144,7 @@
           "else booti ${loadaddr} - ${fdt_addr}; fi"
 
 /* Link Definitions */
-#define CONFIG_LOADADDR                        0x80280000
-
-#define CONFIG_SYS_LOAD_ADDR           CONFIG_LOADADDR
+#define CONFIG_SYS_LOAD_ADDR                   0x80280000
 
 #define CONFIG_SYS_INIT_SP_ADDR         0x80200000
 

diff --git a/include/configs/imx8ulp_evk.h b/include/configs/imx8ulp_evk.h
index 32f8773..154ae69 100644 (file)
--- a/include/configs/imx8ulp_evk.h
+++ b/include/configs/imx8ulp_evk.h
@@ -63,8 +63,8 @@
 /* Initial environment variables */
 #define CONFIG_EXTRA_ENV_SETTINGS              \
        BOOTENV \
-       "scriptaddr=" __stringify(CONFIG_LOADADDR) "\0" \
-       "kernel_addr_r=" __stringify(CONFIG_LOADADDR) "\0" \
+       "scriptaddr=" __stringify(CONFIG_SYS_LOAD_ADDR) "\0" \
+       "kernel_addr_r=" __stringify(CONFIG_SYS_LOAD_ADDR) "\0" \
        "image=Image\0" \
        "console=ttyLP1,115200 earlycon\0" \
        "fdt_addr_r=0x83000000\0"                       \
@@ -76,9 +76,7 @@
        "mmcroot=" CONFIG_MMCROOT " rootwait rw\0" \
 
 /* Link Definitions */
-#define CONFIG_LOADADDR                        0x80480000
-
-#define CONFIG_SYS_LOAD_ADDR           CONFIG_LOADADDR
+#define CONFIG_SYS_LOAD_ADDR                   0x80480000
 
 #define CONFIG_SYS_INIT_RAM_ADDR       0x80000000
 #define CONFIG_SYS_INIT_RAM_SIZE       0x80000

diff --git a/include/configs/imxrt1020-evk.h b/include/configs/imxrt1020-evk.h
index 4fb4477..a2b1ab1 100644 (file)
--- a/include/configs/imxrt1020-evk.h
+++ b/include/configs/imxrt1020-evk.h
@@ -15,7 +15,6 @@
 #define CONFIG_SYS_LOAD_ADDR           0x20209000
 #else
 #define CONFIG_SYS_LOAD_ADDR           0x80000000
-#define CONFIG_LOADADDR                        0x80000000
 #endif
 
 #define CONFIG_SYS_FSL_ERRATUM_ESDHC135                1

diff --git a/include/configs/imxrt1050-evk.h b/include/configs/imxrt1050-evk.h
index c8d661f..c4787ab 100644 (file)
--- a/include/configs/imxrt1050-evk.h
+++ b/include/configs/imxrt1050-evk.h
@@ -15,7 +15,6 @@
 #define CONFIG_SYS_LOAD_ADDR           0x20209000
 #else
 #define CONFIG_SYS_LOAD_ADDR           0x80000000
-#define CONFIG_LOADADDR                        0x80000000
 #endif
 
 #define CONFIG_SYS_FSL_ERRATUM_ESDHC135                1

diff --git a/include/configs/iot_devkit.h b/include/configs/iot_devkit.h
index 1ba69d9..93abae0 100644 (file)
--- a/include/configs/iot_devkit.h
+++ b/include/configs/iot_devkit.h
@@ -75,6 +75,5 @@
  * Environment
  */
 #define CONFIG_BOOTFILE                        "app.bin"
-#define CONFIG_LOADADDR                        CONFIG_SYS_LOAD_ADDR
 
 #endif /* _CONFIG_IOT_DEVKIT_H_ */

diff --git a/include/configs/kp_imx53.h b/include/configs/kp_imx53.h
index a40e428..6973007 100644 (file)
--- a/include/configs/kp_imx53.h
+++ b/include/configs/kp_imx53.h
@@ -20,7 +20,7 @@
 #define CONFIG_MXC_USB_FLAGS   0
 
 /* Command definition */
-#define CONFIG_LOADADDR                0x72000000      /* loadaddr env var */
+#define CONFIG_SYS_LOAD_ADDR           0x72000000      /* loadaddr env var */
 
 #define CONFIG_EXTRA_ENV_SETTINGS \
        "console=ttymxc1,115200\0"      \
@@ -72,7 +72,6 @@
 
 /* Miscellaneous configurable options */
 #define CONFIG_SYS_CBSIZE              512     /* Console I/O Buffer Size */
-#define CONFIG_SYS_LOAD_ADDR           CONFIG_LOADADDR
 
 /* Physical Memory Map */
 #define PHYS_SDRAM_1                   CSD0_BASE_ADDR

diff --git a/include/configs/kp_imx6q_tpc.h b/include/configs/kp_imx6q_tpc.h
index 749e880..91023f4 100644 (file)
--- a/include/configs/kp_imx6q_tpc.h
+++ b/include/configs/kp_imx6q_tpc.h
@@ -36,11 +36,7 @@
 #define CONFIG_MXC_USB_FLAGS           0
 #define CONFIG_USB_MAX_CONTROLLER_COUNT        2 /* Enabled USB controller number */
 #endif
-
-/* Watchdog */
-
-#define CONFIG_LOADADDR                        0x12000000
-#define CONFIG_SYS_LOAD_ADDR           CONFIG_LOADADDR
+#define CONFIG_SYS_LOAD_ADDR                   0x12000000
 
 #ifndef CONFIG_SPL_BUILD
 #define CONFIG_EXTRA_ENV_SETTINGS      \

diff --git a/include/configs/liteboard.h b/include/configs/liteboard.h
index 5adbe1c..041b788 100644 (file)
--- a/include/configs/liteboard.h
+++ b/include/configs/liteboard.h
@@ -104,8 +104,6 @@
           "else run netboot; fi"
 
 /* Miscellaneous configurable options */
-
-#define CONFIG_SYS_LOAD_ADDR           CONFIG_LOADADDR
 #define CONFIG_SYS_HZ                  1000
 
 /* Physical Memory Map */

diff --git a/include/configs/lsxl.h b/include/configs/lsxl.h
index a4a4739..ca13838 100644 (file)
--- a/include/configs/lsxl.h
+++ b/include/configs/lsxl.h
@@ -45,7 +45,6 @@
 /*
  * Default environment variables
  */
-#define CONFIG_LOADADDR                0x00800000
 
 #if defined(CONFIG_LSXHL)
 #define CONFIG_FDTFILE "kirkwood-lsxhl.dtb"

diff --git a/include/configs/m53menlo.h b/include/configs/m53menlo.h
index db601c0..1bcd40d 100644 (file)
--- a/include/configs/m53menlo.h
+++ b/include/configs/m53menlo.h
@@ -136,9 +136,8 @@
 #define CONFIG_REVISION_TAG
 #define CONFIG_SETUP_MEMORY_TAGS
 #define CONFIG_BOOTFILE                "boot/fitImage"
-#define CONFIG_LOADADDR                0x70800000
+#define CONFIG_SYS_LOAD_ADDR           0x70800000
 #define CONFIG_BOOTCOMMAND     "run mmc_mmc"
-#define CONFIG_SYS_LOAD_ADDR   CONFIG_LOADADDR
 
 /*
  * NAND SPL

diff --git a/include/configs/meerkat96.h b/include/configs/meerkat96.h
index f43a841..f5deba3 100644 (file)
--- a/include/configs/meerkat96.h
+++ b/include/configs/meerkat96.h
@@ -17,7 +17,6 @@
 /* Size of malloc() pool */
 #define CONFIG_SYS_MALLOC_LEN          (32 * SZ_1M)
 
-#define CONFIG_SYS_LOAD_ADDR           CONFIG_LOADADDR
 #define CONFIG_SYS_HZ                  1000
 
 /* Physical Memory Map */

diff --git a/include/configs/mt7622.h b/include/configs/mt7622.h
index f015d10..9820d6a 100644 (file)
--- a/include/configs/mt7622.h
+++ b/include/configs/mt7622.h
@@ -28,8 +28,7 @@
 #define CONFIG_SYS_INIT_SP_ADDR                (CONFIG_SYS_TEXT_BASE + SZ_2M - \
                                         GENERATED_GBL_DATA_SIZE)
 /* UBoot -> Kernel */
-#define CONFIG_LOADADDR                        0x4007ff28
-#define CONFIG_SYS_LOAD_ADDR           CONFIG_LOADADDR
+#define CONFIG_SYS_LOAD_ADDR                   0x4007ff28
 
 /* DRAM */
 #define CONFIG_SYS_SDRAM_BASE          0x40000000

diff --git a/include/configs/mt7623.h b/include/configs/mt7623.h
index 9895279..6ceb9af 100644 (file)
--- a/include/configs/mt7623.h
+++ b/include/configs/mt7623.h
@@ -33,8 +33,7 @@
                                         GENERATED_GBL_DATA_SIZE)
 
 /* UBoot -> Kernel */
-#define CONFIG_LOADADDR                        0x84000000
-#define CONFIG_SYS_LOAD_ADDR           CONFIG_LOADADDR
+#define CONFIG_SYS_LOAD_ADDR                   0x84000000
 
 /* MMC */
 #define MMC_SUPPORTS_TUNING

diff --git a/include/configs/mt7629.h b/include/configs/mt7629.h
index 08a4d01..53f2c3a 100644 (file)
--- a/include/configs/mt7629.h
+++ b/include/configs/mt7629.h
@@ -43,8 +43,7 @@
 
 /* UBoot -> Kernel */
 #define CONFIG_SYS_SPL_ARGS_ADDR       0x40000000
-#define CONFIG_LOADADDR                        0x42007f1c
-#define CONFIG_SYS_LOAD_ADDR           CONFIG_LOADADDR
+#define CONFIG_SYS_LOAD_ADDR                   0x42007f1c
 
 /* DRAM */
 #define CONFIG_SYS_SDRAM_BASE          0x40000000

diff --git a/include/configs/mt8512.h b/include/configs/mt8512.h
index 7cd388f..8d667d0 100644 (file)
--- a/include/configs/mt8512.h
+++ b/include/configs/mt8512.h
@@ -18,7 +18,6 @@
 #define COUNTER_FREQUENCY                      13000000
 
 #define CONFIG_SYS_LOAD_ADDR                   0x41000000
-#define CONFIG_LOADADDR                                CONFIG_SYS_LOAD_ADDR
 
 #define CONFIG_SYS_MALLOC_LEN                  SZ_32M
 #define CONFIG_SYS_BOOTM_LEN                   SZ_64M

diff --git a/include/configs/mt8518.h b/include/configs/mt8518.h
index 4e32442..a300546 100644 (file)
--- a/include/configs/mt8518.h
+++ b/include/configs/mt8518.h
@@ -22,7 +22,6 @@
 #define CONFIG_SYS_SDRAM_SIZE                  0x20000000
 
 #define CONFIG_SYS_LOAD_ADDR                   0x41000000
-#define CONFIG_LOADADDR                                CONFIG_SYS_LOAD_ADDR
 
 #define CONFIG_SYS_MALLOC_LEN                  SZ_32M
 #define CONFIG_SYS_BOOTM_LEN                   SZ_64M

diff --git a/include/configs/mx23_olinuxino.h b/include/configs/mx23_olinuxino.h
index 2ee41ae..ba24cd1 100644 (file)
--- a/include/configs/mx23_olinuxino.h
+++ b/include/configs/mx23_olinuxino.h
@@ -27,8 +27,7 @@
 
 /* Booting Linux */
 #define CONFIG_BOOTFILE                "uImage"
-#define CONFIG_LOADADDR                0x42000000
-#define CONFIG_SYS_LOAD_ADDR   CONFIG_LOADADDR
+#define CONFIG_SYS_LOAD_ADDR           0x42000000
 
 /* Extra Environment */
 #define CONFIG_EXTRA_ENV_SETTINGS \

diff --git a/include/configs/mx23evk.h b/include/configs/mx23evk.h
index 3f13e60..ad0e4ab 100644 (file)
--- a/include/configs/mx23evk.h
+++ b/include/configs/mx23evk.h
@@ -36,8 +36,7 @@
 
 /* Boot Linux */
 #define CONFIG_BOOTFILE                "uImage"
-#define CONFIG_LOADADDR                0x42000000
-#define CONFIG_SYS_LOAD_ADDR   CONFIG_LOADADDR
+#define CONFIG_SYS_LOAD_ADDR           0x42000000
 
 /* Extra Environments */
 #define CONFIG_EXTRA_ENV_SETTINGS \

diff --git a/include/configs/mx28evk.h b/include/configs/mx28evk.h
index 21f3277..5d51ff1 100644 (file)
--- a/include/configs/mx28evk.h
+++ b/include/configs/mx28evk.h
@@ -50,8 +50,7 @@
 
 /* Boot Linux */
 #define CONFIG_BOOTFILE                "uImage"
-#define CONFIG_LOADADDR                0x42000000
-#define CONFIG_SYS_LOAD_ADDR   CONFIG_LOADADDR
+#define CONFIG_SYS_LOAD_ADDR           0x42000000
 
 /* Extra Environment */
 #define CONFIG_EXTRA_ENV_SETTINGS \

diff --git a/include/configs/mx51evk.h b/include/configs/mx51evk.h
index 3574d65..38609cf 100644 (file)
--- a/include/configs/mx51evk.h
+++ b/include/configs/mx51evk.h
@@ -61,7 +61,7 @@
 
 #define CONFIG_ETHPRIME                "FEC0"
 
-#define CONFIG_LOADADDR                0x92000000      /* loadaddr env var */
+#define CONFIG_SYS_LOAD_ADDR           0x92000000      /* loadaddr env var */
 
 #define CONFIG_EXTRA_ENV_SETTINGS \
        "script=boot.scr\0" \
@@ -140,8 +140,6 @@
  * Miscellaneous configurable options
  */
 
-#define CONFIG_SYS_LOAD_ADDR           CONFIG_LOADADDR
-
 /*-----------------------------------------------------------------------
  * Physical Memory Map
  */

diff --git a/include/configs/mx53cx9020.h b/include/configs/mx53cx9020.h
index 93158fb..2e9958b 100644 (file)
--- a/include/configs/mx53cx9020.h
+++ b/include/configs/mx53cx9020.h
@@ -43,7 +43,7 @@
 
 /* Command definition */
 
-#define CONFIG_LOADADDR                0x70010000      /* loadaddr env var */
+#define CONFIG_SYS_LOAD_ADDR           0x70010000      /* loadaddr env var */
 
 #define BOOT_TARGET_DEVICES(func) \
        func(MMC, mmc, 0) \
@@ -72,8 +72,6 @@
 /* Miscellaneous configurable options */
 #define CONFIG_SYS_CBSIZE              512     /* Console I/O Buffer Size */
 
-#define CONFIG_SYS_LOAD_ADDR           CONFIG_LOADADDR
-
 /* Physical Memory Map */
 #define PHYS_SDRAM_1                   CSD0_BASE_ADDR
 #define PHYS_SDRAM_1_SIZE              (gd->bd->bi_dram[0].size)

diff --git a/include/configs/mx53loco.h b/include/configs/mx53loco.h
index 574e647..deb928f 100644 (file)
--- a/include/configs/mx53loco.h
+++ b/include/configs/mx53loco.h
@@ -49,7 +49,7 @@
 
 #define CONFIG_ETHPRIME                "FEC0"
 
-#define CONFIG_LOADADDR                0x72000000      /* loadaddr env var */
+#define CONFIG_SYS_LOAD_ADDR           0x72000000      /* loadaddr env var */
 
 #define CONFIG_EXTRA_ENV_SETTINGS \
        "script=boot.scr\0" \
@@ -125,8 +125,6 @@
 /* Miscellaneous configurable options */
 #define CONFIG_SYS_CBSIZE              512     /* Console I/O Buffer Size */
 
-#define CONFIG_SYS_LOAD_ADDR           CONFIG_LOADADDR
-
 /* Physical Memory Map */
 #define PHYS_SDRAM_1                   CSD0_BASE_ADDR
 #define PHYS_SDRAM_1_SIZE              (gd->bd->bi_dram[0].size)

diff --git a/include/configs/mx53ppd.h b/include/configs/mx53ppd.h
index dae3a5c..ca62d0f 100644 (file)
--- a/include/configs/mx53ppd.h
+++ b/include/configs/mx53ppd.h
@@ -33,7 +33,7 @@
 
 /* Command definition */
 
-#define CONFIG_LOADADDR                0x72000000      /* loadaddr env var */
+#define CONFIG_SYS_LOAD_ADDR           0x72000000      /* loadaddr env var */
 
 #define PPD_CONFIG_NFS \
        "nfsserver=192.168.252.95\0" \
@@ -116,8 +116,6 @@
 #define CONFIG_SYS_MAXARGS     48      /* max number of command args */
 #define CONFIG_SYS_BARGSIZE CONFIG_SYS_CBSIZE /* Boot Argument Buffer Size */
 
-#define CONFIG_SYS_LOAD_ADDR           CONFIG_LOADADDR
-
 #define CONFIG_SYS_BOOTMAPSZ (256 << 20)     /* 256M */
 
 /* Physical Memory Map */

diff --git a/include/configs/mx6_common.h b/include/configs/mx6_common.h
index a4504ee..ac212ae 100644 (file)
--- a/include/configs/mx6_common.h
+++ b/include/configs/mx6_common.h
@@ -43,11 +43,10 @@
 #if defined(CONFIG_MX6SL) || defined(CONFIG_MX6SLL) || \
        defined(CONFIG_MX6SX) || \
        defined(CONFIG_MX6UL) || defined(CONFIG_MX6ULL)
-#define CONFIG_LOADADDR                0x82000000
+#define CONFIG_SYS_LOAD_ADDR           0x82000000
 #else
-#define CONFIG_LOADADDR                0x12000000
+#define CONFIG_SYS_LOAD_ADDR           0x12000000
 #endif
-#define CONFIG_SYS_LOAD_ADDR   CONFIG_LOADADDR
 
 /* Miscellaneous configurable options */
 #define CONFIG_SYS_CBSIZE      512

diff --git a/include/configs/mx6cuboxi.h b/include/configs/mx6cuboxi.h
index 9e5083b..9b80646 100644 (file)
--- a/include/configs/mx6cuboxi.h
+++ b/include/configs/mx6cuboxi.h
@@ -46,9 +46,9 @@
        "fdtfile=undefined\0" \
        "fdt_addr_r=0x18000000\0" \
        "fdt_addr=0x18000000\0" \
-       "kernel_addr_r=" __stringify(CONFIG_LOADADDR) "\0"  \
-       "pxefile_addr_r=" __stringify(CONFIG_LOADADDR) "\0" \
-       "scriptaddr=" __stringify(CONFIG_LOADADDR) "\0" \
+       "kernel_addr_r=" __stringify(CONFIG_SYS_LOAD_ADDR) "\0"  \
+       "pxefile_addr_r=" __stringify(CONFIG_SYS_LOAD_ADDR) "\0" \
+       "scriptaddr=" __stringify(CONFIG_SYS_LOAD_ADDR) "\0" \
        "ramdisk_addr_r=0x13000000\0" \
        "ramdiskaddr=0x13000000\0" \
        "initrd_high=0xffffffff\0" \

diff --git a/include/configs/mx6sabre_common.h b/include/configs/mx6sabre_common.h
index ac579f3..eb15392 100644 (file)
--- a/include/configs/mx6sabre_common.h
+++ b/include/configs/mx6sabre_common.h
@@ -52,7 +52,7 @@
        "dfu_alt_info=spl raw 0x400\0" \
        "fdt_high=0xffffffff\0"   \
        "initrd_high=0xffffffff\0" \
-       "splashimage=" __stringify(CONFIG_LOADADDR) "\0" \
+       "splashimage=" __stringify(CONFIG_SYS_LOAD_ADDR) "\0" \
        "mmcdev=" __stringify(CONFIG_SYS_MMC_ENV_DEV) "\0" \
        "mmcpart=1\0" \
        "finduuid=part uuid mmc ${mmcdev}:2 uuid\0" \

diff --git a/include/configs/mx6ul_14x14_evk.h b/include/configs/mx6ul_14x14_evk.h
index 0065fdc..2ce852a 100644 (file)
--- a/include/configs/mx6ul_14x14_evk.h
+++ b/include/configs/mx6ul_14x14_evk.h
@@ -48,7 +48,7 @@
        "fdt_addr=0x83000000\0" \
        "boot_fdt=try\0" \
        "ip_dyn=yes\0" \
-       "splashimage=" __stringify(CONFIG_LOADADDR) "\0" \
+       "splashimage=" __stringify(CONFIG_SYS_LOAD_ADDR) "\0" \
        "videomode=video=ctfb:x:480,y:272,depth:24,pclk:108695,le:8,ri:4,up:2,lo:4,hs:41,vs:10,sync:0,vmode:0\0" \
        "mmcdev="__stringify(CONFIG_SYS_MMC_ENV_DEV)"\0" \
        "mmcpart=" __stringify(CONFIG_SYS_MMC_IMG_LOAD_PART) "\0" \
@@ -127,7 +127,6 @@
 
 /* Miscellaneous configurable options */
 
-#define CONFIG_SYS_LOAD_ADDR           CONFIG_LOADADDR
 #define CONFIG_SYS_HZ                  1000
 
 /* Physical Memory Map */

diff --git a/include/configs/mx6ullevk.h b/include/configs/mx6ullevk.h
index 0a62ada..03dbdfc 100644 (file)
--- a/include/configs/mx6ullevk.h
+++ b/include/configs/mx6ullevk.h
@@ -124,7 +124,6 @@
 
 /* Miscellaneous configurable options */
 
-#define CONFIG_SYS_LOAD_ADDR           CONFIG_LOADADDR
 #define CONFIG_SYS_HZ                  1000
 
 /* Physical Memory Map */

diff --git a/include/configs/mx7_common.h b/include/configs/mx7_common.h
index 3d87690..8af1338 100644 (file)
--- a/include/configs/mx7_common.h
+++ b/include/configs/mx7_common.h
@@ -28,7 +28,7 @@
 /* Enable iomux-lpsr support */
 #define CONFIG_IOMUX_LPSR
 
-#define CONFIG_LOADADDR                 0x80800000
+#define CONFIG_SYS_LOAD_ADDR           0x80800000
 
 /* Miscellaneous configurable options */
 #define CONFIG_SYS_CBSIZE              512

diff --git a/include/configs/mx7dsabresd.h b/include/configs/mx7dsabresd.h
index 4766721..ee7117f 100644 (file)
--- a/include/configs/mx7dsabresd.h
+++ b/include/configs/mx7dsabresd.h
@@ -75,11 +75,11 @@
        "fdtfile=imx7d-sdb.dtb\0" \
        "fdt_addr=0x83000000\0" \
        "fdt_addr_r=0x83000000\0" \
-       "kernel_addr_r=" __stringify(CONFIG_LOADADDR) "\0" \
-       "pxefile_addr_r=" __stringify(CONFIG_LOADADDR) "\0" \
+       "kernel_addr_r=" __stringify(CONFIG_SYS_LOAD_ADDR) "\0" \
+       "pxefile_addr_r=" __stringify(CONFIG_SYS_LOAD_ADDR) "\0" \
        "ramdisk_addr_r=0x83100000\0" \
        "ramdiskaddr=0x83100000\0" \
-       "scriptaddr=" __stringify(CONFIG_LOADADDR) "\0" \
+       "scriptaddr=" __stringify(CONFIG_SYS_LOAD_ADDR) "\0" \
        "videomode=video=ctfb:x:480,y:272,depth:24,pclk:108695,le:8,ri:4,up:2,lo:4,hs:41,vs:10,sync:0,vmode:0\0" \
        BOOTENV
 
@@ -90,7 +90,6 @@
 
 #include <config_distro_bootcmd.h>
 
-#define CONFIG_SYS_LOAD_ADDR           CONFIG_LOADADDR
 #define CONFIG_SYS_HZ                  1000
 
 /* Physical Memory Map */

diff --git a/include/configs/mx7ulp_com.h b/include/configs/mx7ulp_com.h
index 28672c4..6c19997 100644 (file)
--- a/include/configs/mx7ulp_com.h
+++ b/include/configs/mx7ulp_com.h
@@ -47,7 +47,7 @@
 #define PHYS_SDRAM                     0x60000000
 #define CONFIG_SYS_SDRAM_BASE          PHYS_SDRAM
 
-#define CONFIG_LOADADDR                        0x60800000
+#define CONFIG_SYS_LOAD_ADDR                   0x60800000
 
 #define CONFIG_EXTRA_ENV_SETTINGS \
        "image=zImage\0" \
@@ -74,8 +74,6 @@
                "run mmcboot; " \
        "fi; " \
 
-#define CONFIG_SYS_LOAD_ADDR           CONFIG_LOADADDR
-
 #define CONFIG_SYS_INIT_RAM_ADDR       IRAM_BASE_ADDR
 #define CONFIG_SYS_INIT_RAM_SIZE       SZ_256K
 

diff --git a/include/configs/mx7ulp_evk.h b/include/configs/mx7ulp_evk.h
index 0c31030..ae0e6a0 100644 (file)
--- a/include/configs/mx7ulp_evk.h
+++ b/include/configs/mx7ulp_evk.h
@@ -47,7 +47,7 @@
 #define PHYS_SDRAM_SIZE                        SZ_1G
 #define CONFIG_SYS_SDRAM_BASE          PHYS_SDRAM
 
-#define CONFIG_LOADADDR             0x60800000
+#define CONFIG_SYS_LOAD_ADDR             0x60800000
 
 #define CONFIG_EXTRA_ENV_SETTINGS \
        "script=boot.scr\0" \
@@ -125,7 +125,6 @@
           "fi"
 
 #define CONFIG_SYS_HZ                  1000
-#define CONFIG_SYS_LOAD_ADDR           CONFIG_LOADADDR
 
 #define CONFIG_SYS_INIT_RAM_ADDR       IRAM_BASE_ADDR
 #define CONFIG_SYS_INIT_RAM_SIZE       SZ_256K

diff --git a/include/configs/mys_6ulx.h b/include/configs/mys_6ulx.h
index 5ef16fb..b68ae12 100644 (file)
--- a/include/configs/mys_6ulx.h
+++ b/include/configs/mys_6ulx.h
@@ -24,7 +24,6 @@
 /* MMC Configs */
 #define CONFIG_SYS_FSL_ESDHC_ADDR      USDHC2_BASE_ADDR
 
-#define CONFIG_SYS_LOAD_ADDR           CONFIG_LOADADDR
 #define CONFIG_SYS_HZ                  1000
 
 /* Physical Memory Map */

diff --git a/include/configs/nitrogen6x.h b/include/configs/nitrogen6x.h
index c82b4c7..c6e1461 100644 (file)
--- a/include/configs/nitrogen6x.h
+++ b/include/configs/nitrogen6x.h
@@ -108,9 +108,9 @@
        "initrd_high=0xffffffff\0" \
        "fdt_addr_r=0x18000000\0" \
        FDTFILE \
-       "kernel_addr_r=" __stringify(CONFIG_LOADADDR) "\0"  \
-       "pxefile_addr_r=" __stringify(CONFIG_LOADADDR) "\0" \
-       "scriptaddr=" __stringify(CONFIG_LOADADDR) "\0" \
+       "kernel_addr_r=" __stringify(CONFIG_SYS_LOAD_ADDR) "\0"  \
+       "pxefile_addr_r=" __stringify(CONFIG_SYS_LOAD_ADDR) "\0" \
+       "scriptaddr=" __stringify(CONFIG_SYS_LOAD_ADDR) "\0" \
        "ramdisk_addr_r=0x13000000\0" \
        "ramdiskaddr=0x13000000\0" \
        "ip_dyn=yes\0" \

diff --git a/include/configs/novena.h b/include/configs/novena.h
index 011284e..a866791 100644 (file)
--- a/include/configs/novena.h
+++ b/include/configs/novena.h
@@ -105,9 +105,9 @@
        "bootdev=/dev/mmcblk0p1\0"                                      \
        "rootdev=/dev/mmcblk0p2\0"                                      \
        "netdev=eth0\0"                                                 \
-       "kernel_addr_r="__stringify(CONFIG_LOADADDR)"\0"                \
-       "pxefile_addr_r="__stringify(CONFIG_LOADADDR)"\0"               \
-       "scriptaddr="__stringify(CONFIG_LOADADDR)"\0"                   \
+       "kernel_addr_r="__stringify(CONFIG_SYS_LOAD_ADDR)"\0"           \
+       "pxefile_addr_r="__stringify(CONFIG_SYS_LOAD_ADDR)"\0"          \
+       "scriptaddr="__stringify(CONFIG_SYS_LOAD_ADDR)"\0"                      \
        "ramdisk_addr_r=0x28000000\0"                                   \
        "fdt_addr_r=0x18000000\0"                                       \
        "fdtfile=imx6q-novena.dtb\0"                                    \

diff --git a/include/configs/npi_imx6ull.h b/include/configs/npi_imx6ull.h
index 3be9b8f..d90ecf4 100644 (file)
--- a/include/configs/npi_imx6ull.h
+++ b/include/configs/npi_imx6ull.h
@@ -26,7 +26,6 @@
 
 #define CONFIG_NETMASK                 255.255.255.0
 
-#define CONFIG_SYS_LOAD_ADDR           CONFIG_LOADADDR
 #define CONFIG_SYS_HZ                  1000
 
 /* Physical Memory Map */

diff --git a/include/configs/nsim.h b/include/configs/nsim.h
index 61217bb..69d5825 100644 (file)
--- a/include/configs/nsim.h
+++ b/include/configs/nsim.h
@@ -28,7 +28,6 @@
  * Environment configuration
  */
 #define CONFIG_BOOTFILE                        "uImage"
-#define CONFIG_LOADADDR                        CONFIG_SYS_LOAD_ADDR
 
 /*
  * Console configuration

diff --git a/include/configs/nyan-big.h b/include/configs/nyan-big.h
index 394fb15..495753b 100644 (file)
--- a/include/configs/nyan-big.h
+++ b/include/configs/nyan-big.h
@@ -26,8 +26,8 @@
 /* SPI */
 #define CONFIG_SPI_FLASH_SIZE          (4 << 20)
 
-#undef CONFIG_LOADADDR
-#define CONFIG_LOADADDR                0x82408000
+#undef CONFIG_SYS_LOAD_ADDR
+#define CONFIG_SYS_LOAD_ADDR           0x82408000
 
 #include "tegra-common-usb-gadget.h"
 #include "tegra-common-post.h"

diff --git a/include/configs/opos6uldev.h b/include/configs/opos6uldev.h
index 2fb1634..d7ec8d0 100644 (file)
--- a/include/configs/opos6uldev.h
+++ b/include/configs/opos6uldev.h
@@ -78,7 +78,7 @@
        "mmcrootfstype=ext4 rootwait\0"                                                         \
        "kernelimg="           __stringify(CONFIG_BOARD_NAME)          "-linux.bin\0"           \
        "splashpos=0,0\0"                                                                       \
-       "splashimage="          __stringify(CONFIG_LOADADDR)            "\0"                    \
+       "splashimage="          __stringify(CONFIG_SYS_LOAD_ADDR)       "\0"                    \
        "videomode=video=ctfb:x:800,y:480,depth:18,pclk:33033,le:96,ri:96,up:20,lo:21,hs:64,vs:4,sync:0,vmode:0\0" \
        "check_env=if test -n ${flash_env_version}; "                                           \
                "then env default env_version; "                                                \

diff --git a/include/configs/p1_p2_rdb_pc.h b/include/configs/p1_p2_rdb_pc.h
index 68831a0..7ac71aa 100644 (file)
--- a/include/configs/p1_p2_rdb_pc.h
+++ b/include/configs/p1_p2_rdb_pc.h
@@ -611,9 +611,6 @@
 #define CONFIG_BOOTFILE                "uImage"
 #define CONFIG_UBOOTPATH       u-boot.bin /* U-Boot image on TFTP server */
 
-/* default location for tftp and bootm */
-#define CONFIG_LOADADDR        1000000
-
 #ifdef __SW_BOOT_NOR
 #define __NOR_RST_CMD  \
 norboot=i2c dev 1; i2c mw 18 1 __SW_BOOT_NOR 1; \

diff --git a/include/configs/pcl063.h b/include/configs/pcl063.h
index 4f4d501..cb3441e 100644 (file)
--- a/include/configs/pcl063.h
+++ b/include/configs/pcl063.h
@@ -36,7 +36,6 @@
 
 /* Miscellaneous configurable options */
 
-#define CONFIG_SYS_LOAD_ADDR           CONFIG_LOADADDR
 #define CONFIG_SYS_HZ                  1000
 
 /* Physical Memory Map */

diff --git a/include/configs/pcl063_ull.h b/include/configs/pcl063_ull.h
index fee0c3d..a1549cd 100644 (file)
--- a/include/configs/pcl063_ull.h
+++ b/include/configs/pcl063_ull.h
@@ -39,7 +39,6 @@
 
 /* Miscellaneous configurable options */
 
-#define CONFIG_SYS_LOAD_ADDR           CONFIG_LOADADDR
 #define CONFIG_SYS_HZ                  1000
 
 /* Physical Memory Map */

diff --git a/include/configs/pcm052.h b/include/configs/pcm052.h
index 960ff98..0b21c59 100644 (file)
--- a/include/configs/pcm052.h
+++ b/include/configs/pcm052.h
@@ -25,7 +25,7 @@
 
 #define CONFIG_SYS_MAX_NAND_DEVICE     1
 
-#define CONFIG_LOADADDR                        0x82000000
+#define CONFIG_SYS_LOAD_ADDR                   0x82000000
 
 /* We boot from the gfxRAM area of the OCRAM. */
 #define CONFIG_BOARD_SIZE_LIMIT                520192
@@ -139,8 +139,6 @@
 
 /* Miscellaneous configurable options */
 
-#define CONFIG_SYS_LOAD_ADDR           CONFIG_LOADADDR
-
 /* Physical memory map */
 #define PHYS_SDRAM                     (0x80000000)
 #define PHYS_SDRAM_SIZE                        (CONFIG_PCM052_DDR_SIZE * SZ_1M)

diff --git a/include/configs/phycore_imx8mm.h b/include/configs/phycore_imx8mm.h
index 987335a..add7835 100644 (file)
--- a/include/configs/phycore_imx8mm.h
+++ b/include/configs/phycore_imx8mm.h
@@ -82,8 +82,7 @@
        "fi;"
 
 /* Link Definitions */
-#define CONFIG_LOADADDR                        0x40480000
-#define CONFIG_SYS_LOAD_ADDR           CONFIG_LOADADDR
+#define CONFIG_SYS_LOAD_ADDR                   0x40480000
 
 #define CONFIG_SYS_INIT_RAM_ADDR       0x40000000
 #define CONFIG_SYS_INIT_RAM_SIZE       SZ_512K

diff --git a/include/configs/phycore_imx8mp.h b/include/configs/phycore_imx8mp.h
index 95eb707..d0338fa 100644 (file)
--- a/include/configs/phycore_imx8mp.h
+++ b/include/configs/phycore_imx8mp.h
@@ -82,8 +82,7 @@
        "fi;"
 
 /* Link Definitions */
-#define CONFIG_LOADADDR                        0x40480000
-#define CONFIG_SYS_LOAD_ADDR           CONFIG_LOADADDR
+#define CONFIG_SYS_LOAD_ADDR                   0x40480000
 
 #define CONFIG_SYS_INIT_RAM_ADDR       0x40000000
 #define CONFIG_SYS_INIT_RAM_SIZE       SZ_512K

diff --git a/include/configs/pico-imx6.h b/include/configs/pico-imx6.h
index 6199f0d..9619170 100644 (file)
--- a/include/configs/pico-imx6.h
+++ b/include/configs/pico-imx6.h
@@ -94,11 +94,11 @@
                        "run base_boot;" \
                "fi; \0" \
        "base_boot=run findfdt; run finduuid; run distro_bootcmd\0" \
-       "kernel_addr_r=" __stringify(CONFIG_LOADADDR) "\0" \
-       "pxefile_addr_r=" __stringify(CONFIG_LOADADDR) "\0" \
+       "kernel_addr_r=" __stringify(CONFIG_SYS_LOAD_ADDR) "\0" \
+       "pxefile_addr_r=" __stringify(CONFIG_SYS_LOAD_ADDR) "\0" \
        "ramdisk_addr_r=0x13000000\0" \
        "ramdiskaddr=0x13000000\0" \
-       "scriptaddr=" __stringify(CONFIG_LOADADDR) "\0" \
+       "scriptaddr=" __stringify(CONFIG_SYS_LOAD_ADDR) "\0" \
        BOOTENV
 
 #define BOOT_TARGET_DEVICES(func) \

diff --git a/include/configs/pico-imx6ul.h b/include/configs/pico-imx6ul.h
index a0f7a3d..20457e3 100644 (file)
--- a/include/configs/pico-imx6ul.h
+++ b/include/configs/pico-imx6ul.h
@@ -82,11 +82,11 @@
        BOOTMENU_ENV \
        "fdt_addr=0x83000000\0" \
        "fdt_addr_r=0x83000000\0" \
-       "kernel_addr_r=" __stringify(CONFIG_LOADADDR) "\0" \
-       "pxefile_addr_r=" __stringify(CONFIG_LOADADDR) "\0" \
+       "kernel_addr_r=" __stringify(CONFIG_SYS_LOAD_ADDR) "\0" \
+       "pxefile_addr_r=" __stringify(CONFIG_SYS_LOAD_ADDR) "\0" \
        "ramdisk_addr_r=0x83000000\0" \
        "ramdiskaddr=0x83000000\0" \
-       "scriptaddr=" __stringify(CONFIG_LOADADDR) "\0" \
+       "scriptaddr=" __stringify(CONFIG_SYS_LOAD_ADDR) "\0" \
        "mmcautodetect=yes\0" \
        CONFIG_DFU_ENV_SETTINGS \
        "findfdt=" \
@@ -111,7 +111,6 @@
 #include <config_distro_bootcmd.h>
 #include <linux/stringify.h>
 
-#define CONFIG_SYS_LOAD_ADDR           CONFIG_LOADADDR
 #define CONFIG_SYS_HZ                  1000
 
 /* Physical Memory Map */

diff --git a/include/configs/pico-imx7d.h b/include/configs/pico-imx7d.h
index 0b478cb..2851263 100644 (file)
--- a/include/configs/pico-imx7d.h
+++ b/include/configs/pico-imx7d.h
@@ -74,7 +74,7 @@
 #define CONFIG_EXTRA_ENV_SETTINGS \
        "image=zImage\0" \
        "splashpos=m,m\0" \
-       "splashimage=" __stringify(CONFIG_LOADADDR) "\0" \
+       "splashimage=" __stringify(CONFIG_SYS_LOAD_ADDR) "\0" \
        "console=ttymxc4\0" \
        "fdt_high=0xffffffff\0" \
        "initrd_high=0xffffffff\0" \
@@ -82,11 +82,11 @@
        "videomode=video=ctfb:x:800,y:480,depth:24,mode:0,pclk:30000,le:46,ri:210,up:22,lo:23,hs:20,vs:10,sync:0,vmode:0\0" \
        "fdt_addr=0x83000000\0" \
        "fdt_addr_r=0x83000000\0" \
-       "kernel_addr_r=" __stringify(CONFIG_LOADADDR) "\0" \
-       "pxefile_addr_r=" __stringify(CONFIG_LOADADDR) "\0" \
+       "kernel_addr_r=" __stringify(CONFIG_SYS_LOAD_ADDR) "\0" \
+       "pxefile_addr_r=" __stringify(CONFIG_SYS_LOAD_ADDR) "\0" \
        "ramdisk_addr_r=0x83000000\0" \
        "ramdiskaddr=0x83000000\0" \
-       "scriptaddr=" __stringify(CONFIG_LOADADDR) "\0" \
+       "scriptaddr=" __stringify(CONFIG_SYS_LOAD_ADDR) "\0" \
        CONFIG_DFU_ENV_SETTINGS \
        "findfdt=" \
                "if test $fdtfile = ask ; then " \
@@ -110,7 +110,6 @@
 #include <config_distro_bootcmd.h>
 #include <linux/stringify.h>
 
-#define CONFIG_SYS_LOAD_ADDR           CONFIG_LOADADDR
 #define CONFIG_SYS_HZ                  1000
 
 /* Physical Memory Map */

diff --git a/include/configs/pico-imx8mq.h b/include/configs/pico-imx8mq.h
index a7bfcf8..e802644 100644 (file)
--- a/include/configs/pico-imx8mq.h
+++ b/include/configs/pico-imx8mq.h
@@ -116,9 +116,7 @@
        "else booti ${loadaddr} - ${fdt_addr}; fi"
 
 /* Link Definitions */
-#define CONFIG_LOADADDR                        0x40480000
-
-#define CONFIG_SYS_LOAD_ADDR           CONFIG_LOADADDR
+#define CONFIG_SYS_LOAD_ADDR                   0x40480000
 
 #define CONFIG_SYS_INIT_RAM_ADDR       0x40000000
 #define CONFIG_SYS_INIT_RAM_SIZE       0x80000

diff --git a/include/configs/qemu-ppce500.h b/include/configs/qemu-ppce500.h
index b2e1204..5159ff3 100644 (file)
--- a/include/configs/qemu-ppce500.h
+++ b/include/configs/qemu-ppce500.h
@@ -102,9 +102,6 @@ extern unsigned long long get_phys_ccsrbar_addr_early(void);
 #define CONFIG_BOOTFILE                "uImage"
 #define CONFIG_UBOOTPATH       "u-boot.bin"    /* U-Boot image on TFTP server*/
 
-/* default location for tftp and bootm */
-#define CONFIG_LOADADDR                1000000
-
 #define CONFIG_BOOTCOMMAND             \
        "test -n \"$qemu_kernel_addr\" && bootm $qemu_kernel_addr - $fdtcontroladdr\0"
 

diff --git a/include/configs/rcar-gen2-common.h b/include/configs/rcar-gen2-common.h
index f94e9d8..2aaeeae 100644 (file)
--- a/include/configs/rcar-gen2-common.h
+++ b/include/configs/rcar-gen2-common.h
@@ -29,7 +29,6 @@
 #define CONFIG_SYS_SDRAM_BASE          (RCAR_GEN2_SDRAM_BASE)
 #define CONFIG_SYS_SDRAM_SIZE          (RCAR_GEN2_UBOOT_SDRAM_SIZE)
 #define CONFIG_SYS_LOAD_ADDR           0x50000000
-#define CONFIG_LOADADDR                        CONFIG_SYS_LOAD_ADDR
 
 #define CONFIG_SYS_MONITOR_BASE                0x00000000
 #define CONFIG_SYS_MONITOR_LEN         (256 * 1024)

diff --git a/include/configs/rcar-gen3-common.h b/include/configs/rcar-gen3-common.h
index 2bad3a9..f234455 100644 (file)
--- a/include/configs/rcar-gen3-common.h
+++ b/include/configs/rcar-gen3-common.h
@@ -45,7 +45,6 @@
 #define CONFIG_SYS_SDRAM_BASE          (0x40000000 + DRAM_RSV_SIZE)
 #define CONFIG_SYS_SDRAM_SIZE          (0x80000000u - DRAM_RSV_SIZE)
 #define CONFIG_SYS_LOAD_ADDR           0x58000000
-#define CONFIG_LOADADDR                        CONFIG_SYS_LOAD_ADDR
 #define CONFIG_VERY_BIG_RAM
 #define CONFIG_MAX_MEM_MAPPED          (0x80000000u - DRAM_RSV_SIZE)
 

diff --git a/include/configs/rpi.h b/include/configs/rpi.h
index 522b41c..b6d5d49 100644 (file)
--- a/include/configs/rpi.h
+++ b/include/configs/rpi.h
@@ -55,7 +55,6 @@
                                         CONFIG_SYS_SDRAM_SIZE - \
                                         GENERATED_GBL_DATA_SIZE)
 #define CONFIG_SYS_MALLOC_LEN          SZ_4M
-#define CONFIG_LOADADDR                        0x00200000
 
 #ifdef CONFIG_ARM64
 #define CONFIG_SYS_BOOTM_LEN           SZ_64M

diff --git a/include/configs/smegw01.h b/include/configs/smegw01.h
index 6f7b46e..0ab2a2c 100644 (file)
--- a/include/configs/smegw01.h
+++ b/include/configs/smegw01.h
@@ -45,7 +45,6 @@
                "run mmcboot; " \
        "fi; " \
 
-#define CONFIG_SYS_LOAD_ADDR           CONFIG_LOADADDR
 #define CONFIG_SYS_HZ                  1000
 
 /* Physical Memory Map */

diff --git a/include/configs/socfpga_arria10_socdk.h b/include/configs/socfpga_arria10_socdk.h
index 645e66e..b0cd79e 100644 (file)
--- a/include/configs/socfpga_arria10_socdk.h
+++ b/include/configs/socfpga_arria10_socdk.h
@@ -9,8 +9,7 @@
 #include <asm/arch/base_addr_a10.h>
 
 /* Booting Linux */
-#define CONFIG_LOADADDR                0x01000000
-#define CONFIG_SYS_LOAD_ADDR   CONFIG_LOADADDR
+#define CONFIG_SYS_LOAD_ADDR           0x01000000
 
 /*
  * U-Boot general configurations

diff --git a/include/configs/socfpga_arria5_secu1.h b/include/configs/socfpga_arria5_secu1.h
index c25d6bd..c066eb3 100644 (file)
--- a/include/configs/socfpga_arria5_secu1.h
+++ b/include/configs/socfpga_arria5_secu1.h
@@ -57,7 +57,6 @@
 #define CONFIG_BOOT_RETRY_TIME 45
 #define CONFIG_RESET_TO_RETRY
 
-#define CONFIG_LOADADDR                0x01000000
 #define CONFIG_SYS_LOAD_ADDR   CONFIG_KM_KERNEL_ADDR
 
 /*

diff --git a/include/configs/socfpga_arria5_socdk.h b/include/configs/socfpga_arria5_socdk.h
index af6137a..8d62d13 100644 (file)
--- a/include/configs/socfpga_arria5_socdk.h
+++ b/include/configs/socfpga_arria5_socdk.h
@@ -11,8 +11,7 @@
 #define PHYS_SDRAM_1_SIZE              0x40000000      /* 1GiB on SoCDK */
 
 /* Booting Linux */
-#define CONFIG_LOADADDR                0x01000000
-#define CONFIG_SYS_LOAD_ADDR   CONFIG_LOADADDR
+#define CONFIG_SYS_LOAD_ADDR           0x01000000
 
 /* The rest of the configuration is shared */
 #include <configs/socfpga_common.h>

diff --git a/include/configs/socfpga_cyclone5_socdk.h b/include/configs/socfpga_cyclone5_socdk.h
index 028db2a..72ba0c5 100644 (file)
--- a/include/configs/socfpga_cyclone5_socdk.h
+++ b/include/configs/socfpga_cyclone5_socdk.h
@@ -11,8 +11,7 @@
 #define PHYS_SDRAM_1_SIZE              0x40000000      /* 1GiB on SoCDK */
 
 /* Booting Linux */
-#define CONFIG_LOADADDR                0x01000000
-#define CONFIG_SYS_LOAD_ADDR   CONFIG_LOADADDR
+#define CONFIG_SYS_LOAD_ADDR           0x01000000
 
 /* The rest of the configuration is shared */
 #include <configs/socfpga_common.h>

diff --git a/include/configs/socfpga_dbm_soc1.h b/include/configs/socfpga_dbm_soc1.h
index bffedcb..1cd97cc 100644 (file)
--- a/include/configs/socfpga_dbm_soc1.h
+++ b/include/configs/socfpga_dbm_soc1.h
@@ -13,8 +13,7 @@
 /* Booting Linux */
 #define CONFIG_BOOTFILE                "fitImage"
 #define CONFIG_BOOTCOMMAND     "run mmc_mmc"
-#define CONFIG_LOADADDR                0x01000000
-#define CONFIG_SYS_LOAD_ADDR   CONFIG_LOADADDR
+#define CONFIG_SYS_LOAD_ADDR           0x01000000
 
 /* Environment is in MMC */
 

diff --git a/include/configs/socfpga_de0_nano_soc.h b/include/configs/socfpga_de0_nano_soc.h
index 21108e3..36ddd41 100644 (file)
--- a/include/configs/socfpga_de0_nano_soc.h
+++ b/include/configs/socfpga_de0_nano_soc.h
@@ -11,8 +11,7 @@
 #define PHYS_SDRAM_1_SIZE              0x40000000      /* 1GiB */
 
 /* Booting Linux */
-#define CONFIG_LOADADDR                0x01000000
-#define CONFIG_SYS_LOAD_ADDR   CONFIG_LOADADDR
+#define CONFIG_SYS_LOAD_ADDR           0x01000000
 
 /* The rest of the configuration is shared */
 #include <configs/socfpga_common.h>

diff --git a/include/configs/socfpga_de10_nano.h b/include/configs/socfpga_de10_nano.h
index d85f98f..c200bf9 100644 (file)
--- a/include/configs/socfpga_de10_nano.h
+++ b/include/configs/socfpga_de10_nano.h
@@ -11,8 +11,7 @@
 #define PHYS_SDRAM_1_SIZE              0x40000000      /* 1GiB */
 
 /* Booting Linux */
-#define CONFIG_LOADADDR                0x01000000
-#define CONFIG_SYS_LOAD_ADDR   CONFIG_LOADADDR
+#define CONFIG_SYS_LOAD_ADDR           0x01000000
 
 /* The rest of the configuration is shared */
 #include <configs/socfpga_common.h>

diff --git a/include/configs/socfpga_de1_soc.h b/include/configs/socfpga_de1_soc.h
index 9919d29..5373b55 100644 (file)
--- a/include/configs/socfpga_de1_soc.h
+++ b/include/configs/socfpga_de1_soc.h
@@ -11,8 +11,7 @@
 #define PHYS_SDRAM_1_SIZE              0x40000000      /* 1GiB */
 
 /* Booting Linux */
-#define CONFIG_LOADADDR                0x01000000
-#define CONFIG_SYS_LOAD_ADDR   CONFIG_LOADADDR
+#define CONFIG_SYS_LOAD_ADDR           0x01000000
 
 /* The rest of the configuration is shared */
 #include <configs/socfpga_common.h>

diff --git a/include/configs/socfpga_is1.h b/include/configs/socfpga_is1.h
index c4da594..c3cbac3 100644 (file)
--- a/include/configs/socfpga_is1.h
+++ b/include/configs/socfpga_is1.h
@@ -13,8 +13,7 @@
 
 /* Booting Linux */
 #define CONFIG_BOOTFILE                "zImage"
-#define CONFIG_LOADADDR                0x01000000
-#define CONFIG_SYS_LOAD_ADDR   CONFIG_LOADADDR
+#define CONFIG_SYS_LOAD_ADDR           0x01000000
 
 /* Ethernet on SoC (EMAC) */
 #if defined(CONFIG_CMD_NET)

diff --git a/include/configs/socfpga_mcvevk.h b/include/configs/socfpga_mcvevk.h
index 50c5961..2c77341 100644 (file)
--- a/include/configs/socfpga_mcvevk.h
+++ b/include/configs/socfpga_mcvevk.h
@@ -13,8 +13,7 @@
 /* Booting Linux */
 #define CONFIG_BOOTFILE                "fitImage"
 #define CONFIG_BOOTCOMMAND     "run mmc_mmc"
-#define CONFIG_LOADADDR                0x01000000
-#define CONFIG_SYS_LOAD_ADDR   CONFIG_LOADADDR
+#define CONFIG_SYS_LOAD_ADDR           0x01000000
 
 /* Environment is in MMC */
 

diff --git a/include/configs/socfpga_soc64_common.h b/include/configs/socfpga_soc64_common.h
index aa411b2..2e9be25 100644 (file)
--- a/include/configs/socfpga_soc64_common.h
+++ b/include/configs/socfpga_soc64_common.h
@@ -15,8 +15,7 @@
  * U-Boot general configurations
  */
 #define CONFIG_SYS_MONITOR_BASE                CONFIG_SYS_TEXT_BASE
-#define CONFIG_LOADADDR                        0x2000000
-#define CONFIG_SYS_LOAD_ADDR           CONFIG_LOADADDR
+#define CONFIG_SYS_LOAD_ADDR                   0x2000000
 #define CONFIG_REMAKE_ELF
 /* sysmgr.boot_scratch_cold4 & 5 (64bit) will be used for PSCI_CPU_ON call */
 #define CPU_RELEASE_ADDR               0xFFD12210

diff --git a/include/configs/socfpga_sockit.h b/include/configs/socfpga_sockit.h
index 9729999..b66d2e5 100644 (file)
--- a/include/configs/socfpga_sockit.h
+++ b/include/configs/socfpga_sockit.h
@@ -11,8 +11,7 @@
 #define PHYS_SDRAM_1_SIZE              0x40000000      /* 1GiB on SoCDK */
 
 /* Booting Linux */
-#define CONFIG_LOADADDR                0x01000000
-#define CONFIG_SYS_LOAD_ADDR   CONFIG_LOADADDR
+#define CONFIG_SYS_LOAD_ADDR           0x01000000
 
 /* The rest of the configuration is shared */
 #include <configs/socfpga_common.h>

diff --git a/include/configs/socfpga_socrates.h b/include/configs/socfpga_socrates.h
index 7faea15..22977a0 100644 (file)
--- a/include/configs/socfpga_socrates.h
+++ b/include/configs/socfpga_socrates.h
@@ -11,8 +11,7 @@
 #define PHYS_SDRAM_1_SIZE              0x40000000      /* 1GiB on SoCrates */
 
 /* Booting Linux */
-#define CONFIG_LOADADDR                0x01000000
-#define CONFIG_SYS_LOAD_ADDR   CONFIG_LOADADDR
+#define CONFIG_SYS_LOAD_ADDR           0x01000000
 
 /* The rest of the configuration is shared */
 #include <configs/socfpga_common.h>

diff --git a/include/configs/socfpga_sr1500.h b/include/configs/socfpga_sr1500.h
index ccaa050..ea406b4 100644 (file)
--- a/include/configs/socfpga_sr1500.h
+++ b/include/configs/socfpga_sr1500.h
@@ -11,8 +11,7 @@
 #define PHYS_SDRAM_1_SIZE              0x40000000      /* 1GiB on SR1500 */
 
 /* Booting Linux */
-#define CONFIG_LOADADDR                0x01000000
-#define CONFIG_SYS_LOAD_ADDR   CONFIG_LOADADDR
+#define CONFIG_SYS_LOAD_ADDR           0x01000000
 
 /* Ethernet on SoC (EMAC) */
 #define CONFIG_PHY_INTERFACE_MODE      PHY_INTERFACE_MODE_RGMII

diff --git a/include/configs/socfpga_vining_fpga.h b/include/configs/socfpga_vining_fpga.h
index 06976d8..1679982 100644 (file)
--- a/include/configs/socfpga_vining_fpga.h
+++ b/include/configs/socfpga_vining_fpga.h
@@ -14,8 +14,7 @@
 #define CONFIG_BOOTFILE                "fitImage"
 #define CONFIG_BOOTCOMMAND     "run selboot"
 #define CONFIG_SYS_BOOTM_LEN   0x2000000       /* 32 MiB */
-#define CONFIG_LOADADDR                0x01000000
-#define CONFIG_SYS_LOAD_ADDR   CONFIG_LOADADDR
+#define CONFIG_SYS_LOAD_ADDR           0x01000000
 
 /* Ethernet on SoC (EMAC) */
 

diff --git a/include/configs/socrates.h b/include/configs/socrates.h
index 5480f27..373709f 100644 (file)
--- a/include/configs/socrates.h
+++ b/include/configs/socrates.h
@@ -209,7 +209,6 @@
 #define CONFIG_KGDB_BAUDRATE   230400  /* speed to run kgdb serial port*/
 #endif
 
-#define CONFIG_LOADADDR         200000         /* default addr for tftp & bootm*/
 
 #define        CONFIG_EXTRA_ENV_SETTINGS                                       \
        "netdev=eth0\0"                                                 \

diff --git a/include/configs/somlabs_visionsom_6ull.h b/include/configs/somlabs_visionsom_6ull.h
index 945d0ec..3f0bc2e 100644 (file)
--- a/include/configs/somlabs_visionsom_6ull.h
+++ b/include/configs/somlabs_visionsom_6ull.h
@@ -71,7 +71,6 @@
 
 /* Miscellaneous configurable options */
 
-#define CONFIG_SYS_LOAD_ADDR           CONFIG_LOADADDR
 #define CONFIG_SYS_HZ                  1000
 
 /* Physical Memory Map */

diff --git a/include/configs/stih410-b2260.h b/include/configs/stih410-b2260.h
index 33b34ee..83fa1a4 100644 (file)
--- a/include/configs/stih410-b2260.h
+++ b/include/configs/stih410-b2260.h
@@ -25,7 +25,6 @@
  */
 #define CONFIG_SYS_BOOTMAPSZ           SZ_256M
 
-#define CONFIG_LOADADDR                        CONFIG_SYS_LOAD_ADDR
 #define CONFIG_SYS_BOOTM_LEN           SZ_16M
 
 #define BOOT_TARGET_DEVICES(func) \

diff --git a/include/configs/stm32f429-discovery.h b/include/configs/stm32f429-discovery.h
index 9d029fb..64d22cd 100644 (file)
--- a/include/configs/stm32f429-discovery.h
+++ b/include/configs/stm32f429-discovery.h
@@ -15,7 +15,6 @@
  * Configuration of the external SDRAM memory
  */
 #define CONFIG_SYS_LOAD_ADDR           0x90400000
-#define CONFIG_LOADADDR                        0x90400000
 
 #define CONFIG_SYS_MAX_FLASH_SECT      12
 #define CONFIG_SYS_MAX_FLASH_BANKS     2

diff --git a/include/configs/stm32f429-evaluation.h b/include/configs/stm32f429-evaluation.h
index fefdb2d..45686fe 100644 (file)
--- a/include/configs/stm32f429-evaluation.h
+++ b/include/configs/stm32f429-evaluation.h
@@ -20,7 +20,6 @@
  * Configuration of the external SDRAM memory
  */
 #define CONFIG_SYS_LOAD_ADDR           0x00400000
-#define CONFIG_LOADADDR                        0x00400000
 
 #define CONFIG_SYS_MAX_FLASH_SECT      12
 #define CONFIG_SYS_MAX_FLASH_BANKS     2

diff --git a/include/configs/stm32f469-discovery.h b/include/configs/stm32f469-discovery.h
index ba9f05a..6a0199e 100644 (file)
--- a/include/configs/stm32f469-discovery.h
+++ b/include/configs/stm32f469-discovery.h
@@ -20,7 +20,6 @@
  * Configuration of the external SDRAM memory
  */
 #define CONFIG_SYS_LOAD_ADDR           0x00400000
-#define CONFIG_LOADADDR                        0x00400000
 
 #define CONFIG_SYS_MAX_FLASH_SECT      12
 #define CONFIG_SYS_MAX_FLASH_BANKS     2

diff --git a/include/configs/stm32f746-disco.h b/include/configs/stm32f746-disco.h
index 08d050a..b28e371 100644 (file)
--- a/include/configs/stm32f746-disco.h
+++ b/include/configs/stm32f746-disco.h
@@ -19,7 +19,6 @@
 #define CONFIG_SYS_LOAD_ADDR           0x08008000
 #else
 #define CONFIG_SYS_LOAD_ADDR           0xC0400000
-#define CONFIG_LOADADDR                        0xC0400000
 #endif
 
 /*

diff --git a/include/configs/stm32h743-disco.h b/include/configs/stm32h743-disco.h
index 6e10dbd..28a4c4d 100644 (file)
--- a/include/configs/stm32h743-disco.h
+++ b/include/configs/stm32h743-disco.h
@@ -20,7 +20,6 @@
  * Configuration of the external SDRAM memory
  */
 #define CONFIG_SYS_LOAD_ADDR           0xD0400000
-#define CONFIG_LOADADDR                        0xD0400000
 
 #define CONFIG_SYS_HZ_CLOCK            1000000
 

diff --git a/include/configs/stm32h743-eval.h b/include/configs/stm32h743-eval.h
index 268d39c..57aba24 100644 (file)
--- a/include/configs/stm32h743-eval.h
+++ b/include/configs/stm32h743-eval.h
@@ -20,7 +20,6 @@
  * Configuration of the external SDRAM memory
  */
 #define CONFIG_SYS_LOAD_ADDR           0xD0400000
-#define CONFIG_LOADADDR                        0xD0400000
 
 #define CONFIG_SYS_HZ_CLOCK            1000000
 

diff --git a/include/configs/stm32h750-art-pi.h b/include/configs/stm32h750-art-pi.h
index 3fd5461..1f84724 100644 (file)
--- a/include/configs/stm32h750-art-pi.h
+++ b/include/configs/stm32h750-art-pi.h
@@ -20,7 +20,6 @@
  * Configuration of the external SDRAM memory
  */
 #define CONFIG_SYS_LOAD_ADDR           0xC1800000
-#define CONFIG_LOADADDR                        0xC1800000
 
 #define CONFIG_SYS_HZ_CLOCK            1000000
 

diff --git a/include/configs/stm32mp1.h b/include/configs/stm32mp1.h
index b372838..10771ab 100644 (file)
--- a/include/configs/stm32mp1.h
+++ b/include/configs/stm32mp1.h
@@ -30,8 +30,7 @@
 /*
  * default load address used for command tftp,  bootm , loadb, ...
  */
-#define CONFIG_LOADADDR                        0xc2000000
-#define CONFIG_SYS_LOAD_ADDR           CONFIG_LOADADDR
+#define CONFIG_SYS_LOAD_ADDR                   0xc2000000
 
 /* ATAGs */
 #define CONFIG_CMDLINE_TAG

diff --git a/include/configs/tb100.h b/include/configs/tb100.h
index f42b0df..d9a9f2a 100644 (file)
--- a/include/configs/tb100.h
+++ b/include/configs/tb100.h
@@ -51,7 +51,6 @@
  * Environment configuration
  */
 #define CONFIG_BOOTFILE                        "uImage"
-#define CONFIG_LOADADDR                        CONFIG_SYS_LOAD_ADDR
 
 /*
  * Console configuration

diff --git a/include/configs/tegra-common-post.h b/include/configs/tegra-common-post.h
index 69adf64..fe2d688 100644 (file)
--- a/include/configs/tegra-common-post.h
+++ b/include/configs/tegra-common-post.h
@@ -81,8 +81,6 @@
 #define BOARD_EXTRA_ENV_SETTINGS
 #endif
 
-#define CONFIG_SYS_LOAD_ADDR CONFIG_LOADADDR
-
 #ifndef CONFIG_CHROMEOS_EXTRA_ENV_SETTINGS
 #define CONFIG_CHROMEOS_EXTRA_ENV_SETTINGS
 #endif

diff --git a/include/configs/tegra114-common.h b/include/configs/tegra114-common.h
index 9d751b6..c3418b6 100644 (file)
--- a/include/configs/tegra114-common.h
+++ b/include/configs/tegra114-common.h
@@ -45,11 +45,11 @@
  * ramdisk_addr_r simply shouldn't overlap anything else. Choosing 49M allows
  *   for the FDT/DTB to be up to 1M, which is hopefully plenty.
  */
-#define CONFIG_LOADADDR 0x81000000
+#define CONFIG_SYS_LOAD_ADDR 0x81000000
 #define MEM_LAYOUT_ENV_SETTINGS \
        "scriptaddr=0x90000000\0" \
        "pxefile_addr_r=0x90100000\0" \
-       "kernel_addr_r=" __stringify(CONFIG_LOADADDR) "\0" \
+       "kernel_addr_r=" __stringify(CONFIG_SYS_LOAD_ADDR) "\0" \
        "fdtfile=" FDTFILE "\0" \
        "fdt_addr_r=0x83000000\0" \
        "ramdisk_addr_r=0x83100000\0"

diff --git a/include/configs/tegra124-common.h b/include/configs/tegra124-common.h
index 0eb8f92..4d2ea18 100644 (file)
--- a/include/configs/tegra124-common.h
+++ b/include/configs/tegra124-common.h
@@ -47,11 +47,11 @@
  * ramdisk_addr_r simply shouldn't overlap anything else. Choosing 49M allows
  *   for the FDT/DTB to be up to 1M, which is hopefully plenty.
  */
-#define CONFIG_LOADADDR 0x81000000
+#define CONFIG_SYS_LOAD_ADDR 0x81000000
 #define MEM_LAYOUT_ENV_SETTINGS \
        "scriptaddr=0x90000000\0" \
        "pxefile_addr_r=0x90100000\0" \
-       "kernel_addr_r=" __stringify(CONFIG_LOADADDR) "\0" \
+       "kernel_addr_r=" __stringify(CONFIG_SYS_LOAD_ADDR) "\0" \
        "fdtfile=" FDTFILE "\0" \
        "fdt_addr_r=0x83000000\0" \
        "ramdisk_addr_r=0x83100000\0"

diff --git a/include/configs/tegra186-common.h b/include/configs/tegra186-common.h
index dbf4220..59eb4fe 100644 (file)
--- a/include/configs/tegra186-common.h
+++ b/include/configs/tegra186-common.h
@@ -47,11 +47,11 @@
  * ramdisk_addr_r simply shouldn't overlap anything else. Choosing 33M allows
  *   for the FDT/DTB to be up to 1M, which is hopefully plenty.
  */
-#define CONFIG_LOADADDR 0x80080000
+#define CONFIG_SYS_LOAD_ADDR 0x80080000
 #define MEM_LAYOUT_ENV_SETTINGS \
        "scriptaddr=0x90000000\0" \
        "pxefile_addr_r=0x90100000\0" \
-       "kernel_addr_r=" __stringify(CONFIG_LOADADDR) "\0" \
+       "kernel_addr_r=" __stringify(CONFIG_SYS_LOAD_ADDR) "\0" \
        "fdt_addr_r=0x82000000\0" \
        "ramdisk_addr_r=0x82100000\0"
 

diff --git a/include/configs/tegra20-common.h b/include/configs/tegra20-common.h
index fdd8996..d61962a 100644 (file)
--- a/include/configs/tegra20-common.h
+++ b/include/configs/tegra20-common.h
@@ -46,11 +46,11 @@
  * ramdisk_addr_r simply shouldn't overlap anything else. Choosing 49M allows
  *   for the FDT/DTB to be up to 1M, which is hopefully plenty.
  */
-#define CONFIG_LOADADDR 0x01000000
+#define CONFIG_SYS_LOAD_ADDR 0x01000000
 #define MEM_LAYOUT_ENV_SETTINGS \
        "scriptaddr=0x10000000\0" \
        "pxefile_addr_r=0x10100000\0" \
-       "kernel_addr_r=" __stringify(CONFIG_LOADADDR) "\0" \
+       "kernel_addr_r=" __stringify(CONFIG_SYS_LOAD_ADDR) "\0" \
        "fdtfile=" FDTFILE "\0" \
        "fdt_addr_r=0x03000000\0" \
        "ramdisk_addr_r=0x03100000\0"

diff --git a/include/configs/tegra210-common.h b/include/configs/tegra210-common.h
index 2817b1d..4f63100 100644 (file)
--- a/include/configs/tegra210-common.h
+++ b/include/configs/tegra210-common.h
@@ -38,11 +38,11 @@
  * ramdisk_addr_r simply shouldn't overlap anything else. Choosing 33M allows
  *   for the FDT/DTB to be up to 1M, which is hopefully plenty.
  */
-#define CONFIG_LOADADDR 0x80080000
+#define CONFIG_SYS_LOAD_ADDR 0x80080000
 #define MEM_LAYOUT_ENV_SETTINGS \
        "scriptaddr=0x90000000\0" \
        "pxefile_addr_r=0x90100000\0" \
-       "kernel_addr_r=" __stringify(CONFIG_LOADADDR) "\0" \
+       "kernel_addr_r=" __stringify(CONFIG_SYS_LOAD_ADDR) "\0" \
        "fdtfile=" FDTFILE "\0" \
        "fdt_addr_r=0x83000000\0" \
        "ramdisk_addr_r=0x83200000\0"

diff --git a/include/configs/tegra30-common.h b/include/configs/tegra30-common.h
index 6c5dc24..2beca3b 100644 (file)
--- a/include/configs/tegra30-common.h
+++ b/include/configs/tegra30-common.h
@@ -42,11 +42,11 @@
  * ramdisk_addr_r simply shouldn't overlap anything else. Choosing 49M allows
  *   for the FDT/DTB to be up to 1M, which is hopefully plenty.
  */
-#define CONFIG_LOADADDR 0x81000000
+#define CONFIG_SYS_LOAD_ADDR 0x81000000
 #define MEM_LAYOUT_ENV_SETTINGS \
        "scriptaddr=0x90000000\0" \
        "pxefile_addr_r=0x90100000\0" \
-       "kernel_addr_r=" __stringify(CONFIG_LOADADDR) "\0" \
+       "kernel_addr_r=" __stringify(CONFIG_SYS_LOAD_ADDR) "\0" \
        "fdtfile=" FDTFILE "\0" \
        "fdt_addr_r=0x83000000\0" \
        "ramdisk_addr_r=0x83100000\0"

diff --git a/include/configs/tplink_wdr4300.h b/include/configs/tplink_wdr4300.h
index f25f6dc..8ff57fb 100644 (file)
--- a/include/configs/tplink_wdr4300.h
+++ b/include/configs/tplink_wdr4300.h
@@ -17,7 +17,6 @@
 
 #define CONFIG_SYS_SDRAM_BASE          0xa0000000
 #define CONFIG_SYS_LOAD_ADDR           0xa1000000
-#define CONFIG_LOADADDR                        CONFIG_SYS_LOAD_ADDR
 
 #define CONFIG_SYS_INIT_RAM_ADDR       0xbd000000
 #define CONFIG_SYS_INIT_RAM_SIZE       0x8000

diff --git a/include/configs/udoo.h b/include/configs/udoo.h
index 2983693..ed8f31b 100644 (file)
--- a/include/configs/udoo.h
+++ b/include/configs/udoo.h
@@ -43,10 +43,10 @@
                        "setenv fdtfile imx6dl-udoo.dtb; fi; " \
                "if test ${fdtfile} = undefined; then " \
                        "echo WARNING: Could not determine dtb to use; fi\0" \
-       "kernel_addr_r=" __stringify(CONFIG_LOADADDR) "\0" \
-       "pxefile_addr_r=" __stringify(CONFIG_LOADADDR) "\0" \
+       "kernel_addr_r=" __stringify(CONFIG_SYS_LOAD_ADDR) "\0" \
+       "pxefile_addr_r=" __stringify(CONFIG_SYS_LOAD_ADDR) "\0" \
        "ramdisk_addr_r=0x13000000\0" \
-       "scriptaddr=" __stringify(CONFIG_LOADADDR) "\0" \
+       "scriptaddr=" __stringify(CONFIG_SYS_LOAD_ADDR) "\0" \
        BOOTENV
 
 #define BOOT_TARGET_DEVICES(func) \

diff --git a/include/configs/udoo_neo.h b/include/configs/udoo_neo.h
index b76d924..a4b8514 100644 (file)
--- a/include/configs/udoo_neo.h
+++ b/include/configs/udoo_neo.h
@@ -45,10 +45,10 @@
                        "setenv fdtfile imx6sx-udoo-neo-extended.dtb; fi; " \
                "if test $fdtfile = UNDEFINED; then " \
                        "echo WARNING: Could not determine dtb to use; fi\0" \
-       "kernel_addr_r=" __stringify(CONFIG_LOADADDR) "\0" \
-       "pxefile_addr_r=" __stringify(CONFIG_LOADADDR) "\0" \
+       "kernel_addr_r=" __stringify(CONFIG_SYS_LOAD_ADDR) "\0" \
+       "pxefile_addr_r=" __stringify(CONFIG_SYS_LOAD_ADDR) "\0" \
        "ramdisk_addr_r=0x84000000\0" \
-       "scriptaddr=" __stringify(CONFIG_LOADADDR) "\0" \
+       "scriptaddr=" __stringify(CONFIG_SYS_LOAD_ADDR) "\0" \
        BOOTENV
 
 #define BOOT_TARGET_DEVICES(func) \

diff --git a/include/configs/usbarmory.h b/include/configs/usbarmory.h
index a93a718..381b5d6 100644 (file)
--- a/include/configs/usbarmory.h
+++ b/include/configs/usbarmory.h
@@ -35,8 +35,7 @@
 #define CONFIG_FSL_IIM
 
 /* U-Boot memory offsets */
-#define CONFIG_LOADADDR                0x72000000
-#define CONFIG_SYS_LOAD_ADDR   CONFIG_LOADADDR
+#define CONFIG_SYS_LOAD_ADDR           0x72000000
 
 /* Linux boot */
 #define CONFIG_HOSTNAME                "usbarmory"

diff --git a/include/configs/verdin-imx8mm.h b/include/configs/verdin-imx8mm.h
index bd26a40..d395cf6 100644 (file)
--- a/include/configs/verdin-imx8mm.h
+++ b/include/configs/verdin-imx8mm.h
@@ -37,8 +37,7 @@
        "ramdisk_addr_r=0x46400000\0" \
        "scriptaddr=0x46000000\0"
 
-#define CONFIG_LOADADDR                0x40480000
-#define CONFIG_SYS_LOAD_ADDR           CONFIG_LOADADDR
+#define CONFIG_SYS_LOAD_ADDR           0x40480000
 
 /* Enable Distro Boot */
 #ifndef CONFIG_SPL_BUILD

diff --git a/include/configs/wandboard.h b/include/configs/wandboard.h
index bd64893..95a15cb 100644 (file)
--- a/include/configs/wandboard.h
+++ b/include/configs/wandboard.h
@@ -45,7 +45,7 @@
 #define CONFIG_EXTRA_ENV_SETTINGS \
        "console=ttymxc0\0" \
        "splashpos=m,m\0" \
-       "splashimage=" __stringify(CONFIG_LOADADDR) "\0" \
+       "splashimage=" __stringify(CONFIG_SYS_LOAD_ADDR) "\0" \
        "fdtfile=undefined\0" \
        "fdt_high=0xffffffff\0" \
        "initrd_high=0xffffffff\0" \
@@ -85,11 +85,11 @@
                        "setenv fdtfile imx6dl-wandboard-revb1.dtb; fi; " \
                "if test $fdtfile = undefined; then " \
                        "echo WARNING: Could not determine dtb to use; fi; \0" \
-       "kernel_addr_r=" __stringify(CONFIG_LOADADDR) "\0" \
-       "pxefile_addr_r=" __stringify(CONFIG_LOADADDR) "\0" \
+       "kernel_addr_r=" __stringify(CONFIG_SYS_LOAD_ADDR) "\0" \
+       "pxefile_addr_r=" __stringify(CONFIG_SYS_LOAD_ADDR) "\0" \
        "ramdisk_addr_r=0x13000000\0" \
        "ramdiskaddr=0x13000000\0" \
-       "scriptaddr=" __stringify(CONFIG_LOADADDR) "\0" \
+       "scriptaddr=" __stringify(CONFIG_SYS_LOAD_ADDR) "\0" \
        BOOTENV
 
 #define BOOT_TARGET_DEVICES(func) \

diff --git a/include/configs/warp7.h b/include/configs/warp7.h
index 8ed7d1d..c5e3c4d 100644 (file)
--- a/include/configs/warp7.h
+++ b/include/configs/warp7.h
@@ -107,7 +107,6 @@
                   "fi; " \
           "fi"
 
-#define CONFIG_SYS_LOAD_ADDR           CONFIG_LOADADDR
 #define CONFIG_SYS_HZ                  1000
 
 /* Physical Memory Map */

diff --git a/include/configs/work_92105.h b/include/configs/work_92105.h
index 2255958..e7472ed 100644 (file)
--- a/include/configs/work_92105.h
+++ b/include/configs/work_92105.h
@@ -92,7 +92,6 @@
 #define CONFIG_INITRD_TAG
 
 #define CONFIG_BOOTFILE                        "uImage"
-#define CONFIG_LOADADDR                        0x80008000
 
 /*
  * SPL

diff --git a/include/configs/x86-common.h b/include/configs/x86-common.h
index f6ff0c6..826aa1d 100644 (file)
--- a/include/configs/x86-common.h
+++ b/include/configs/x86-common.h
@@ -82,7 +82,6 @@
 #define CONFIG_ROOTPATH                "/opt/nfsroot"
 #define CONFIG_HOSTNAME                "x86"
 #define CONFIG_BOOTFILE                "bzImage"
-#define CONFIG_LOADADDR                0x1000000
 #define CONFIG_RAMDISK_ADDR    0x4000000
 #if defined(CONFIG_GENERATE_ACPI_TABLE) || defined(CONFIG_EFI_STUB)
 #define CONFIG_OTHBOOTARGS     "othbootargs=\0"

diff --git a/include/configs/xea.h b/include/configs/xea.h
index 1207f75..78ffcef 100644 (file)
--- a/include/configs/xea.h
+++ b/include/configs/xea.h
@@ -43,8 +43,7 @@
 /* Booting Linux */
 #define CONFIG_BOOTFILE                "uImage"
 #define CONFIG_BOOTCOMMAND     "run ${bootpri} ; run ${bootsec}"
-#define CONFIG_LOADADDR                0x42000000
-#define CONFIG_SYS_LOAD_ADDR   CONFIG_LOADADDR
+#define CONFIG_SYS_LOAD_ADDR           0x42000000
 
 /* Extra Environment */
 #define CONFIG_HOSTNAME                "xea"

diff --git a/include/configs/xpress.h b/include/configs/xpress.h
index 495ed2f..01c3ee3 100644 (file)
--- a/include/configs/xpress.h
+++ b/include/configs/xpress.h
@@ -23,7 +23,6 @@
 
 /* Miscellaneous configurable options */
 
-#define CONFIG_SYS_LOAD_ADDR           CONFIG_LOADADDR
 #define CONFIG_SYS_HZ                  1000
 
 /* Physical Memory Map */

diff --git a/include/env_default.h b/include/env_default.h
index 1ddd64b..66e203e 100644 (file)
--- a/include/env_default.h
+++ b/include/env_default.h
@@ -82,8 +82,8 @@ const uchar default_environment[] = {
 #ifdef CONFIG_BOOTFILE
        "bootfile="     CONFIG_BOOTFILE                 "\0"
 #endif
-#ifdef CONFIG_LOADADDR
-       "loadaddr="     __stringify(CONFIG_LOADADDR)    "\0"
+#ifdef CONFIG_SYS_LOAD_ADDR
+       "loadaddr="     __stringify(CONFIG_SYS_LOAD_ADDR)"\0"
 #endif
 #if defined(CONFIG_PCI_BOOTDELAY) && (CONFIG_PCI_BOOTDELAY > 0)
        "pcidelay="     __stringify(CONFIG_PCI_BOOTDELAY)"\0"