diff options
| author | Tom Rini <trini@konsulko.com> | 2018-06-03 12:27:42 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2018-06-03 12:27:42 -0400 |
| commit | 22781fca1d5aa9270a42271f9c20d97b85f72b73 (patch) | |
| tree | 09c9755664ff0d469010710836ccb95ef2b2f927 | |
| parent | 040b2583c3a87c83606b3df64ea653ccaf3aea62 (diff) | |
| parent | 722742598bb1402caa0c4a6139d7b30ad856a0f2 (diff) | |
| download | u-boot-22781fca1d5aa9270a42271f9c20d97b85f72b73.zip u-boot-22781fca1d5aa9270a42271f9c20d97b85f72b73.tar.gz u-boot-22781fca1d5aa9270a42271f9c20d97b85f72b73.tar.bz2 | |
Merge tag 'signed-rpi-next' of git://github.com/agraf/u-boot
Patch queue for rpi - 2018-06-03
This pull request only includes a single patch that was left
out in the last one: A fix to have the fdt stay at its original
location in RAM during boot.
| -rw-r--r-- | include/configs/rpi.h | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/include/configs/rpi.h b/include/configs/rpi.h index 649a425..a97550b 100644 --- a/include/configs/rpi.h +++ b/include/configs/rpi.h @@ -90,6 +90,14 @@ "stdout=serial,vidconsole\0" \ "stderr=serial,vidconsole\0" +#ifdef CONFIG_ARM64 +#define FDT_HIGH "ffffffffffffffff" +#define INITRD_HIGH "ffffffffffffffff" +#else +#define FDT_HIGH "ffffffff" +#define INITRD_HIGH "ffffffff" +#endif + /* * Memory layout for where various images get loaded by boot scripts: * @@ -132,8 +140,8 @@ * large initrds before they start colliding with U-Boot. */ #define ENV_MEM_LAYOUT_SETTINGS \ - "fdt_high=ffffffff\0" \ - "initrd_high=ffffffff\0" \ + "fdt_high=" FDT_HIGH "\0" \ + "initrd_high=" INITRD_HIGH "\0" \ "kernel_addr_r=0x00080000\0" \ "scriptaddr=0x02400000\0" \ "pxefile_addr_r=0x02500000\0" \ |