dany/u-boot-megous
1
0
Fork 0
mirror of https://xff.cz/git/u-boot/ synced 2025-09-04 10:12:14 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge tag 'signed-rpi-next' of git://github.com/agraf/u-boot

Browse Source 
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.
This commit is contained in:
Tom Rini
2018-06-03 12:27:42 -04:00
parent 040b2583c3 722742598b
commit 22781fca1d
1 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
include/configs/rpi.h
View File

@@ -90,6 +90,14 @@
"stdout=serial,vidconsole\0" \ "stdout=serial,vidconsole\0" \
"stderr=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: * Memory layout for where various images get loaded by boot scripts:
* *
@@ -132,8 +140,8 @@
* large initrds before they start colliding with U-Boot. * large initrds before they start colliding with U-Boot.
*/ */
#define ENV_MEM_LAYOUT_SETTINGS \ #define ENV_MEM_LAYOUT_SETTINGS \
"fdt_high=ffffffff\0" \ "fdt_high=" FDT_HIGH "\0" \
"initrd_high=ffffffff\0" \ "initrd_high=" INITRD_HIGH "\0" \
"kernel_addr_r=0x00080000\0" \ "kernel_addr_r=0x00080000\0" \
"scriptaddr=0x02400000\0" \ "scriptaddr=0x02400000\0" \
"pxefile_addr_r=0x02500000\0" \ "pxefile_addr_r=0x02500000\0" \