diff options
| author | Tom Rini <trini@konsulko.com> | 2017-05-17 14:13:58 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2017-05-17 14:13:58 -0400 |
| commit | fa8967cfbaed5582ba987756fa9f0470a9affbf4 (patch) | |
| tree | 258ab44757e1c78825f087310577f1df05ccdcca /include | |
| parent | ae1b939930b0fffc062bb99196ec22e19afcc7e8 (diff) | |
| parent | 81afa9c9a3a9c006a6555e4abf7a75875eb3e926 (diff) | |
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
Diffstat (limited to 'include')
| -rw-r--r-- | include/configs/uniphier.h | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/include/configs/uniphier.h b/include/configs/uniphier.h index cdc5b0018a..6271b07766 100644 --- a/include/configs/uniphier.h +++ b/include/configs/uniphier.h @@ -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 |