From: Arne Fitzenreiter <arne_f@ipfire.org>
Date: Thu, 20 Feb 2020 11:24:36 +0000 (+0100)
Subject: u-boot: add quirk for rpi on aarch64
X-Git-Tag: v2.25-core142~38
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=a62be8a2d9fecc59a7592f1a8347b0087148a896;p=ipfire-2.x.git

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 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 72b41bb65a..d7b6048493 100644
Binary files a/config/u-boot/boot.scr and b/config/u-boot/boot.scr differ