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>
This commit is contained in:
Tom Rini 2021-08-23 10:25:30 -04:00
parent 2f45b3041e
commit 72d81360aa
166 changed files with 141 additions and 355 deletions

View file

@ -61,6 +61,5 @@
* MISC * MISC
*/ */
#define CONFIG_SYS_LOAD_ADDR 0xcc000000 /* Half of RAM */ #define CONFIG_SYS_LOAD_ADDR 0xcc000000 /* Half of RAM */
#define CONFIG_LOADADDR CONFIG_SYS_LOAD_ADDR
#endif /* __CONFIG_H */ #endif /* __CONFIG_H */

View file

@ -61,6 +61,5 @@
* MISC * MISC
*/ */
#define CONFIG_SYS_LOAD_ADDR 0xd4000000 /* Half of RAM */ #define CONFIG_SYS_LOAD_ADDR 0xd4000000 /* Half of RAM */
#define CONFIG_LOADADDR CONFIG_SYS_LOAD_ADDR
#endif /* __CONFIG_H */ #endif /* __CONFIG_H */

View file

@ -274,8 +274,6 @@
#define CONFIG_ROOTPATH "/nfsroot/rootfs" #define CONFIG_ROOTPATH "/nfsroot/rootfs"
#define CONFIG_BOOTFILE "uImage" #define CONFIG_BOOTFILE "uImage"
#define CONFIG_LOADADDR 800000 /* default location for tftp and bootm */
#define CONFIG_EXTRA_ENV_SETTINGS \ #define CONFIG_EXTRA_ENV_SETTINGS \
"netdev=eth0\0" \ "netdev=eth0\0" \
"hostname=mpc8349emds\0" \ "hostname=mpc8349emds\0" \

View file

@ -331,8 +331,6 @@
#define CONFIG_ROOTPATH "/nfsroot/rootfs" #define CONFIG_ROOTPATH "/nfsroot/rootfs"
#define CONFIG_BOOTFILE "uImage" #define CONFIG_BOOTFILE "uImage"
#define CONFIG_LOADADDR 800000 /* default location for tftp and bootm */
#define CONFIG_EXTRA_ENV_SETTINGS \ #define CONFIG_EXTRA_ENV_SETTINGS \
"netdev=eth0\0" \ "netdev=eth0\0" \
"hostname=mpc8349emds\0" \ "hostname=mpc8349emds\0" \

View file

@ -347,9 +347,6 @@
#define CONFIG_UBOOTPATH "u-boot.bin" #define CONFIG_UBOOTPATH "u-boot.bin"
#define CONFIG_FDTFILE "mpc8379_rdb.dtb" #define CONFIG_FDTFILE "mpc8379_rdb.dtb"
/* default location for tftp and bootm */
#define CONFIG_LOADADDR 800000
#define CONFIG_EXTRA_ENV_SETTINGS \ #define CONFIG_EXTRA_ENV_SETTINGS \
"netdev=" CONFIG_NETDEV "\0" \ "netdev=" CONFIG_NETDEV "\0" \
"uboot=" CONFIG_UBOOTPATH "\0" \ "uboot=" CONFIG_UBOOTPATH "\0" \

View file

@ -316,8 +316,6 @@
#define CONFIG_GATEWAYIP 192.168.1.1 #define CONFIG_GATEWAYIP 192.168.1.1
#define CONFIG_NETMASK 255.255.255.0 #define CONFIG_NETMASK 255.255.255.0
#define CONFIG_LOADADDR 200000 /* default location for tftp and bootm */
#define CONFIG_EXTRA_ENV_SETTINGS \ #define CONFIG_EXTRA_ENV_SETTINGS \
"netdev=eth0\0" \ "netdev=eth0\0" \
"consoledev=ttyS0\0" \ "consoledev=ttyS0\0" \

View file

@ -442,8 +442,6 @@ extern unsigned long get_clock_freq(void);
#define CONFIG_GATEWAYIP 192.168.1.1 #define CONFIG_GATEWAYIP 192.168.1.1
#define CONFIG_NETMASK 255.255.255.0 #define CONFIG_NETMASK 255.255.255.0
#define CONFIG_LOADADDR 1000000 /*default location for tftp and bootm*/
#define CONFIG_EXTRA_ENV_SETTINGS \ #define CONFIG_EXTRA_ENV_SETTINGS \
"hwconfig=fsl_ddr:ecc=off\0" \ "hwconfig=fsl_ddr:ecc=off\0" \
"netdev=eth0\0" \ "netdev=eth0\0" \

View file

@ -305,8 +305,6 @@
#define CONFIG_GATEWAYIP 192.168.1.1 #define CONFIG_GATEWAYIP 192.168.1.1
#define CONFIG_NETMASK 255.255.255.0 #define CONFIG_NETMASK 255.255.255.0
#define CONFIG_LOADADDR 200000 /* default location for tftp and bootm */
#define CONFIG_EXTRA_ENV_SETTINGS \ #define CONFIG_EXTRA_ENV_SETTINGS \
"netdev=eth0\0" \ "netdev=eth0\0" \
"consoledev=ttyCPM\0" \ "consoledev=ttyCPM\0" \

View file

@ -639,9 +639,6 @@ extern unsigned long get_sdram_size(void);
#define CONFIG_BOOTFILE "uImage" #define CONFIG_BOOTFILE "uImage"
#define CONFIG_UBOOTPATH u-boot.bin/* U-Boot image on TFTP server */ #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 \ #define CONFIG_EXTRA_ENV_SETTINGS \
"hwconfig=" __stringify(CONFIG_DEF_HWCONFIG) "\0" \ "hwconfig=" __stringify(CONFIG_DEF_HWCONFIG) "\0" \
"netdev=eth0\0" \ "netdev=eth0\0" \

View file

@ -481,9 +481,6 @@ unsigned long get_board_sys_clk(unsigned long dummy);
#define CONFIG_BOOTFILE "uImage" #define CONFIG_BOOTFILE "uImage"
#define CONFIG_UBOOTPATH u-boot.bin #define CONFIG_UBOOTPATH u-boot.bin
/* default location for tftp and bootm */
#define CONFIG_LOADADDR 1000000
#define __USB_PHY_TYPE utmi #define __USB_PHY_TYPE utmi
#define CONFIG_EXTRA_ENV_SETTINGS \ #define CONFIG_EXTRA_ENV_SETTINGS \

View file

@ -612,7 +612,6 @@ unsigned long get_board_sys_clk(void);
#define CONFIG_ROOTPATH "/opt/nfsroot" #define CONFIG_ROOTPATH "/opt/nfsroot"
#define CONFIG_BOOTFILE "uImage" #define CONFIG_BOOTFILE "uImage"
#define CONFIG_UBOOTPATH u-boot.bin /* U-Boot image on TFTP server */ #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 #define __USB_PHY_TYPE utmi
#ifdef CONFIG_ARCH_T1024 #ifdef CONFIG_ARCH_T1024

View file

@ -677,9 +677,6 @@ $(SRCTREE)/board/freescale/t104xrdb/t1042d4_sd_rcw.cfg
#define CONFIG_BOOTFILE "uImage" #define CONFIG_BOOTFILE "uImage"
#define CONFIG_UBOOTPATH "u-boot.bin" /* U-Boot image on TFTP server*/ #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 __USB_PHY_TYPE utmi
#define RAMDISKFILE "t104xrdb/ramdisk.uboot" #define RAMDISKFILE "t104xrdb/ramdisk.uboot"

View file

@ -610,8 +610,6 @@ unsigned long get_board_sys_clk(void);
#define CONFIG_BOOTFILE "uImage" #define CONFIG_BOOTFILE "uImage"
#define CONFIG_UBOOTPATH "u-boot.bin" /* U-Boot image on TFTP server */ #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 __USB_PHY_TYPE utmi
#define CONFIG_EXTRA_ENV_SETTINGS \ #define CONFIG_EXTRA_ENV_SETTINGS \

View file

@ -559,8 +559,6 @@ unsigned long get_board_sys_clk(void);
#define CONFIG_BOOTFILE "uImage" #define CONFIG_BOOTFILE "uImage"
#define CONFIG_UBOOTPATH "u-boot.bin" /* U-Boot image on TFTP server */ #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 __USB_PHY_TYPE utmi
#define CONFIG_EXTRA_ENV_SETTINGS \ #define CONFIG_EXTRA_ENV_SETTINGS \

View file

@ -229,9 +229,6 @@
#define CONFIG_BOOTFILE "uImage" #define CONFIG_BOOTFILE "uImage"
#define CONFIG_UBOOTPATH "u-boot.bin" /* U-Boot image on TFTP server*/ #define CONFIG_UBOOTPATH "u-boot.bin" /* U-Boot image on TFTP server*/
/* default location for tftp and bootm */
#define CONFIG_LOADADDR 1000000
#define HVBOOT \ #define HVBOOT \
"setenv bootargs config-addr=0x60000000; " \ "setenv bootargs config-addr=0x60000000; " \
"bootm 0x01000000 - 0x00f00000" "bootm 0x01000000 - 0x00f00000"

View file

@ -430,9 +430,6 @@
#define CONFIG_BOOTFILE "uImage" #define CONFIG_BOOTFILE "uImage"
#define CONFIG_UBOOTPATH u-boot.bin /* U-Boot image on TFTP server */ #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) #if defined(CONFIG_DONGLE)
#define CONFIG_EXTRA_ENV_SETTINGS \ #define CONFIG_EXTRA_ENV_SETTINGS \

View file

@ -70,9 +70,7 @@
"${blkcnt}; fi\0" "${blkcnt}; fi\0"
/* Link Definitions */ /* Link Definitions */
#define CONFIG_LOADADDR 0x80280000 #define CONFIG_SYS_LOAD_ADDR 0x80280000
#define CONFIG_SYS_LOAD_ADDR CONFIG_LOADADDR
#define CONFIG_SYS_INIT_SP_ADDR 0x80200000 #define CONFIG_SYS_INIT_SP_ADDR 0x80200000

View file

@ -97,9 +97,7 @@
"vidargs=video=imxdpufb5:off video=imxdpufb6:off video=imxdpufb7:off\0" "vidargs=video=imxdpufb5:off video=imxdpufb6:off video=imxdpufb7:off\0"
/* Link Definitions */ /* Link Definitions */
#define CONFIG_LOADADDR 0x89000000 #define CONFIG_SYS_LOAD_ADDR 0x89000000
#define CONFIG_SYS_LOAD_ADDR CONFIG_LOADADDR
#define CONFIG_SYS_INIT_SP_ADDR 0x80200000 #define CONFIG_SYS_INIT_SP_ADDR 0x80200000

View file

@ -71,8 +71,7 @@
#define CONFIG_NETMASK 255.255.255.0 #define CONFIG_NETMASK 255.255.255.0
#undef CONFIG_SERVERIP #undef CONFIG_SERVERIP
#define CONFIG_SERVERIP 192.168.10.1 #define CONFIG_SERVERIP 192.168.10.1
#define CONFIG_SYS_LOAD_ADDR 0x12000000
#define CONFIG_LOADADDR 0x12000000
#ifndef CONFIG_SPL_BUILD #ifndef CONFIG_SPL_BUILD
#define BOOT_TARGET_DEVICES(func) \ #define BOOT_TARGET_DEVICES(func) \
@ -154,7 +153,7 @@
"load ${interface} ${drive}:1 ${loadaddr} flash_blk.img && " \ "load ${interface} ${drive}:1 ${loadaddr} flash_blk.img && " \
"source ${loadaddr}\0" \ "source ${loadaddr}\0" \
"splashpos=m,m\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" "vidargs=mxc_hdmi.only_cea=1 fbmem=32M\0"
/* Miscellaneous configurable options */ /* Miscellaneous configurable options */
@ -163,8 +162,6 @@
#undef CONFIG_SYS_MAXARGS #undef CONFIG_SYS_MAXARGS
#define CONFIG_SYS_MAXARGS 48 #define CONFIG_SYS_MAXARGS 48
#define CONFIG_SYS_LOAD_ADDR CONFIG_LOADADDR
/* Physical Memory Map */ /* Physical Memory Map */
#define PHYS_SDRAM MMDC0_ARB_BASE_ADDR #define PHYS_SDRAM MMDC0_ARB_BASE_ADDR

View file

@ -63,7 +63,6 @@
* Environment configuration * Environment configuration
*/ */
#define CONFIG_BOOTFILE "uImage" #define CONFIG_BOOTFILE "uImage"
#define CONFIG_LOADADDR CONFIG_SYS_LOAD_ADDR
/* /*
* Console configuration * Console configuration

View file

@ -20,8 +20,7 @@
/* Boot Linux */ /* Boot Linux */
#define CONFIG_BOOTFILE "uImage" #define CONFIG_BOOTFILE "uImage"
#define CONFIG_BOOTCOMMAND "bootm" #define CONFIG_BOOTCOMMAND "bootm"
#define CONFIG_LOADADDR 0x42000000 #define CONFIG_SYS_LOAD_ADDR 0x42000000
#define CONFIG_SYS_LOAD_ADDR CONFIG_LOADADDR
/* Extra Environment */ /* Extra Environment */
#define CONFIG_EXTRA_ENV_SETTINGS \ #define CONFIG_EXTRA_ENV_SETTINGS \

View file

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

View file

@ -20,8 +20,7 @@
#define CONFIG_BOARD_POSTCLK_INIT #define CONFIG_BOARD_POSTCLK_INIT
#define CONFIG_MXC_GPT_HCLK #define CONFIG_MXC_GPT_HCLK
#define CONFIG_LOADADDR 0x10700000 #define CONFIG_SYS_LOAD_ADDR 0x10700000
#define CONFIG_SYS_LOAD_ADDR CONFIG_LOADADDR
/* MMC */ /* MMC */
#define CONFIG_FSL_USDHC #define CONFIG_FSL_USDHC

View file

@ -127,8 +127,7 @@
"reset;" "reset;"
/* Default location for tftp and bootm */ /* Default location for tftp and bootm */
#define CONFIG_LOADADDR 0x80280000 #define CONFIG_SYS_LOAD_ADDR 0x80280000
#define CONFIG_SYS_LOAD_ADDR CONFIG_LOADADDR
#define CONFIG_SYS_INIT_SP_ADDR 0x80200000 #define CONFIG_SYS_INIT_SP_ADDR 0x80200000
/* On CCP board, USDHC1 is for eMMC */ /* On CCP board, USDHC1 is for eMMC */

View file

@ -147,9 +147,7 @@
"else booti ${loadaddr} - ${fdt_addr}; fi" "else booti ${loadaddr} - ${fdt_addr}; fi"
/* Link Definitions */ /* Link Definitions */
#define CONFIG_LOADADDR 0x80280000 #define CONFIG_SYS_LOAD_ADDR 0x80280000
#define CONFIG_SYS_LOAD_ADDR CONFIG_LOADADDR
#define CONFIG_SYS_INIT_SP_ADDR 0x80200000 #define CONFIG_SYS_INIT_SP_ADDR 0x80200000

View file

@ -24,7 +24,6 @@
#define CONFIG_SYS_SDRAM_BASE 0x80000000 /* cached (KSEG0) address */ #define CONFIG_SYS_SDRAM_BASE 0x80000000 /* cached (KSEG0) address */
#define CONFIG_SYS_INIT_SP_OFFSET 0x400000 #define CONFIG_SYS_INIT_SP_OFFSET 0x400000
#define CONFIG_SYS_LOAD_ADDR 0x81000000 #define CONFIG_SYS_LOAD_ADDR 0x81000000
#define CONFIG_LOADADDR CONFIG_SYS_LOAD_ADDR
#define CONFIG_SYS_MONITOR_BASE CONFIG_SYS_TEXT_BASE #define CONFIG_SYS_MONITOR_BASE CONFIG_SYS_TEXT_BASE

View file

@ -97,7 +97,6 @@
"echo eMMC boot attempt ...; run emmcbootscript; run emmcboot; " \ "echo eMMC boot attempt ...; run emmcbootscript; run emmcboot; " \
"echo USB boot attempt ...; run usbbootscript; " "echo USB boot attempt ...; run usbbootscript; "
#define CONFIG_SYS_LOAD_ADDR CONFIG_LOADADDR
#define CONFIG_SYS_HZ 1000 #define CONFIG_SYS_HZ 1000
/* Physical Memory Map */ /* Physical Memory Map */

View file

@ -43,9 +43,9 @@
"initrd_high=0xffffffff\0" \ "initrd_high=0xffffffff\0" \
"fdt_addr_r=0x18000000\0" \ "fdt_addr_r=0x18000000\0" \
"ramdisk_addr_r=0x13000000\0" \ "ramdisk_addr_r=0x13000000\0" \
"kernel_addr_r=" __stringify(CONFIG_LOADADDR) "\0" \ "kernel_addr_r=" __stringify(CONFIG_SYS_LOAD_ADDR) "\0" \
"pxefile_addr_r=" __stringify(CONFIG_LOADADDR) "\0" \ "pxefile_addr_r=" __stringify(CONFIG_SYS_LOAD_ADDR) "\0" \
"scriptaddr=" __stringify(CONFIG_LOADADDR) "\0" \ "scriptaddr=" __stringify(CONFIG_SYS_LOAD_ADDR) "\0" \
"fdtfile=undefined\0" \ "fdtfile=undefined\0" \
"stdin=serial,usbkbd\0" \ "stdin=serial,usbkbd\0" \
"stdout=serial,vidconsole\0" \ "stdout=serial,vidconsole\0" \

View file

@ -103,11 +103,10 @@
"fatload ${interface} 0:1 ${loadaddr} " \ "fatload ${interface} 0:1 ${loadaddr} " \
"${board}/flash_blk.img && source ${loadaddr}\0" \ "${board}/flash_blk.img && source ${loadaddr}\0" \
"splashpos=m,m\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" \ "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" "vidargs=video=mxsfb:640x480M-16@60"
#define CONFIG_SYS_LOAD_ADDR CONFIG_LOADADDR
/* Physical Memory Map */ /* Physical Memory Map */
#define PHYS_SDRAM MMDC0_ARB_BASE_ADDR #define PHYS_SDRAM MMDC0_ARB_BASE_ADDR

View file

@ -102,9 +102,7 @@
"vidargs=video=imxdpufb5:off video=imxdpufb6:off video=imxdpufb7:off\0" "vidargs=video=imxdpufb5:off video=imxdpufb6:off video=imxdpufb7:off\0"
/* Link Definitions */ /* Link Definitions */
#define CONFIG_LOADADDR 0x80280000 #define CONFIG_SYS_LOAD_ADDR 0x80280000
#define CONFIG_SYS_LOAD_ADDR CONFIG_LOADADDR
#define CONFIG_SYS_INIT_SP_ADDR 0x80200000 #define CONFIG_SYS_INIT_SP_ADDR 0x80200000

View file

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

View file

@ -167,13 +167,12 @@
"fatload ${interface} 0:1 ${loadaddr} " \ "fatload ${interface} 0:1 ${loadaddr} " \
"${board}/flash_blk.img && source ${loadaddr}\0" \ "${board}/flash_blk.img && source ${loadaddr}\0" \
"splashpos=m,m\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" \ "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" "updlevel=2\0"
/* Miscellaneous configurable options */ /* Miscellaneous configurable options */
#define CONFIG_SYS_LOAD_ADDR CONFIG_LOADADDR
#define CONFIG_SYS_HZ 1000 #define CONFIG_SYS_HZ 1000
/* Physical Memory Map */ /* Physical Memory Map */

View file

@ -38,7 +38,7 @@
#define CONFIG_NETMASK 255.255.255.0 #define CONFIG_NETMASK 255.255.255.0
#define CONFIG_SERVERIP 192.168.10.1 #define CONFIG_SERVERIP 192.168.10.1
#define CONFIG_LOADADDR 0x80008000 #define CONFIG_SYS_LOAD_ADDR 0x80008000
#define CONFIG_FDTADDR 0x84000000 #define CONFIG_FDTADDR 0x84000000
/* We boot from the gfxRAM area of the OCRAM. */ /* 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_CBSIZE 1024 /* Console I/O Buffer Size */
#define CONFIG_SYS_BARGSIZE CONFIG_SYS_CBSIZE #define CONFIG_SYS_BARGSIZE CONFIG_SYS_CBSIZE
#define CONFIG_SYS_LOAD_ADDR CONFIG_LOADADDR
#define CONFIG_SYS_HZ 1000 #define CONFIG_SYS_HZ 1000
/* Physical memory map */ /* Physical memory map */

View file

@ -20,8 +20,6 @@
* U-Boot into it. * U-Boot into it.
*/ */
#define CONFIG_LOADADDR 1000000
/* /*
* SATA/SCSI/AHCI configuration * SATA/SCSI/AHCI configuration
*/ */

View file

@ -489,9 +489,6 @@
#define CONFIG_BOOTFILE "uImage" #define CONFIG_BOOTFILE "uImage"
#define CONFIG_UBOOTPATH u-boot.bin /* U-Boot image on TFTP server */ #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 #ifdef CONFIG_TARGET_P4080DS
#define __USB_PHY_TYPE ulpi #define __USB_PHY_TYPE ulpi
#else #else

View file

@ -50,7 +50,6 @@
/* Miscellaneous configurable options */ /* Miscellaneous configurable options */
#define CONFIG_SYS_LOAD_ADDR CONFIG_LOADADDR
#define CONFIG_SYS_HZ 1000 #define CONFIG_SYS_HZ 1000
/* Physical Memory Map */ /* Physical Memory Map */

View file

@ -126,7 +126,6 @@
#define CONFIG_SETUP_MEMORY_TAGS #define CONFIG_SETUP_MEMORY_TAGS
#define CONFIG_BOOTFILE "uImage" #define CONFIG_BOOTFILE "uImage"
#define CONFIG_LOADADDR 0x80008000
/* /*
* SPL specific defines * SPL specific defines

View file

@ -81,8 +81,7 @@
#define CONFIG_HW_WATCHDOG #define CONFIG_HW_WATCHDOG
#endif #endif
#define CONFIG_LOADADDR 0x12000000 #define CONFIG_SYS_LOAD_ADDR 0x12000000
#define CONFIG_SYS_LOAD_ADDR CONFIG_LOADADDR
#ifndef CONFIG_SPL_BUILD #ifndef CONFIG_SPL_BUILD
#define CONFIG_EXTRA_ENV_SETTINGS \ #define CONFIG_EXTRA_ENV_SETTINGS \

View file

@ -64,7 +64,6 @@
#define CONFIG_SPL_BOOTROM_SAVE (CONFIG_SPL_STACK + 4) #define CONFIG_SPL_BOOTROM_SAVE (CONFIG_SPL_STACK + 4)
/* Default Environment */ /* Default Environment */
#define CONFIG_LOADADDR 0x80000
#define CONFIG_BOOTCOMMAND \ #define CONFIG_BOOTCOMMAND \
"sf probe; " \ "sf probe; " \
"sf read ${loadaddr} 0xd0000 0x2d0000; " \ "sf read ${loadaddr} 0xd0000 0x2d0000; " \

View file

@ -47,9 +47,9 @@
"fdt_addr_r=0x18000000\0" \ "fdt_addr_r=0x18000000\0" \
"fdt_addr=0x18000000\0" \ "fdt_addr=0x18000000\0" \
"findfdt=setenv fdtfile " CONFIG_DEFAULT_FDT_FILE "\0" \ "findfdt=setenv fdtfile " CONFIG_DEFAULT_FDT_FILE "\0" \
"kernel_addr_r=" __stringify(CONFIG_LOADADDR) "\0" \ "kernel_addr_r=" __stringify(CONFIG_SYS_LOAD_ADDR) "\0" \
"scriptaddr=" __stringify(CONFIG_LOADADDR) "\0" \ "scriptaddr=" __stringify(CONFIG_SYS_LOAD_ADDR) "\0" \
"pxefile_addr_r=" __stringify(CONFIG_LOADADDR) "\0" \ "pxefile_addr_r=" __stringify(CONFIG_SYS_LOAD_ADDR) "\0" \
BOOTENV BOOTENV
#define BOOT_TARGET_DEVICES(func) \ #define BOOT_TARGET_DEVICES(func) \

View file

@ -22,7 +22,6 @@
* Environment * Environment
*/ */
#define CONFIG_BOOTFILE "app.bin" #define CONFIG_BOOTFILE "app.bin"
#define CONFIG_LOADADDR CONFIG_SYS_LOAD_ADDR
#define CONFIG_EXTRA_ENV_SETTINGS \ #define CONFIG_EXTRA_ENV_SETTINGS \
"upgrade_image=u-boot.bin\0" \ "upgrade_image=u-boot.bin\0" \

View file

@ -35,7 +35,6 @@
#define CONFIG_SYS_SDRAM_BASE 0x20000000 #define CONFIG_SYS_SDRAM_BASE 0x20000000
#define CONFIG_SYS_SDRAM_SIZE (128 << 20) #define CONFIG_SYS_SDRAM_SIZE (128 << 20)
#define CONFIG_SYS_LOAD_ADDR CONFIG_SYS_SDRAM_BASE #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)) #define CONFIG_SYS_MALLOC_LEN (CONFIG_ENV_SIZE + (1 << 20))
/* 512kB on-chip NOR flash */ /* 512kB on-chip NOR flash */

View file

@ -49,8 +49,7 @@
#define CONFIG_NET_RETRY_COUNT 100 #define CONFIG_NET_RETRY_COUNT 100
#define CONFIG_SYS_LOAD_ADDR 0x80800000 /* loadaddr env var */
#define CONFIG_LOADADDR 0x80800000 /* loadaddr env var */
/* /*
* Ethernet on SOC (FEC) * Ethernet on SOC (FEC)
@ -69,8 +68,6 @@
/* Print Buffer Size */ /* Print Buffer Size */
#define CONFIG_SYS_MAXARGS 32 /* max number of command args */ #define CONFIG_SYS_MAXARGS 32 /* max number of command args */
#define CONFIG_SYS_LOAD_ADDR CONFIG_LOADADDR
/* /*
* Physical Memory Map * Physical Memory Map
*/ */

View file

@ -84,8 +84,6 @@
#define CONFIG_HAS_ETH0 #define CONFIG_HAS_ETH0
#define CONFIG_HAS_ETH1 #define CONFIG_HAS_ETH1
#define CONFIG_LOADADDR 800000 /* default location for tftp and bootm */
/* TODO: Turn into string option and migrate to Kconfig */ /* TODO: Turn into string option and migrate to Kconfig */
#define CONFIG_HOSTNAME "gazerbeam" #define CONFIG_HOSTNAME "gazerbeam"
#define CONFIG_ROOTPATH "/opt/nfsroot" #define CONFIG_ROOTPATH "/opt/nfsroot"

View file

@ -33,10 +33,6 @@
#define CONFIG_LBA48 #define CONFIG_LBA48
#endif #endif
/* Serial Flash */
#define CONFIG_LOADADDR 0x12000000
#ifdef CONFIG_CMD_NFS #ifdef CONFIG_CMD_NFS
#define NETWORKBOOT \ #define NETWORKBOOT \
"setnetworkboot=" \ "setnetworkboot=" \
@ -120,8 +116,7 @@
/* Miscellaneous configurable options */ /* Miscellaneous configurable options */
#define CONFIG_SYS_LOAD_ADDR 0x12000000
#define CONFIG_SYS_LOAD_ADDR CONFIG_LOADADDR
/* Physical Memory Map */ /* Physical Memory Map */
#define PHYS_SDRAM MMDC0_ARB_BASE_ADDR #define PHYS_SDRAM MMDC0_ARB_BASE_ADDR

View file

@ -107,7 +107,6 @@ setenv core_iccm_3 0x6; setenv core_dccm_3 0x6;\0"
* Environment configuration * Environment configuration
*/ */
#define CONFIG_BOOTFILE "uImage" #define CONFIG_BOOTFILE "uImage"
#define CONFIG_LOADADDR CONFIG_SYS_LOAD_ADDR
/* Cli configuration */ /* Cli configuration */
#define CONFIG_SYS_CBSIZE SZ_2K #define CONFIG_SYS_CBSIZE SZ_2K

View file

@ -106,7 +106,6 @@ setenv core_iccm_3 0x6; setenv core_dccm_3 0x6;\0"
* Environment configuration * Environment configuration
*/ */
#define CONFIG_BOOTFILE "uImage" #define CONFIG_BOOTFILE "uImage"
#define CONFIG_LOADADDR CONFIG_SYS_LOAD_ADDR
/* Cli configuration */ /* Cli configuration */
#define CONFIG_SYS_CBSIZE SZ_2K #define CONFIG_SYS_CBSIZE SZ_2K

View file

@ -224,7 +224,6 @@
#define CONFIG_BOOTFILE "ids8313/uImage" #define CONFIG_BOOTFILE "ids8313/uImage"
#define CONFIG_UBOOTPATH "ids8313/u-boot.bin" #define CONFIG_UBOOTPATH "ids8313/u-boot.bin"
#define CONFIG_FDTFILE "ids8313/ids8313.dtb" #define CONFIG_FDTFILE "ids8313/ids8313.dtb"
#define CONFIG_LOADADDR 0x400000
#define CONFIG_ENV_FLAGS_LIST_STATIC "ethaddr:mo,eth1addr:mo" #define CONFIG_ENV_FLAGS_LIST_STATIC "ethaddr:mo,eth1addr:mo"
/* Initial Memory map for Linux*/ /* Initial Memory map for Linux*/

View file

@ -120,8 +120,7 @@
/* Boot Argument Buffer Size */ /* Boot Argument Buffer Size */
#define CONFIG_SYS_BARGSIZE CONFIG_SYS_CBSIZE #define CONFIG_SYS_BARGSIZE CONFIG_SYS_CBSIZE
#define CONFIG_LOADADDR 0xa0800000 /* loadaddr env var */ #define CONFIG_SYS_LOAD_ADDR 0xa0800000 /* loadaddr env var */
#define CONFIG_SYS_LOAD_ADDR CONFIG_LOADADDR
#define CONFIG_EXTRA_ENV_SETTINGS \ #define CONFIG_EXTRA_ENV_SETTINGS \
"netdev=eth0\0" \ "netdev=eth0\0" \

View file

@ -30,7 +30,7 @@
#define CONFIG_EXTRA_ENV_SETTINGS \ #define CONFIG_EXTRA_ENV_SETTINGS \
"script=boot.scr\0" \ "script=boot.scr\0" \
"splashpos=m,m\0" \ "splashpos=m,m\0" \
"splashimage=" __stringify(CONFIG_LOADADDR) "\0" \ "splashimage=" __stringify(CONFIG_SYS_LOAD_ADDR) "\0" \
"image=uImage\0" \ "image=uImage\0" \
"fit_image=fit.itb\0" \ "fit_image=fit.itb\0" \
"fdt_high=0xffffffff\0" \ "fdt_high=0xffffffff\0" \
@ -103,7 +103,6 @@
/* Miscellaneous configurable options */ /* Miscellaneous configurable options */
#define CONFIG_SYS_LOAD_ADDR CONFIG_LOADADDR
#define CONFIG_SYS_HZ 1000 #define CONFIG_SYS_HZ 1000
#ifdef CONFIG_MX6UL #ifdef CONFIG_MX6UL

View file

@ -36,7 +36,7 @@
"bootm_size=0x10000000\0" \ "bootm_size=0x10000000\0" \
"fdt_addr_r=0x14000000\0" \ "fdt_addr_r=0x14000000\0" \
"ramdisk_addr_r=0x14080000\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" \ "ramdisk_file=rootfs.cpio.uboot\0" \
"boot_fdt=try\0" \ "boot_fdt=try\0" \
"ip_dyn=yes\0" \ "ip_dyn=yes\0" \

View file

@ -65,7 +65,6 @@
/* Miscellaneous configurable options */ /* Miscellaneous configurable options */
#define CONFIG_SYS_LOAD_ADDR CONFIG_LOADADDR
#define CONFIG_SYS_HZ 1000 #define CONFIG_SYS_HZ 1000
/* Physical Memory Map */ /* Physical Memory Map */

View file

@ -75,7 +75,6 @@
#define CONFIG_BOOTCOMMAND "run boot${boot-mode}" #define CONFIG_BOOTCOMMAND "run boot${boot-mode}"
#define CONFIG_SYS_LOAD_ADDR CONFIG_LOADADDR
#define CONFIG_SYS_HZ 1000 #define CONFIG_SYS_HZ 1000
/* Physical Memory Map */ /* Physical Memory Map */

View file

@ -140,9 +140,7 @@
#endif #endif
/* Link Definitions */ /* Link Definitions */
#define CONFIG_LOADADDR 0x40480000 #define CONFIG_SYS_LOAD_ADDR 0x40480000
#define CONFIG_SYS_LOAD_ADDR CONFIG_LOADADDR
#define CONFIG_SYS_INIT_RAM_ADDR 0x40000000 #define CONFIG_SYS_INIT_RAM_ADDR 0x40000000
#define CONFIG_SYS_INIT_RAM_SIZE 0x80000 #define CONFIG_SYS_INIT_RAM_SIZE 0x80000

View file

@ -93,9 +93,7 @@
"fi;" "fi;"
/* Link Definitions */ /* Link Definitions */
#define CONFIG_LOADADDR 0x40480000 #define CONFIG_SYS_LOAD_ADDR 0x40480000
#define CONFIG_SYS_LOAD_ADDR CONFIG_LOADADDR
#define CONFIG_SYS_INIT_RAM_ADDR 0x40000000 #define CONFIG_SYS_INIT_RAM_ADDR 0x40000000
#define CONFIG_SYS_INIT_RAM_SIZE 0x200000 #define CONFIG_SYS_INIT_RAM_SIZE 0x200000

View file

@ -44,8 +44,8 @@
/* Initial environment variables */ /* Initial environment variables */
#define CONFIG_EXTRA_ENV_SETTINGS \ #define CONFIG_EXTRA_ENV_SETTINGS \
BOOTENV \ BOOTENV \
"scriptaddr=" __stringify(CONFIG_LOADADDR) "\0" \ "scriptaddr=" __stringify(CONFIG_SYS_LOAD_ADDR) "\0" \
"kernel_addr_r=" __stringify(CONFIG_LOADADDR) "\0" \ "kernel_addr_r=" __stringify(CONFIG_SYS_LOAD_ADDR) "\0" \
"image=Image\0" \ "image=Image\0" \
"console=ttymxc1,115200\0" \ "console=ttymxc1,115200\0" \
"fdt_addr_r=0x43000000\0" \ "fdt_addr_r=0x43000000\0" \
@ -57,9 +57,7 @@
"mmcroot=" CONFIG_MMCROOT " rootwait rw\0" \ "mmcroot=" CONFIG_MMCROOT " rootwait rw\0" \
/* Link Definitions */ /* Link Definitions */
#define CONFIG_LOADADDR 0x40480000 #define CONFIG_SYS_LOAD_ADDR 0x40480000
#define CONFIG_SYS_LOAD_ADDR CONFIG_LOADADDR
#define CONFIG_SYS_INIT_RAM_ADDR 0x40000000 #define CONFIG_SYS_INIT_RAM_ADDR 0x40000000
#define CONFIG_SYS_INIT_RAM_SIZE 0x200000 #define CONFIG_SYS_INIT_RAM_SIZE 0x200000

View file

@ -56,8 +56,7 @@
BOOTENV BOOTENV
/* Link Definitions */ /* Link Definitions */
#define CONFIG_LOADADDR 0x40480000 #define CONFIG_SYS_LOAD_ADDR 0x40480000
#define CONFIG_SYS_LOAD_ADDR CONFIG_LOADADDR
#define CONFIG_SYS_INIT_RAM_ADDR 0x40000000 #define CONFIG_SYS_INIT_RAM_ADDR 0x40000000
#define CONFIG_SYS_INIT_RAM_SIZE SZ_2M #define CONFIG_SYS_INIT_RAM_SIZE SZ_2M

View file

@ -37,8 +37,7 @@
"scriptaddr=0x46000000\0" "scriptaddr=0x46000000\0"
/* Link Definitions */ /* Link Definitions */
#define CONFIG_LOADADDR 0x40480000 #define CONFIG_SYS_LOAD_ADDR 0x40480000
#define CONFIG_SYS_LOAD_ADDR CONFIG_LOADADDR
/* Enable Distro Boot */ /* Enable Distro Boot */
#ifndef CONFIG_SPL_BUILD #ifndef CONFIG_SPL_BUILD

View file

@ -108,9 +108,7 @@
"else booti ${loadaddr} - ${fdt_addr}; fi" "else booti ${loadaddr} - ${fdt_addr}; fi"
/* Link Definitions */ /* Link Definitions */
#define CONFIG_LOADADDR 0x40480000 #define CONFIG_SYS_LOAD_ADDR 0x40480000
#define CONFIG_SYS_LOAD_ADDR CONFIG_LOADADDR
#define CONFIG_SYS_INIT_RAM_ADDR 0x40000000 #define CONFIG_SYS_INIT_RAM_ADDR 0x40000000
#define CONFIG_SYS_INIT_RAM_SIZE 0x200000 #define CONFIG_SYS_INIT_RAM_SIZE 0x200000

View file

@ -44,8 +44,8 @@
#define CONFIG_EXTRA_ENV_SETTINGS \ #define CONFIG_EXTRA_ENV_SETTINGS \
"image=Image\0" \ "image=Image\0" \
BOOTENV \ BOOTENV \
"scriptaddr=" __stringify(CONFIG_LOADADDR) "\0" \ "scriptaddr=" __stringify(CONFIG_SYS_LOAD_ADDR) "\0" \
"kernel_addr_r=" __stringify(CONFIG_LOADADDR) "\0" \ "kernel_addr_r=" __stringify(CONFIG_SYS_LOAD_ADDR) "\0" \
"console=ttymxc1,115200\0" \ "console=ttymxc1,115200\0" \
"fdt_addr_r=0x43000000\0" \ "fdt_addr_r=0x43000000\0" \
"boot_fit=no\0" \ "boot_fit=no\0" \
@ -56,9 +56,7 @@
"mmcroot=" CONFIG_MMCROOT " rootwait rw\0" \ "mmcroot=" CONFIG_MMCROOT " rootwait rw\0" \
/* Link Definitions */ /* Link Definitions */
#define CONFIG_LOADADDR 0x40480000 #define CONFIG_SYS_LOAD_ADDR 0x40480000
#define CONFIG_SYS_LOAD_ADDR CONFIG_LOADADDR
#define CONFIG_SYS_INIT_RAM_ADDR 0x40000000 #define CONFIG_SYS_INIT_RAM_ADDR 0x40000000
#define CONFIG_SYS_INIT_RAM_SIZE 0x200000 #define CONFIG_SYS_INIT_RAM_SIZE 0x200000

View file

@ -66,8 +66,8 @@
/* Initial environment variables */ /* Initial environment variables */
#define CONFIG_EXTRA_ENV_SETTINGS \ #define CONFIG_EXTRA_ENV_SETTINGS \
BOOTENV \ BOOTENV \
"scriptaddr=" __stringify(CONFIG_LOADADDR) "\0" \ "scriptaddr=" __stringify(CONFIG_SYS_LOAD_ADDR) "\0" \
"kernel_addr_r=" __stringify(CONFIG_LOADADDR) "\0" \ "kernel_addr_r=" __stringify(CONFIG_SYS_LOAD_ADDR) "\0" \
"image=Image\0" \ "image=Image\0" \
"console=ttymxc1,115200 earlycon=ec_imx6q,0x30890000,115200\0" \ "console=ttymxc1,115200 earlycon=ec_imx6q,0x30890000,115200\0" \
"fdt_addr_r=0x43000000\0" \ "fdt_addr_r=0x43000000\0" \
@ -79,9 +79,7 @@
"mmcroot=" CONFIG_MMCROOT " rootwait rw\0" \ "mmcroot=" CONFIG_MMCROOT " rootwait rw\0" \
/* Link Definitions */ /* Link Definitions */
#define CONFIG_LOADADDR 0x40480000 #define CONFIG_SYS_LOAD_ADDR 0x40480000
#define CONFIG_SYS_LOAD_ADDR CONFIG_LOADADDR
#define CONFIG_SYS_INIT_RAM_ADDR 0x40000000 #define CONFIG_SYS_INIT_RAM_ADDR 0x40000000
#define CONFIG_SYS_INIT_RAM_SIZE 0x80000 #define CONFIG_SYS_INIT_RAM_SIZE 0x80000

View file

@ -65,9 +65,7 @@
"mmcroot=" CONFIG_MMCROOT " rootwait rw\0" \ "mmcroot=" CONFIG_MMCROOT " rootwait rw\0" \
/* Link Definitions */ /* Link Definitions */
#define CONFIG_LOADADDR 0x40480000 #define CONFIG_SYS_LOAD_ADDR 0x40480000
#define CONFIG_SYS_LOAD_ADDR CONFIG_LOADADDR
#define CONFIG_SYS_INIT_RAM_ADDR 0x40000000 #define CONFIG_SYS_INIT_RAM_ADDR 0x40000000
#define CONFIG_SYS_INIT_RAM_SIZE 0x80000 #define CONFIG_SYS_INIT_RAM_SIZE 0x80000

View file

@ -94,9 +94,7 @@
"mmcroot=" CONFIG_MMCROOT " rootwait rw\0" \ "mmcroot=" CONFIG_MMCROOT " rootwait rw\0" \
/* Link Definitions */ /* Link Definitions */
#define CONFIG_LOADADDR 0x40480000 #define CONFIG_SYS_LOAD_ADDR 0x40480000
#define CONFIG_SYS_LOAD_ADDR CONFIG_LOADADDR
#define CONFIG_SYS_INIT_RAM_ADDR 0x40000000 #define CONFIG_SYS_INIT_RAM_ADDR 0x40000000
#define CONFIG_SYS_INIT_RAM_SIZE 0x80000 #define CONFIG_SYS_INIT_RAM_SIZE 0x80000

View file

@ -137,9 +137,7 @@
"else booti ${loadaddr} - ${fdt_addr}; fi" "else booti ${loadaddr} - ${fdt_addr}; fi"
/* Link Definitions */ /* Link Definitions */
#define CONFIG_LOADADDR 0x40480000 #define CONFIG_SYS_LOAD_ADDR 0x40480000
#define CONFIG_SYS_LOAD_ADDR CONFIG_LOADADDR
#define CONFIG_SYS_INIT_RAM_ADDR 0x40000000 #define CONFIG_SYS_INIT_RAM_ADDR 0x40000000
#define CONFIG_SYS_INIT_RAM_SIZE 0x80000 #define CONFIG_SYS_INIT_RAM_SIZE 0x80000

View file

@ -145,9 +145,7 @@
"else booti ${loadaddr} - ${fdt_addr}; fi" "else booti ${loadaddr} - ${fdt_addr}; fi"
/* Link Definitions */ /* Link Definitions */
#define CONFIG_LOADADDR 0x80280000 #define CONFIG_SYS_LOAD_ADDR 0x80280000
#define CONFIG_SYS_LOAD_ADDR CONFIG_LOADADDR
#define CONFIG_SYS_INIT_SP_ADDR 0x80200000 #define CONFIG_SYS_INIT_SP_ADDR 0x80200000

View file

@ -122,9 +122,7 @@
"else booti ${loadaddr} - ${fdt_addr}; fi" "else booti ${loadaddr} - ${fdt_addr}; fi"
/* Link Definitions */ /* Link Definitions */
#define CONFIG_LOADADDR 0x80280000 #define CONFIG_SYS_LOAD_ADDR 0x80280000
#define CONFIG_SYS_LOAD_ADDR CONFIG_LOADADDR
#define CONFIG_SYS_INIT_SP_ADDR 0x80200000 #define CONFIG_SYS_INIT_SP_ADDR 0x80200000

View file

@ -144,9 +144,7 @@
"else booti ${loadaddr} - ${fdt_addr}; fi" "else booti ${loadaddr} - ${fdt_addr}; fi"
/* Link Definitions */ /* Link Definitions */
#define CONFIG_LOADADDR 0x80280000 #define CONFIG_SYS_LOAD_ADDR 0x80280000
#define CONFIG_SYS_LOAD_ADDR CONFIG_LOADADDR
#define CONFIG_SYS_INIT_SP_ADDR 0x80200000 #define CONFIG_SYS_INIT_SP_ADDR 0x80200000

View file

@ -63,8 +63,8 @@
/* Initial environment variables */ /* Initial environment variables */
#define CONFIG_EXTRA_ENV_SETTINGS \ #define CONFIG_EXTRA_ENV_SETTINGS \
BOOTENV \ BOOTENV \
"scriptaddr=" __stringify(CONFIG_LOADADDR) "\0" \ "scriptaddr=" __stringify(CONFIG_SYS_LOAD_ADDR) "\0" \
"kernel_addr_r=" __stringify(CONFIG_LOADADDR) "\0" \ "kernel_addr_r=" __stringify(CONFIG_SYS_LOAD_ADDR) "\0" \
"image=Image\0" \ "image=Image\0" \
"console=ttyLP1,115200 earlycon\0" \ "console=ttyLP1,115200 earlycon\0" \
"fdt_addr_r=0x83000000\0" \ "fdt_addr_r=0x83000000\0" \
@ -76,9 +76,7 @@
"mmcroot=" CONFIG_MMCROOT " rootwait rw\0" \ "mmcroot=" CONFIG_MMCROOT " rootwait rw\0" \
/* Link Definitions */ /* Link Definitions */
#define CONFIG_LOADADDR 0x80480000 #define CONFIG_SYS_LOAD_ADDR 0x80480000
#define CONFIG_SYS_LOAD_ADDR CONFIG_LOADADDR
#define CONFIG_SYS_INIT_RAM_ADDR 0x80000000 #define CONFIG_SYS_INIT_RAM_ADDR 0x80000000
#define CONFIG_SYS_INIT_RAM_SIZE 0x80000 #define CONFIG_SYS_INIT_RAM_SIZE 0x80000

View file

@ -15,7 +15,6 @@
#define CONFIG_SYS_LOAD_ADDR 0x20209000 #define CONFIG_SYS_LOAD_ADDR 0x20209000
#else #else
#define CONFIG_SYS_LOAD_ADDR 0x80000000 #define CONFIG_SYS_LOAD_ADDR 0x80000000
#define CONFIG_LOADADDR 0x80000000
#endif #endif
#define CONFIG_SYS_FSL_ERRATUM_ESDHC135 1 #define CONFIG_SYS_FSL_ERRATUM_ESDHC135 1

View file

@ -15,7 +15,6 @@
#define CONFIG_SYS_LOAD_ADDR 0x20209000 #define CONFIG_SYS_LOAD_ADDR 0x20209000
#else #else
#define CONFIG_SYS_LOAD_ADDR 0x80000000 #define CONFIG_SYS_LOAD_ADDR 0x80000000
#define CONFIG_LOADADDR 0x80000000
#endif #endif
#define CONFIG_SYS_FSL_ERRATUM_ESDHC135 1 #define CONFIG_SYS_FSL_ERRATUM_ESDHC135 1

View file

@ -75,6 +75,5 @@
* Environment * Environment
*/ */
#define CONFIG_BOOTFILE "app.bin" #define CONFIG_BOOTFILE "app.bin"
#define CONFIG_LOADADDR CONFIG_SYS_LOAD_ADDR
#endif /* _CONFIG_IOT_DEVKIT_H_ */ #endif /* _CONFIG_IOT_DEVKIT_H_ */

View file

@ -20,7 +20,7 @@
#define CONFIG_MXC_USB_FLAGS 0 #define CONFIG_MXC_USB_FLAGS 0
/* Command definition */ /* Command definition */
#define CONFIG_LOADADDR 0x72000000 /* loadaddr env var */ #define CONFIG_SYS_LOAD_ADDR 0x72000000 /* loadaddr env var */
#define CONFIG_EXTRA_ENV_SETTINGS \ #define CONFIG_EXTRA_ENV_SETTINGS \
"console=ttymxc1,115200\0" \ "console=ttymxc1,115200\0" \
@ -72,7 +72,6 @@
/* Miscellaneous configurable options */ /* Miscellaneous configurable options */
#define CONFIG_SYS_CBSIZE 512 /* Console I/O Buffer Size */ #define CONFIG_SYS_CBSIZE 512 /* Console I/O Buffer Size */
#define CONFIG_SYS_LOAD_ADDR CONFIG_LOADADDR
/* Physical Memory Map */ /* Physical Memory Map */
#define PHYS_SDRAM_1 CSD0_BASE_ADDR #define PHYS_SDRAM_1 CSD0_BASE_ADDR

View file

@ -36,11 +36,7 @@
#define CONFIG_MXC_USB_FLAGS 0 #define CONFIG_MXC_USB_FLAGS 0
#define CONFIG_USB_MAX_CONTROLLER_COUNT 2 /* Enabled USB controller number */ #define CONFIG_USB_MAX_CONTROLLER_COUNT 2 /* Enabled USB controller number */
#endif #endif
#define CONFIG_SYS_LOAD_ADDR 0x12000000
/* Watchdog */
#define CONFIG_LOADADDR 0x12000000
#define CONFIG_SYS_LOAD_ADDR CONFIG_LOADADDR
#ifndef CONFIG_SPL_BUILD #ifndef CONFIG_SPL_BUILD
#define CONFIG_EXTRA_ENV_SETTINGS \ #define CONFIG_EXTRA_ENV_SETTINGS \

View file

@ -104,8 +104,6 @@
"else run netboot; fi" "else run netboot; fi"
/* Miscellaneous configurable options */ /* Miscellaneous configurable options */
#define CONFIG_SYS_LOAD_ADDR CONFIG_LOADADDR
#define CONFIG_SYS_HZ 1000 #define CONFIG_SYS_HZ 1000
/* Physical Memory Map */ /* Physical Memory Map */

View file

@ -45,7 +45,6 @@
/* /*
* Default environment variables * Default environment variables
*/ */
#define CONFIG_LOADADDR 0x00800000
#if defined(CONFIG_LSXHL) #if defined(CONFIG_LSXHL)
#define CONFIG_FDTFILE "kirkwood-lsxhl.dtb" #define CONFIG_FDTFILE "kirkwood-lsxhl.dtb"

View file

@ -136,9 +136,8 @@
#define CONFIG_REVISION_TAG #define CONFIG_REVISION_TAG
#define CONFIG_SETUP_MEMORY_TAGS #define CONFIG_SETUP_MEMORY_TAGS
#define CONFIG_BOOTFILE "boot/fitImage" #define CONFIG_BOOTFILE "boot/fitImage"
#define CONFIG_LOADADDR 0x70800000 #define CONFIG_SYS_LOAD_ADDR 0x70800000
#define CONFIG_BOOTCOMMAND "run mmc_mmc" #define CONFIG_BOOTCOMMAND "run mmc_mmc"
#define CONFIG_SYS_LOAD_ADDR CONFIG_LOADADDR
/* /*
* NAND SPL * NAND SPL

View file

@ -17,7 +17,6 @@
/* Size of malloc() pool */ /* Size of malloc() pool */
#define CONFIG_SYS_MALLOC_LEN (32 * SZ_1M) #define CONFIG_SYS_MALLOC_LEN (32 * SZ_1M)
#define CONFIG_SYS_LOAD_ADDR CONFIG_LOADADDR
#define CONFIG_SYS_HZ 1000 #define CONFIG_SYS_HZ 1000
/* Physical Memory Map */ /* Physical Memory Map */

View file

@ -28,8 +28,7 @@
#define CONFIG_SYS_INIT_SP_ADDR (CONFIG_SYS_TEXT_BASE + SZ_2M - \ #define CONFIG_SYS_INIT_SP_ADDR (CONFIG_SYS_TEXT_BASE + SZ_2M - \
GENERATED_GBL_DATA_SIZE) GENERATED_GBL_DATA_SIZE)
/* UBoot -> Kernel */ /* UBoot -> Kernel */
#define CONFIG_LOADADDR 0x4007ff28 #define CONFIG_SYS_LOAD_ADDR 0x4007ff28
#define CONFIG_SYS_LOAD_ADDR CONFIG_LOADADDR
/* DRAM */ /* DRAM */
#define CONFIG_SYS_SDRAM_BASE 0x40000000 #define CONFIG_SYS_SDRAM_BASE 0x40000000

View file

@ -33,8 +33,7 @@
GENERATED_GBL_DATA_SIZE) GENERATED_GBL_DATA_SIZE)
/* UBoot -> Kernel */ /* UBoot -> Kernel */
#define CONFIG_LOADADDR 0x84000000 #define CONFIG_SYS_LOAD_ADDR 0x84000000
#define CONFIG_SYS_LOAD_ADDR CONFIG_LOADADDR
/* MMC */ /* MMC */
#define MMC_SUPPORTS_TUNING #define MMC_SUPPORTS_TUNING

View file

@ -43,8 +43,7 @@
/* UBoot -> Kernel */ /* UBoot -> Kernel */
#define CONFIG_SYS_SPL_ARGS_ADDR 0x40000000 #define CONFIG_SYS_SPL_ARGS_ADDR 0x40000000
#define CONFIG_LOADADDR 0x42007f1c #define CONFIG_SYS_LOAD_ADDR 0x42007f1c
#define CONFIG_SYS_LOAD_ADDR CONFIG_LOADADDR
/* DRAM */ /* DRAM */
#define CONFIG_SYS_SDRAM_BASE 0x40000000 #define CONFIG_SYS_SDRAM_BASE 0x40000000

View file

@ -18,7 +18,6 @@
#define COUNTER_FREQUENCY 13000000 #define COUNTER_FREQUENCY 13000000
#define CONFIG_SYS_LOAD_ADDR 0x41000000 #define CONFIG_SYS_LOAD_ADDR 0x41000000
#define CONFIG_LOADADDR CONFIG_SYS_LOAD_ADDR
#define CONFIG_SYS_MALLOC_LEN SZ_32M #define CONFIG_SYS_MALLOC_LEN SZ_32M
#define CONFIG_SYS_BOOTM_LEN SZ_64M #define CONFIG_SYS_BOOTM_LEN SZ_64M

View file

@ -22,7 +22,6 @@
#define CONFIG_SYS_SDRAM_SIZE 0x20000000 #define CONFIG_SYS_SDRAM_SIZE 0x20000000
#define CONFIG_SYS_LOAD_ADDR 0x41000000 #define CONFIG_SYS_LOAD_ADDR 0x41000000
#define CONFIG_LOADADDR CONFIG_SYS_LOAD_ADDR
#define CONFIG_SYS_MALLOC_LEN SZ_32M #define CONFIG_SYS_MALLOC_LEN SZ_32M
#define CONFIG_SYS_BOOTM_LEN SZ_64M #define CONFIG_SYS_BOOTM_LEN SZ_64M

View file

@ -27,8 +27,7 @@
/* Booting Linux */ /* Booting Linux */
#define CONFIG_BOOTFILE "uImage" #define CONFIG_BOOTFILE "uImage"
#define CONFIG_LOADADDR 0x42000000 #define CONFIG_SYS_LOAD_ADDR 0x42000000
#define CONFIG_SYS_LOAD_ADDR CONFIG_LOADADDR
/* Extra Environment */ /* Extra Environment */
#define CONFIG_EXTRA_ENV_SETTINGS \ #define CONFIG_EXTRA_ENV_SETTINGS \

View file

@ -36,8 +36,7 @@
/* Boot Linux */ /* Boot Linux */
#define CONFIG_BOOTFILE "uImage" #define CONFIG_BOOTFILE "uImage"
#define CONFIG_LOADADDR 0x42000000 #define CONFIG_SYS_LOAD_ADDR 0x42000000
#define CONFIG_SYS_LOAD_ADDR CONFIG_LOADADDR
/* Extra Environments */ /* Extra Environments */
#define CONFIG_EXTRA_ENV_SETTINGS \ #define CONFIG_EXTRA_ENV_SETTINGS \

View file

@ -50,8 +50,7 @@
/* Boot Linux */ /* Boot Linux */
#define CONFIG_BOOTFILE "uImage" #define CONFIG_BOOTFILE "uImage"
#define CONFIG_LOADADDR 0x42000000 #define CONFIG_SYS_LOAD_ADDR 0x42000000
#define CONFIG_SYS_LOAD_ADDR CONFIG_LOADADDR
/* Extra Environment */ /* Extra Environment */
#define CONFIG_EXTRA_ENV_SETTINGS \ #define CONFIG_EXTRA_ENV_SETTINGS \

View file

@ -61,7 +61,7 @@
#define CONFIG_ETHPRIME "FEC0" #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 \ #define CONFIG_EXTRA_ENV_SETTINGS \
"script=boot.scr\0" \ "script=boot.scr\0" \
@ -140,8 +140,6 @@
* Miscellaneous configurable options * Miscellaneous configurable options
*/ */
#define CONFIG_SYS_LOAD_ADDR CONFIG_LOADADDR
/*----------------------------------------------------------------------- /*-----------------------------------------------------------------------
* Physical Memory Map * Physical Memory Map
*/ */

View file

@ -43,7 +43,7 @@
/* Command definition */ /* Command definition */
#define CONFIG_LOADADDR 0x70010000 /* loadaddr env var */ #define CONFIG_SYS_LOAD_ADDR 0x70010000 /* loadaddr env var */
#define BOOT_TARGET_DEVICES(func) \ #define BOOT_TARGET_DEVICES(func) \
func(MMC, mmc, 0) \ func(MMC, mmc, 0) \
@ -72,8 +72,6 @@
/* Miscellaneous configurable options */ /* Miscellaneous configurable options */
#define CONFIG_SYS_CBSIZE 512 /* Console I/O Buffer Size */ #define CONFIG_SYS_CBSIZE 512 /* Console I/O Buffer Size */
#define CONFIG_SYS_LOAD_ADDR CONFIG_LOADADDR
/* Physical Memory Map */ /* Physical Memory Map */
#define PHYS_SDRAM_1 CSD0_BASE_ADDR #define PHYS_SDRAM_1 CSD0_BASE_ADDR
#define PHYS_SDRAM_1_SIZE (gd->bd->bi_dram[0].size) #define PHYS_SDRAM_1_SIZE (gd->bd->bi_dram[0].size)

View file

@ -49,7 +49,7 @@
#define CONFIG_ETHPRIME "FEC0" #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 \ #define CONFIG_EXTRA_ENV_SETTINGS \
"script=boot.scr\0" \ "script=boot.scr\0" \
@ -125,8 +125,6 @@
/* Miscellaneous configurable options */ /* Miscellaneous configurable options */
#define CONFIG_SYS_CBSIZE 512 /* Console I/O Buffer Size */ #define CONFIG_SYS_CBSIZE 512 /* Console I/O Buffer Size */
#define CONFIG_SYS_LOAD_ADDR CONFIG_LOADADDR
/* Physical Memory Map */ /* Physical Memory Map */
#define PHYS_SDRAM_1 CSD0_BASE_ADDR #define PHYS_SDRAM_1 CSD0_BASE_ADDR
#define PHYS_SDRAM_1_SIZE (gd->bd->bi_dram[0].size) #define PHYS_SDRAM_1_SIZE (gd->bd->bi_dram[0].size)

View file

@ -33,7 +33,7 @@
/* Command definition */ /* Command definition */
#define CONFIG_LOADADDR 0x72000000 /* loadaddr env var */ #define CONFIG_SYS_LOAD_ADDR 0x72000000 /* loadaddr env var */
#define PPD_CONFIG_NFS \ #define PPD_CONFIG_NFS \
"nfsserver=192.168.252.95\0" \ "nfsserver=192.168.252.95\0" \
@ -116,8 +116,6 @@
#define CONFIG_SYS_MAXARGS 48 /* max number of command args */ #define CONFIG_SYS_MAXARGS 48 /* max number of command args */
#define CONFIG_SYS_BARGSIZE CONFIG_SYS_CBSIZE /* Boot Argument Buffer Size */ #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 */ #define CONFIG_SYS_BOOTMAPSZ (256 << 20) /* 256M */
/* Physical Memory Map */ /* Physical Memory Map */

View file

@ -43,11 +43,10 @@
#if defined(CONFIG_MX6SL) || defined(CONFIG_MX6SLL) || \ #if defined(CONFIG_MX6SL) || defined(CONFIG_MX6SLL) || \
defined(CONFIG_MX6SX) || \ defined(CONFIG_MX6SX) || \
defined(CONFIG_MX6UL) || defined(CONFIG_MX6ULL) defined(CONFIG_MX6UL) || defined(CONFIG_MX6ULL)
#define CONFIG_LOADADDR 0x82000000 #define CONFIG_SYS_LOAD_ADDR 0x82000000
#else #else
#define CONFIG_LOADADDR 0x12000000 #define CONFIG_SYS_LOAD_ADDR 0x12000000
#endif #endif
#define CONFIG_SYS_LOAD_ADDR CONFIG_LOADADDR
/* Miscellaneous configurable options */ /* Miscellaneous configurable options */
#define CONFIG_SYS_CBSIZE 512 #define CONFIG_SYS_CBSIZE 512

View file

@ -46,9 +46,9 @@
"fdtfile=undefined\0" \ "fdtfile=undefined\0" \
"fdt_addr_r=0x18000000\0" \ "fdt_addr_r=0x18000000\0" \
"fdt_addr=0x18000000\0" \ "fdt_addr=0x18000000\0" \
"kernel_addr_r=" __stringify(CONFIG_LOADADDR) "\0" \ "kernel_addr_r=" __stringify(CONFIG_SYS_LOAD_ADDR) "\0" \
"pxefile_addr_r=" __stringify(CONFIG_LOADADDR) "\0" \ "pxefile_addr_r=" __stringify(CONFIG_SYS_LOAD_ADDR) "\0" \
"scriptaddr=" __stringify(CONFIG_LOADADDR) "\0" \ "scriptaddr=" __stringify(CONFIG_SYS_LOAD_ADDR) "\0" \
"ramdisk_addr_r=0x13000000\0" \ "ramdisk_addr_r=0x13000000\0" \
"ramdiskaddr=0x13000000\0" \ "ramdiskaddr=0x13000000\0" \
"initrd_high=0xffffffff\0" \ "initrd_high=0xffffffff\0" \

View file

@ -52,7 +52,7 @@
"dfu_alt_info=spl raw 0x400\0" \ "dfu_alt_info=spl raw 0x400\0" \
"fdt_high=0xffffffff\0" \ "fdt_high=0xffffffff\0" \
"initrd_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" \ "mmcdev=" __stringify(CONFIG_SYS_MMC_ENV_DEV) "\0" \
"mmcpart=1\0" \ "mmcpart=1\0" \
"finduuid=part uuid mmc ${mmcdev}:2 uuid\0" \ "finduuid=part uuid mmc ${mmcdev}:2 uuid\0" \

View file

@ -48,7 +48,7 @@
"fdt_addr=0x83000000\0" \ "fdt_addr=0x83000000\0" \
"boot_fdt=try\0" \ "boot_fdt=try\0" \
"ip_dyn=yes\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" \ "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" \ "mmcdev="__stringify(CONFIG_SYS_MMC_ENV_DEV)"\0" \
"mmcpart=" __stringify(CONFIG_SYS_MMC_IMG_LOAD_PART) "\0" \ "mmcpart=" __stringify(CONFIG_SYS_MMC_IMG_LOAD_PART) "\0" \
@ -127,7 +127,6 @@
/* Miscellaneous configurable options */ /* Miscellaneous configurable options */
#define CONFIG_SYS_LOAD_ADDR CONFIG_LOADADDR
#define CONFIG_SYS_HZ 1000 #define CONFIG_SYS_HZ 1000
/* Physical Memory Map */ /* Physical Memory Map */

View file

@ -124,7 +124,6 @@
/* Miscellaneous configurable options */ /* Miscellaneous configurable options */
#define CONFIG_SYS_LOAD_ADDR CONFIG_LOADADDR
#define CONFIG_SYS_HZ 1000 #define CONFIG_SYS_HZ 1000
/* Physical Memory Map */ /* Physical Memory Map */

View file

@ -28,7 +28,7 @@
/* Enable iomux-lpsr support */ /* Enable iomux-lpsr support */
#define CONFIG_IOMUX_LPSR #define CONFIG_IOMUX_LPSR
#define CONFIG_LOADADDR 0x80800000 #define CONFIG_SYS_LOAD_ADDR 0x80800000
/* Miscellaneous configurable options */ /* Miscellaneous configurable options */
#define CONFIG_SYS_CBSIZE 512 #define CONFIG_SYS_CBSIZE 512

View file

@ -75,11 +75,11 @@
"fdtfile=imx7d-sdb.dtb\0" \ "fdtfile=imx7d-sdb.dtb\0" \
"fdt_addr=0x83000000\0" \ "fdt_addr=0x83000000\0" \
"fdt_addr_r=0x83000000\0" \ "fdt_addr_r=0x83000000\0" \
"kernel_addr_r=" __stringify(CONFIG_LOADADDR) "\0" \ "kernel_addr_r=" __stringify(CONFIG_SYS_LOAD_ADDR) "\0" \
"pxefile_addr_r=" __stringify(CONFIG_LOADADDR) "\0" \ "pxefile_addr_r=" __stringify(CONFIG_SYS_LOAD_ADDR) "\0" \
"ramdisk_addr_r=0x83100000\0" \ "ramdisk_addr_r=0x83100000\0" \
"ramdiskaddr=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" \ "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 BOOTENV
@ -90,7 +90,6 @@
#include <config_distro_bootcmd.h> #include <config_distro_bootcmd.h>
#define CONFIG_SYS_LOAD_ADDR CONFIG_LOADADDR
#define CONFIG_SYS_HZ 1000 #define CONFIG_SYS_HZ 1000
/* Physical Memory Map */ /* Physical Memory Map */

View file

@ -47,7 +47,7 @@
#define PHYS_SDRAM 0x60000000 #define PHYS_SDRAM 0x60000000
#define CONFIG_SYS_SDRAM_BASE PHYS_SDRAM #define CONFIG_SYS_SDRAM_BASE PHYS_SDRAM
#define CONFIG_LOADADDR 0x60800000 #define CONFIG_SYS_LOAD_ADDR 0x60800000
#define CONFIG_EXTRA_ENV_SETTINGS \ #define CONFIG_EXTRA_ENV_SETTINGS \
"image=zImage\0" \ "image=zImage\0" \
@ -74,8 +74,6 @@
"run mmcboot; " \ "run mmcboot; " \
"fi; " \ "fi; " \
#define CONFIG_SYS_LOAD_ADDR CONFIG_LOADADDR
#define CONFIG_SYS_INIT_RAM_ADDR IRAM_BASE_ADDR #define CONFIG_SYS_INIT_RAM_ADDR IRAM_BASE_ADDR
#define CONFIG_SYS_INIT_RAM_SIZE SZ_256K #define CONFIG_SYS_INIT_RAM_SIZE SZ_256K

View file

@ -47,7 +47,7 @@
#define PHYS_SDRAM_SIZE SZ_1G #define PHYS_SDRAM_SIZE SZ_1G
#define CONFIG_SYS_SDRAM_BASE PHYS_SDRAM #define CONFIG_SYS_SDRAM_BASE PHYS_SDRAM
#define CONFIG_LOADADDR 0x60800000 #define CONFIG_SYS_LOAD_ADDR 0x60800000
#define CONFIG_EXTRA_ENV_SETTINGS \ #define CONFIG_EXTRA_ENV_SETTINGS \
"script=boot.scr\0" \ "script=boot.scr\0" \
@ -125,7 +125,6 @@
"fi" "fi"
#define CONFIG_SYS_HZ 1000 #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_ADDR IRAM_BASE_ADDR
#define CONFIG_SYS_INIT_RAM_SIZE SZ_256K #define CONFIG_SYS_INIT_RAM_SIZE SZ_256K

View file

@ -24,7 +24,6 @@
/* MMC Configs */ /* MMC Configs */
#define CONFIG_SYS_FSL_ESDHC_ADDR USDHC2_BASE_ADDR #define CONFIG_SYS_FSL_ESDHC_ADDR USDHC2_BASE_ADDR
#define CONFIG_SYS_LOAD_ADDR CONFIG_LOADADDR
#define CONFIG_SYS_HZ 1000 #define CONFIG_SYS_HZ 1000
/* Physical Memory Map */ /* Physical Memory Map */

View file

@ -108,9 +108,9 @@
"initrd_high=0xffffffff\0" \ "initrd_high=0xffffffff\0" \
"fdt_addr_r=0x18000000\0" \ "fdt_addr_r=0x18000000\0" \
FDTFILE \ FDTFILE \
"kernel_addr_r=" __stringify(CONFIG_LOADADDR) "\0" \ "kernel_addr_r=" __stringify(CONFIG_SYS_LOAD_ADDR) "\0" \
"pxefile_addr_r=" __stringify(CONFIG_LOADADDR) "\0" \ "pxefile_addr_r=" __stringify(CONFIG_SYS_LOAD_ADDR) "\0" \
"scriptaddr=" __stringify(CONFIG_LOADADDR) "\0" \ "scriptaddr=" __stringify(CONFIG_SYS_LOAD_ADDR) "\0" \
"ramdisk_addr_r=0x13000000\0" \ "ramdisk_addr_r=0x13000000\0" \
"ramdiskaddr=0x13000000\0" \ "ramdiskaddr=0x13000000\0" \
"ip_dyn=yes\0" \ "ip_dyn=yes\0" \

Some files were not shown because too many files have changed in this diff Show more