From a62be8a2d9fecc59a7592f1a8347b0087148a896 Mon Sep 17 00:00:00 2001 From: Arne Fitzenreiter Date: Thu, 20 Feb 2020 12:24:36 +0100 Subject: [PATCH] u-boot: add quirk for rpi on aarch64 the current rpi u-boot will not load the ramdisk correctly so the kernel will crash with loaded ramdisk. Remove ramdisk and replace root UUID by /dev/mmcblk0p3 if boot was on armv8 and rpi. Signed-off-by: Arne Fitzenreiter --- config/u-boot/boot.cmd | 12 +++++++++++- config/u-boot/boot.scr | Bin 2529 -> 2736 bytes 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/config/u-boot/boot.cmd b/config/u-boot/boot.cmd index 1c1171bfe9..b2fe0684f7 100644 --- a/config/u-boot/boot.cmd +++ b/config/u-boot/boot.cmd @@ -87,7 +87,17 @@ if fatload ${boot_dev} ${boot_part} ${ramdisk_addr} uInit-${KVER}-ipfire${kernel else echo Ramdisk not loaded...; setenv ramdisk_addr -; -fi ; +fi; + +# Quirk for RPi on aarch64 becuase u-boot cannot use the +# initrd on aarch64 +if test ${cpu} = "armv8"; then + if test ${board} = "rpi"; then + setenv ramdisk_addr -; + setenv root_dev /dev/mmcblk0p3; + fi; +fi; + bootz ${kernel_addr_r} ${ramdisk_addr} ${fdt_addr_r}; booti ${kernel_addr_r} ${ramdisk_addr} ${fdt_addr_r}; diff --git a/config/u-boot/boot.scr b/config/u-boot/boot.scr index 72b41bb65a239d554ea8462b15f0f57e7652ba6b..d7b6048493eac8fec81db0d38dd0b3bb71cc2d10 100644 GIT binary patch delta 189 zc-ng?yg^i6omDbyTGkuBIKP}E1_rJI1}Ko4UT(q4#5Pe;kp(E6vC*ZK!{3^VOIabX zG_xpMAuYd1At)eIAwN$cF|jB)!^}h>DK)t?u{c$sR5vL$XdGE#vW zGxIV_ic*ktOqOL-RLD$IC`m0YQBbK)%1