diff options
| author | Tom Rini <trini@konsulko.com> | 2020-01-31 13:26:28 -0500 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2020-01-31 13:26:28 -0500 |
| commit | 80e99adbe47d1c8590f9b971ac52257fdc51a5ec (patch) | |
| tree | 2da762e5bd632c832852fd3d3c18d8b7cdef9e38 /include/configs | |
| parent | 514d00e527320a96c682029f4982955700f1664b (diff) | |
| parent | 76cd7d47fb8ac191553b741bb424e93c94ca759a (diff) | |
Merge tag 'uniphier-v2020.04-2' of https://gitlab.denx.de/u-boot/custodians/u-boot-uniphier
UniPhier SoC updates for v2020.04 (2nd)
Denali NAND driver changes:
- Set up more registers in denali-spl for SOCFPGA
- Make clocks optional
- Do not assert reset signals in the remove hook
- associate SPARE_AREA_SKIP_BYTES with DT compatible
- switch to UCLASS_MTD
UniPhier platform changes:
- fix a bug in dram_init()
- specify loadaddr for "source" command
Diffstat (limited to 'include/configs')
| -rw-r--r-- | include/configs/uniphier.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/include/configs/uniphier.h b/include/configs/uniphier.h index 29866668c4..b95fb9c93f 100644 --- a/include/configs/uniphier.h +++ b/include/configs/uniphier.h @@ -169,17 +169,17 @@ "ubi part UBI && " \ "ubifsmount ubi0:boot && " \ "ubifsload ${loadaddr} ${script} && " \ - "source\0" \ + "source $loadaddr\0" \ "norscript=echo Running ${script} from tftp ... && " \ "tftpboot ${script} &&" \ - "source\0" \ + "source $loadaddr\0" \ "usbscript=usb start && " \ "setenv devtype usb && " \ "setenv devnum 0 && " \ "run loadscript_fat\0" \ "loadscript_fat=echo Running ${script} from ${devtype}${devnum} ... && " \ "load ${devtype} ${devnum}:1 ${loadaddr} ${script} && " \ - "source\0" \ + "source $loadaddr\0" \ "sramupdate=setexpr tmp_addr $nor_base + 0x50000 &&" \ "tftpboot $tmp_addr $second_image && " \ "setexpr tmp_addr $nor_base + 0x70000 && " \ |