From: Arne Fitzenreiter <arne_f@ipfire.org>
Date: Fri, 21 Feb 2020 08:26:36 +0000 (+0100)
Subject: u-boot: split rpi aarch64 quirk into parts
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=91b4ba6d6e3add4d29cfb85109dd6b739d3450c9;p=people%2Fstevee%2Fipfire-2.x.git

u-boot: split rpi aarch64 quirk into parts

on of the changed variables was used before the old quirk.

Signed-off-by: Arne Fitzenreiter <arne_f@ipfire.org>
---

diff --git a/config/u-boot/boot.cmd b/config/u-boot/boot.cmd
index b2fe0684f7..3517fe946f 100644
--- a/config/u-boot/boot.cmd
+++ b/config/u-boot/boot.cmd
@@ -15,7 +15,7 @@ if test ${cpu} = "armv8"; then
 	echo ;
 else
 	setenv kernel_type -multi;
-	fi;
+fi;
 
 # Import uEnv txt...
 if fatload ${boot_dev} ${boot_part} ${kernel_addr_r} uEnv.txt; then
@@ -34,6 +34,14 @@ if test "${board}" = "sunxi"; then
 	setenv fdtfile ${DTBSUNXI};
 fi;
 
+# Quirk for RPi on aarch64 becuase u-boot cannot use the
+# initrd on aarch64 and without ramdisk no UUID
+if test ${cpu} = "armv8"; then
+	if test ${board} = "rpi"; then
+		setenv root_dev /dev/mmcblk0p3;
+	fi;
+fi;
+
 # Check if serial console is enabled
 if test "${SERIAL-CONSOLE}" = "ON"; then
 	if test ${console} = ""; then
@@ -93,8 +101,7 @@ fi;
 # initrd on aarch64
 if test ${cpu} = "armv8"; then
 	if test ${board} = "rpi"; then
-	setenv ramdisk_addr -;
-	setenv root_dev /dev/mmcblk0p3;
+		setenv ramdisk_addr -;
 	fi;
 fi;
 
diff --git a/config/u-boot/boot.scr b/config/u-boot/boot.scr
index d7b6048493..7fde534e37 100644
Binary files a/config/u-boot/boot.scr and b/config/u-boot/boot.scr differ