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 3ffc744928f3e987ec5bfa1128b3c894ffd61086..d8ed2278c62ea775a1ff60dd9ff7e8f3a53331c3 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 3f065ff315cd163483079986c269e27bfa4f22bc..b9a17adb128ccb3e724f9f32f02702ae1f3572f4 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 9612c70f8b47f40a00603ce7b480045704654ed1..6286d5ec285a21665e262213e5bef482805841b9 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 b3887f5d4602ac4f790468ac33eafc38139128f6..45d22086a88154c99c25a9c4090ebdcf83b7f381 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 569c66e52c0add337f2b17d2a4f284cf2bf0464c..e299437a82386bec25bfe5ea04d351ff71dceae1 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 1e620acea0a61aea5f6aaa3314b8cde88da43d10..82527da431e7e6a31c07c265506f5feb3663b4a9 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 d7e6b6cd2528954ee95336884b7ce7c4ecbf0d86..289283a39f75fa6cac86e3330ab429d9edb86e13 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 27a17bb9957e15364701838235c19116f101384c..f1828a28cae87ca9c2f4d08710e15b8b18fbd7f0 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 952896156d275af8343b6a15690717b6ae0b3502..ea3c39e604d0792f08731240e66bd7b902df724b 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 e4e43904238c518f597512a04459f9eb033c91c8..52b9cf57557d1ce4f026e3f65f95ae24c881469e 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 d21e4020a85101444158f550d781c706667b51d9..4fb22538c777b99c292ad67e59674f13f66714b7 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 8ef13fc9ac3e9eb6564eada4206c84f8bc241fa8..d1b4debae6f9c9a356ecac59df5042631bde2b1c 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 74f372ad2e353280dfa9f6bf3333f2d02d8bc51b..edf2ed8b44490ba769b0ec053484fffdd2bb4d72 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 6821cd3882a08500d0ad56faec88c7ff755f9ad5..96641152a1a8898ed070cd114f281183e7f2dd6b 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 d5bf813ebc68e3b656baec7472e694b00f6876a9..0486264fedb69d28e4884bcdc3e21fcc53bf4057 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 51083569a88d432a0f4957412a660e5498d806cd..92316765973e9f2cf0a175b76a72da561e3205c0 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 b04a03f76da048690379fc67c6520f2b9a8e24d8..d5bf92a0d0f789f2b9814b804681ad27a1a6d18e 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 2ad4ca34188ce5510ae8eac4796dea4786c25798..483cf09943f60fb872f4b522845a610b31928b3d 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 d1d74559aced4b76f24bbe7079684998142cffc5..b736d19e3ce5c8be22a033f96dc442f161d7b9ac 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 0c5a3af4cc4e7e51f010d25f465fe21e75c67e3b..96a1c6400c51f37e0b5aedd91b866dbe4a5749ef 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 b5412363610010cc06ae06b7008ea70804fa4de8..aacc70cd55153dc3132471f059b96c56f169c89e 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 2abbe7b2ba8357ed4b932d0387002f466da0af22..a3ec719b4d747e475be607010de28e1bafe8ab58 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 333d3f44e2e943eb17c768a1a9ede1d52c3618b1..e30b365a93dd6e3c33b6a99d3e1cc4da4cbe6340 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 37d4beefef0b933fea02ccbc806a9b7b24dae40f..bca995e16caa0d1bda0373bc188cff55159ccd69 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 15c50279ad931e66205a8a8ac46e6c8f011510f7..585834c9025dbc310e5ecc57358a681282547d4c 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 6e46d29c855221f6e7bec6deefa72ed1f4559550..8f9e9f8132f797469617a0bff4966250c9f0bbd5 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 51d18c5f108d4c17340dac69599e62f956b63851..e8495b387c6c4639f0d42ed1ce75248c0e0613bd 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 41ec15ff04e7754771eeafdaeff3e6b72f0ac98e..e569b90adb5735cce67cbb47ea682c38de0bd1a4 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 3799b4a99970ec79e737478cbe33cada3bc3afa2..4351bfe7d20569a47cfffaa2862243bd1656bba0 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 cb22b3c75a8ae66b065b75a846cce87f6fe8643c..27edb90153ce10d576b2833a6638c0627bb4f9e1 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 2b2ee95b70fdebf6165af22c42a75cc2e58b07c7..ca3709b940032cdf00efa71b42be80d875f1dd0e 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 5a7919e87c42f0ddb189a1f4cb92d6257bec1d36..4d9de07c84d8b283fba648924f3fd82791f734de 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 5bd440f1db33e524c295cdd7b3603d84dd1d0912..96fef9fd7fc0f66bf1a8d6d966ff4449736eb235 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 d03527f40f27a200df7ee3dbfbd5a07677e3bc87..58d83e5f144f5e81b8ea18dc4dde472eb50fe1af 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 e9205291c8f9482080afcde3147967fedf304c92..19190029daab92a3896a2e07453ff07d40f1e0d7 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 12ae1b7317744c3fc9c5e562d86485aa62fdd896..79b0cd7a68ab5b9dcf965033a8765abf9f917392 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 9cfeb5ae308dc2d5a0050f6735f6f340d43f4262..ab1fbc83af670ac10c9265e613f9ebc8c730f00e 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 d9be1c38c44afbb00700382481be274d20d04530..8e4296b9d33e238aae72741f5d668aff1c64ca8a 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 8a78ab3e15507433f3953657b22dc70049fc2f10..3b74aa96cd1bbbcb5378d9e6ce41238069a27bd9 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 3b535e53864cfd42530b8999cf8b9a72a0987ab2..220da5b80ad5484acb576b0d6ea93009f585254e 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 a872d48154a4eff49747a911757314efb36f302e..8685f6c270a0c180df451ef58fa5d1c13b088640 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 e650cf6daca67e2fb922ddac18b4b21a63bb8426..dc01de74e3ba2cfde4c1c0ae82b1ce6d9493d3c2 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 b4b34fd1ce334709d0e80c1e0465dd4b3802c0fe..6caeff2a1c05c6596a56b83fbd16d3f44d3baa07 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 f031f154f8dfff9f676705706f464982304e76ef..4bf0c60aab85b9b3204e9e9b783b5ca52a992698 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 8570b928518353739c5e0d1224c2822d3dead002..ba0432f43454524e011d1e2f79f8610aea0404f2 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 5678f0a77bb7eba2ce652f233c6b70cacf05cd0d..8eb3bb9b72291e68ffe8f75e2d0d12f10b0cf917 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 3cc3b8c0ae2c0524302caceb3badfcffd48aaa3d..06577dffb477943be707f5d1f68c348aa7ea14c4 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 d4f4910b31b780156bf28d480a3db6addb8727f2..be37b50cbffbc7ba95c2b7fba6c0c07a9058754b 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 8c5c06162088c40c4ca901ff273c1b1220096848..c63e2d5a53adffe77b4180dfa59afedd433567ce 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 bfe83b8cba530ba9cc65286aac06b8e10f1b0d0d..50ebc1510829a5f12c2cf28b9c0c16f13334e2a3 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 6b992f9ab8bff8b9c11e39abb671284da9abf1e9..cdca31e7cce7cbadc727ca0b1059f4d60e00765b 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 4027f329d30bbafebe87014f19c09f66dc2c853e..e5af32a01314b6b5206f2649d6bf582dff7fe53b 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 4a3706d9960c010447bc6aac0899972f747caf96..a390bff3353ca211cfc74cfbed30b6b587a66362 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 f5b3b67ab84dde86914a96210c138562d9cee87e..c994d717f57484e2b0d2c64d9176aea2bfe81c83 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 13705f63df55c9755e03e723d30d58ac7bedd808..7423e283840b4527c1d7b8bf63f12708001a7bc1 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 9cd074661628446ab8b248c323794efda070a940..6aa7c2a5b9b3b96d79d3b4e9ecc0e5b479dfa72f 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 6d822fa82562c11b3c5de7e40533bd3607ed80bd..9d63b8c4f1435847560a7936c9c1247eabbb969f 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 a0cc2c897ba164f7c2cd6a18a247cc0730ef676b..ed3307166e32ae564670c9616dc2a5008eea645d 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 9ce60fd51b3ac556754afa20a5a2f8ee55fb4638..0975e786dc226573aaaf6bb9315b4ff1df615f63 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 42f9041b5dd3053c4aa1c72bd8c564ffc4ecb64a..feb96b41b367cf3cf31112a7462690c133c39a36 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 da5cf3d61f1638a58ab669668cad5bd3792b4ebf..32c50cd066921c97ab7859d3e1872a6f44ed03c5 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 9db3bd5f58d6c6d270b91c1d5ce8fcf092d51544..a3267c47ae2a1af27d0642ff01486657fa89f4e6 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 54e0560406e890a07b9b474e6e88090200ee53f7..fc86ba3dcca11954afae14f730d5d91007e2edbe 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 7f86f2befc6a3e1b90077573d2e569c555a2c8bb..d246115b32b0e2907daa43b189dad0590eb81707 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 99e73a9446b6e3fbff318d8ad2c97a190f12cd95..04ad3db8ed75cb4b838f9add5341b6db9a884cde 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 fcbf8eeb34aac1c31d2775018de0a316949a7cd6..9c7bf4be53ce4acab17bc95c8ee72ca04dc01e45 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 a7d623a9b9e358c97695aca89ec5344bcc566fdd..bab8021a55aa3555be8ae0b7c7e73fe378396380 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 32f8773b241eda0bda9409ee819498d77e0cdb99..154ae693c542eba05da41cb162266aaf56fe42ae 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 4fb44774b0c1685ddda9a6371d5fa51f0e41a5e7..a2b1ab10d9b41a29098a3c1350685a14286bc031 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 c8d661fb3ee118154d75854c021434f4a220e27d..c4787ab31849180b8c8ce9c0e5de995948913965 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 1ba69d9a5d0de6019ea11fb6c6b7cd7667042074..93abae02fcee51f7eff189a01daea42cf476bdf5 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 a40e42842d2f200c8f9e0f0b1fc6a22b770f6364..697300756823dbe2dcca2c8cc11e29608b3fa9b1 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 749e880f36ff8aafac9ab43362c2e11b5a5d5a62..91023f44a52638c20878a1ee114253aa99a06adb 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 5adbe1ca3916ab8cb719d633dd23cfca00eba2be..041b78855d50b990a7e62c7ac7f0be5ff56d79c1 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 a4a4739d0dd7a910bc9e52de67ca0e4da1162f83..ca138382c5a21c5fb15f2caf9a23c4c2774add96 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 db601c03dacdbcb828547ee2c6c3c96ea0f291a1..1bcd40dd20fe3e806b7756ca90ee481de88fe250 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 f43a8415e1aa854c603574e5e9930378722f75b9..f5deba33e238e62f3f2bb1189961a3c151287b13 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 f015d10d9bdb094cc567cb06185ccebc060726d1..9820d6ac58517437121dbb4608ec3091a272417c 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 9895279749db978dfb20dae0f75824ed9900e7c0..6ceb9af264e69e89f4c5f436b265056bb51a89e8 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 08a4d01f5524fd1f513f8662b68a2b936a588cb0..53f2c3ad368bbd8d3c5b119ae981fe5717fc68ba 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 7cd388fa10115d0d9e2405a5d6cedb1d618abae6..8d667d07306c59b1709c270067eadf9fa069be0f 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 4e32442bb5a5ba64efe84db9f3ceaedcbeec97c6..a3005460e583c08fdc79df7b3cb057c344dd75c3 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 2ee41aeff1b7039ec394de2126232d8a3edddbbb..ba24cd1e666b92f2be927f0aaf990808a0363597 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 3f13e60531cfd7d746d5293a2465b7d301aebffb..ad0e4abafbf13611ff223fe7a9f0153cf706455c 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 21f3277d5c43c363c05db5f7ba4a08792086ee47..5d51ff1af9c801e3ab743dc721f2626d765525e2 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 3574d6545164a37bd3626e9a23e39c24d2ea67ae..38609cf049b87012e4f2e7022dfed0c630c4162d 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 93158fb464696623fbdf110d39a329c0ffd8a60b..2e9958bca60cb17a9010858e60c8ebae7aa70e21 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 574e647aadfd54bab8421d6042b2ad8cd8cec415..deb928f91d9d0844f05e5c20e7449d1bec2cd6fb 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 dae3a5c5380fbaff089fb3815db8f87a47ce6bf8..ca62d0ff159adb1b8a2dca4788ae48f88bd21e0d 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 a4504ee27ae25366b65f1145cef092c4e5c9a005..ac212aea3b15f927845028734e4ef18035c96d49 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 9e5083b0d876e368a45f67057459f8f6e3e87125..9b80646d3b52babe574caf844daca9494edb5948 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 ac579f3338a360c22f6d0b5c8cf1509f4d92d2db..eb153926926f4d772924627a3a8a9e9793fc40ed 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 0065fdc157b64fb4fe109ce3644665b7fbb50cea..2ce852a2f3ede47fa63b158a71b846be23f7d2b4 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 0a62ada31c30540718168d9a13e97070dfd71c45..03dbdfcb3da65b1e2d65c0fe306a457572e8f7a8 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 3d8769038276c69c61faec57e381920170d37f05..8af1338880c70fb399b6015ca8c8553e3c56228a 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 4766721ba21e66e9fc61b22b14e50f904a4b5463..ee7117f8d192d8a64c3bb55b72a1e26932378d7a 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 28672c4f94c493d5bf2b96ce848205382833df0a..6c19997793edbe5f1af816cbaa6fe07f7ee5f0f2 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 0c3103082cc8e830337f0893bcba1c3098558239..ae0e6a0bbbc6fafbbea477cfaf01c56aec28a636 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 5ef16fb278eec4f55d831ede558f1bb8a5d5c17d..b68ae1275f1c255b79ddd05606b7d7d39acb1f63 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 c82b4c735a4200dfd17f7cb4decffb946c22f872..c6e1461783275a6a60e704688b501c9f6dd362b0 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 011284ee5d84b625c5af685ab8cb523823492dce..a866791c6686098ac35b8a87a1c238fd64dd833f 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 3be9b8ff55ffea11b5ce7629d5f8bb8253ce79ff..d90ecf47c1a48d95fad9ab20462ed08225a88b62 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 61217bbe7956d2c7757301a2251e5823b99aa6b6..69d582594e25dfe560a446ba0f97cc35830497e1 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 394fb15f3136693781c97da3f6bf4557e9bcc730..495753ba118223c5c2243f52b5e53eb343705fe5 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 2fb1634a7de4b2f4c8eb340ac098f4f98e184981..d7ec8d00805afe04b508810496a3fde2e8092d83 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 68831a0d463e0440df8d553bde25a94e49d1d528..7ac71aa9a286d832ff470f01d614da63c8f76a1c 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 4f4d50131f5619fce60b52ee1150135d0b2a7617..cb3441ee5b313f477ba195edce8298c412b24543 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 fee0c3d51030c88b7351de8212ab3bf94406b3ab..a1549cd048277d38959796321f7dfd898ea4442a 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 960ff982d8b7d9d99cd93fd36eccf13447e9a942..0b21c590cf63bf0b5dba2dcbc7a69e962d739a5c 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 987335aa70d211b7ff5a83e13e8d65ba94eb671d..add7835528a388dec17cb18d80f40b2db1319d7c 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 95eb707c545746f2e89ae94096b668ce1330e434..d0338fad051c51a91a76a0341612dd28bbc77e4e 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 6199f0d72e7625c0895153425d629d153e7e00a6..96191708eae72b6b2378353be1da43dbb9532022 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 a0f7a3ddbec55b6e54f7dd6a3bc5f296b3e1d4d1..20457e3f24a167bc963bd8181bd31d393394fc44 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 0b478cb02f93ca57d9e15b21cab71c6695c1455e..2851263dfd63a06d0109b23840f83fdcd1cda3af 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 a7bfcf8f0e861552fb6d91c06096d51a441c693d..e802644fdc686cc693b218fea6e7d7c74687f887 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 b2e1204e0fadbe537159ba3c031856dd814250b1..5159ff375a90dbe901a6aeb842cdc2257a8b2618 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 f94e9d89799ff9438d29bb2a269ea11c13336311..2aaeeae5f8969e106e05b2a4869a4b38260e37c4 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 2bad3a9d1bd21112b41ebd059288ac8b95e34861..f234455f8429efc22f44a232f30baa24214db221 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 522b41c02db12d96100bb85cf0adc1dc86fbb6fe..b6d5d494903814ae0271f66b39b8b9a262963988 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 6f7b46e49b3fafa9436bb147397f5ead9a72ec3b..0ab2a2c108864966d9cd7c034a777e0bca5d2a16 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 645e66e6b09fa53b11e453cf5f642d309c3fa7ea..b0cd79eeb4a18cd91c6937722e62cc6c30a8713b 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 c25d6bd82be270cedfccd96f63539444aa848f12..c066eb3c1e737db20cdbed09a4be2a75d76eaf6c 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 af6137aeb16a01b61222729e9342814d70a92b59..8d62d1307e571b780bd5c38e016bf4362e489422 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 028db2a09ec14f13e6977eba25686e33a26bae63..72ba0c52e9944ea2cd5ac33fb83b30912c9b7a38 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 bffedcb75077627b2e5ce5743a24654f35e7b1f8..1cd97cc863b0262af5a8f960abf021984aa93734 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 21108e344756f649b1f87c40976af3e648cf1345..36ddd41d867290b8f858f29ef104443ff9fe3164 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 d85f98fbd46cc02d6f631668a102302fd08b8858..c200bf960d8b6bc5ef840d3f5c9bd970dbf49248 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 9919d292dc7d3319957e9d1ced0b41a3ff71463d..5373b554817526d4df74aea42339c5a14ddc1476 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 c4da5947f3253ac33e7bad32725fdd2192af32d0..c3cbac3027233dde7db88b3cf3442f82c3656bbc 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 50c59617037859db572251ea08e1e84b0907b6f7..2c77341e457039c729883c90da7484ffab08c551 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 aa411b2916bb9e112f246a78cce5a03a94fc3a3f..2e9be25d8b5de7404af41783fbefe913e74ddd80 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 972999949a03734ab4523380cfc64b2dcbc250b0..b66d2e52b5211a4f01dedd35a856f01cc98e8d41 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 7faea150a9ef0a85967f5479454f3334d5b8f67c..22977a0f1ed603d2fc32958cc1c86270de4feb24 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 ccaa050ae597324c0e767bbfae23111095c5be58..ea406b4c82c54ad48bd43dd58827c3f3ab040363 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 06976d804c7fdc3d70b1208adab908eea54a6929..16799826211ec5daa1a64005287fbda6aeba30fc 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 5480f278c7be6d199764074ff6554749f0723619..373709f12ae587ecb8d01a175872cd00a9fec4d3 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 945d0ecc73749e9e2be295dbedacde88be4a01de..3f0bc2ea6ab9e6d36f9d7c5e5a113b737c9ae397 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 33b34ee0cd3b74faeda909d8c4c5dcaf297194c7..83fa1a4e5bbf37d8894725cadf549b7bfe8770df 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 9d029fbcc6f04f035315c7f6ea2ab7876958cb45..64d22cdafc30de6c99a1e110649962117034b70c 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 fefdb2dd152563702d60940277dce8fdba1228cf..45686febfd75aa6877d880092a628b24cdd09144 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 ba9f05a61b40dc0e20c340b02735d1a82d9e2bca..6a0199e79dadbd8eeb438e59ffb6f155edceb98d 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 08d050adfa5178ed3d68ef0a3839caa4acc2aa6f..b28e371e68bf32553b71f0122165fa33d4250e66 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 6e10dbdfe945766f93e2418c63fe3c373883363b..28a4c4da9f4bc6d633124fd29558d5b470b24ae5 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 268d39c7ad6a391c45f4c175e148f429bba2c1f2..57aba247237e64fc067b262b1464b1ddebc11316 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 3fd54611677c9e387d93b1839c440a7ff7e1b5c5..1f84724ee440f8ecb5809dad6c32b7ed6b586af2 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 b372838be82f409ebe2173513223a63c4bd785ed..10771ab2f37424132c08fbddf26e2c768d771f37 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 f42b0df1cf63f85e5d8c91bb77f5f7466498fdc4..d9a9f2a1fc18c5e77a56289fd59153467c1bc8db 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 69adf6462ac37de7b73f6b8656594c6594934c50..fe2d6886558c529d2b4a4ec77093a71d1d872b12 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 9d751b6740433c2d3babbce185e853cd337a3593..c3418b6e4cabf314910da347810320691cc89588 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 0eb8f92809181df96277df40dc084e28a8f544d0..4d2ea182e6025044c070b806a5841dd35c9345f3 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 dbf42203de27510e2a20d71240a27149c2f7cab1..59eb4fe703c6e0bf60df161749763f34b2365605 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 fdd89969554150ba235d2a34bd20d7f47f9ad91e..d61962a8af8b1f89b890c72ac5f14caacf2a3869 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 2817b1dac79a8771841badc78096531f5ad5d1ff..4f631001a2109ce589429f5a0887ce4d11699b01 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 6c5dc24b26664e6831ba27d93a42487310b5c26b..2beca3b16662bce39f4213dbb886cf19ac8206ff 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 f25f6dccb5c37a378c2a4bde126d6e7dc20e8198..8ff57fb91b7acb9a0e4e6e3ff3cf0dcdd4b60b0d 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 298369373ab3efd532bcb28ae97baef9ffaf4454..ed8f31b921a2397f7dcb49c69ec7dd48ef476ce1 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 b76d924ea8de14c09c76515a9fc9d2791abb53d1..a4b8514c4e6eae8a93138050c2ff661560c45736 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 a93a71850a863f943d5c70b420d7dfd1b0877382..381b5d635422a5f79331854fb7d1a53c8c763451 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 bd26a40e85468baa7f3a54eb713d81a4249f9b3e..d395cf6377b0dee04fb799feb462a54a095baf69 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 bd64893fc7799830f1a97483eab55dfd4b9ced02..95a15cb2df03d4b3e13fd91bac811ae147d2cd73 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 8ed7d1db5551acbc2383a40b89f86652c0b63dac..c5e3c4dae325499b1b95a4276fc096a0f9ae7cee 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 2255958db036186e2209c4b064cfd530d23ab0aa..e7472ed3ecf63755a8ecc8137c81c4751e54114a 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 f6ff0c6d21fe979ab3c750d05d0571f9659d6f16..826aa1d47477bf4610dbd2ce20d1ffedb2f66e93 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 1207f75017b490e46cbb96fe08fe3f1d07eaa3d1..78ffcefd3388f998591826cb5a7db7ac7d29d0ee 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 495ed2ff541a004002cd91811fe6abf87d34f304..01c3ee3ddb378893b9cd77b9d2e961ecda6be8ec 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 1ddd64ba8ffe20fed953586ea10cf18ce9e9715b..66e203eb6e4e3c7b63024f345566dff894fedb74 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"