From 91b4ba6d6e3add4d29cfb85109dd6b739d3450c9 Mon Sep 17 00:00:00 2001
From: Arne Fitzenreiter <arne_f@ipfire.org>
Date: Fri, 21 Feb 2020 09:26:36 +0100
Subject: [PATCH] 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>
---
 config/u-boot/boot.cmd |  13 ++++++++++---
 config/u-boot/boot.scr | Bin 2736 -> 2915 bytes
 2 files changed, 10 insertions(+), 3 deletions(-)

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 d7b6048493eac8fec81db0d38dd0b3bb71cc2d10..7fde534e3760e6aefccae5bdb834a706675d75e7 100644
GIT binary patch
delta 116
zc-q?_`dCa}omDby{rNzHIRE}C1_o|r1}Ip)<$E716Wc^ZMHZm2^hOsY#?9%B{fv{(
zad^onB<7_klxLP?<d>Ex6eZ@SWEN*D<mD@bhI+b8mSt3&Y{{uGxqwr9^B1O6Hb&0L
PAK671bvO5ODl!59VcsDa

delta 76
zc-ng`wn0>0omDbyTGkuBIKP}E1_rJI1}Ko4UT(q4#5Pe;kp(E6vC&0|k&$zA8e>1>
a=9A3HY?GTg#V6J(PTtGRwb_qLlo0^HjuNy0

-- 
2.39.2