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 <arne_f@ipfire.org>

diff --git a/config/u-boot/boot.cmd b/config/u-boot/boot.cmd
index 1c1171bfe9a74c313cb65ee8be42fecdb5fab6bb..b2fe0684f748730ba6130cfcaa4fd9101a883507 100644 (file)
--- 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 (file)
Binary files a/config/u-boot/boot.scr and b/config/u-boot/boot.scr differ