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 b2fe0684f748730ba6130cfcaa4fd9101a883507..3517fe946f11d7950ed16854e71447914d0c6f63 100644 (file)
--- 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 (file)
Binary files a/config/u-boot/boot.scr and b/config/u-boot/boot.scr differ