From: Arne Fitzenreiter <arne_f@ipfire.org>
Date: Thu, 10 Jun 2021 13:06:46 +0000 (+0000)
Subject: u-boot: remove rpi ramdisk quirk for aarch64
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=1b73728c55709f8fdace36d9086fc14bc4bb32cf;p=people%2Farne_f%2Fipfire-2.x.git

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>
---

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 7fde534e3..2ff734f4c 100644
Binary files a/config/u-boot/boot.scr and b/config/u-boot/boot.scr differ