mirror of
https://github.com/brain-hackers/u-boot-brain
synced 2024-09-29 16:10:24 +09:00
rpi: Fix fdt_high & initrd_high for 64-bit builds
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:
parent
040b2583c3
commit
722742598b
@ -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" \
|
||||||
|
Loading…
Reference in New Issue
Block a user