From 1b73728c55709f8fdace36d9086fc14bc4bb32cf Mon Sep 17 00:00:00 2001
From: Arne Fitzenreiter <arne_f@ipfire.org>
Date: Thu, 10 Jun 2021 13:06:46 +0000
Subject: [PATCH] u-boot: remove rpi ramdisk quirk for aarch64

the u-boot bug that destroy the ramdisk on aarch64 is fixed now

Signed-off-by: Arne Fitzenreiter <arne_f@ipfire.org>
---
 config/u-boot/boot.cmd |  16 ----------------
 config/u-boot/boot.scr | Bin 2915 -> 2528 bytes
 2 files changed, 16 deletions(-)

diff --git a/config/u-boot/boot.cmd b/config/u-boot/boot.cmd
index 3517fe946..9d456265c 100644
--- a/config/u-boot/boot.cmd
+++ b/config/u-boot/boot.cmd
@@ -34,14 +34,6 @@ 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
@@ -97,14 +89,6 @@ else
 	setenv ramdisk_addr -;
 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 -;
-	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 7fde534e3760e6aefccae5bdb834a706675d75e7..2ff734f4c5a811b3908dc27bee13572bb6a2895d 100644
GIT binary patch
delta 58
zc-ng`_CQ!(omDbyeRD!t!a@E03=EtL7@)u<JK{Gh6Wc^ZMHZm&jEycEnKqwfzQ(%Q
Ik4uyh0O#%y5dZ)H

delta 331
zc-ng){8&t0omDby{rNzHIRE}C1_o|r1}Ip)<$E716Wc^ZMHZm2^hTGBOlg6onMK(O
zY57G8K>?Wx`FRS7iABj7W+n<rsmY~@#i<IVx=H!@B?`%jd3ivp6ev=Xk;<j4keQcR
zQj~(MBQY;Up**uBBfqpnp(rsoC9^nNAunGcG}O~&vMi&bLS~vmNosM4f=YE#eqvEd
zt%9wBQc*#sk~PT0JTA_OwTjG~X_=efFx_YMQC6Uy%Rsg(60)6h@&|SiHeG8jkQ0t@
H$S?u`mUn3S

-- 
2.39.2