Merge git://git.denx.de/u-boot-uniphier
- Add workaround code to make LD20 SoC boot from ARM Trusted Firmware - Sync DT with Linux to fix DTC warnings - Add new SoC support code - Misc fix, updates
This commit is contained in:
@@ -176,7 +176,7 @@
|
||||
#define CONFIG_BOOTFILE "Image.gz"
|
||||
#define LINUXBOOT_CMD "booti"
|
||||
#define KERNEL_ADDR_LOAD "kernel_addr_load=0x84200000\0"
|
||||
#define KERNEL_ADDR_R "kernel_addr_r=0x80080000\0"
|
||||
#define KERNEL_ADDR_R "kernel_addr_r=0x82080000\0"
|
||||
#else
|
||||
#define CONFIG_BOOTFILE "zImage"
|
||||
#define LINUXBOOT_CMD "bootz"
|
||||
@@ -246,6 +246,11 @@
|
||||
"nand write $loadaddr 0 0x00020000 && " \
|
||||
"tftpboot $third_image && " \
|
||||
"nand write $loadaddr 0x00020000 0x000e0000\0" \
|
||||
"usbupdate=usb start &&" \
|
||||
"tftpboot $second_image && " \
|
||||
"usb write $loadaddr 0 100 && " \
|
||||
"tftpboot $third_image && " \
|
||||
"usb write $loadaddr 100 700\0" \
|
||||
BOOT_IMAGES \
|
||||
LINUXBOOT_ENV_SETTINGS
|
||||
|
||||
|
||||
Reference in New Issue
Block a user