brain-hackers_pepepper-mirror/u-boot-brain
1
0
Fork 0
mirror of https://github.com/brain-hackers/u-boot-brain synced 2024-06-09 23:36:03 +09:00
Code Issues Projects Releases Wiki Activity

rpi: Fix fdt_high & initrd_high for 64-bit builds

Browse Source 
The magic value that disables relocation is dependent on the CPU word
size, so the current 'ffffffff' is doing the wrong thing on aarch64.

Signed-off-by: Tuomas Tynkkynen <tuomas@tuxera.com>
Signed-off-by: Alexander Graf <agraf@suse.de>
This commit is contained in:
Tuomas Tynkkynen 2018-04-20 13:03:48 +03:00 committed by Alexander Graf
parent 040b2583c3
commit 722742598b
1 changed files with 10 additions and 2 deletions
Show Stats 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" \