From 0487a49fec8636a106bd01cb06be2d9bfaf209d7 Mon Sep 17 00:00:00 2001
From: Arne Fitzenreiter <arne_f@ipfire.org>
Date: Thu, 19 Jul 2018 09:29:44 +0100
Subject: [PATCH] u-boot: boot aarch64 kernel without -multi extension

Signed-off-by: Arne Fitzenreiter <arne_f@ipfire.org>
---
 config/u-boot/boot.cmd |  34 +++++++++++++++++++++++++---------
 config/u-boot/boot.scr | Bin 1981 -> 2373 bytes
 2 files changed, 25 insertions(+), 9 deletions(-)

diff --git a/config/u-boot/boot.cmd b/config/u-boot/boot.cmd
index 6679d679ab..1d3017ba9e 100644
--- a/config/u-boot/boot.cmd
+++ b/config/u-boot/boot.cmd
@@ -8,9 +8,13 @@ if test ${boot_part} = ""; then
 fi;
 
 if test ${soc} = "kirkwood"; then
-	setenv kernel_type kirkwood;
+	setenv kernel_type -kirkwood;
 else
-	setenv kernel_type multi;
+	if test ${cpu} = "armv8"; then
+		echo ;
+	else
+		setenv kernel_type -multi;
+	fi;
 fi;
 
 # Import uEnv txt...
@@ -34,13 +38,25 @@ fi;
 if test "${SERIAL-CONSOLE}" = "ON"; then
 	if test ${console} = ""; then
 		if test "${board}" = "rpi"; then
-			if test "${fdtfile}" = "bcm2837-rpi-3-b-plus.dtb"; then
-				setenv console ttyS1,115200n8;
+			if test ${cpu} = "armv8"; then
+				if test "${fdtfile}" = "boradcom/bcm2837-rpi-3-b-plus.dtb"; then
+					setenv console ttyS1,115200n8;
+				else
+					if test "${fdtfile}" = "broadcom/bcm2837-rpi-3-b.dtb"; then
+						setenv console ttyS1,115200n8;
+					else
+						setenv console ttyAMA0,115200n8;
+					fi;
+				fi;
 			else
-				if test "${fdtfile}" = "bcm2837-rpi-3-b.dtb"; then
+				if test "${fdtfile}" = "bcm2837-rpi-3-b-plus.dtb"; then
 					setenv console ttyS1,115200n8;
 				else
-					setenv console ttyAMA0,115200n8;
+					if test "${fdtfile}" = "bcm2837-rpi-3-b.dtb"; then
+						setenv console ttyS1,115200n8;
+					else
+						setenv console ttyAMA0,115200n8;
+					fi;
 				fi;
 			fi;
 		else
@@ -55,10 +71,10 @@ else
 fi;
 
 setenv fdt_high ffffffff;
-fatload ${boot_dev} ${boot_part} ${kernel_addr_r} vmlinuz-${KVER}-ipfire-${kernel_type};
-fatload ${boot_dev} ${boot_part} ${fdt_addr_r} dtb-${KVER}-ipfire-${kernel_type}/${fdtfile};
+fatload ${boot_dev} ${boot_part} ${kernel_addr_r} vmlinuz-${KVER}-ipfire${kernel_type};
+fatload ${boot_dev} ${boot_part} ${fdt_addr_r} dtb-${KVER}-ipfire${kernel_type}/${fdtfile};
 setenv ramdisk_addr ${ramdisk_addr_r}
-if fatload ${boot_dev} ${boot_part} ${ramdisk_addr} uInit-${KVER}-ipfire-${kernel_type}; then
+if fatload ${boot_dev} ${boot_part} ${ramdisk_addr} uInit-${KVER}-ipfire${kernel_type}; then
 	echo Ramdisk loaded...;
 else
 	echo Ramdisk not loaded...;
diff --git a/config/u-boot/boot.scr b/config/u-boot/boot.scr
index 188d54456da43c74e5428aa94b20b9d6c6730532..0d9e67b9689c2cbbdb9f512d53ac8ce6fc682926 100644
GIT binary patch
delta 279
zc-q^`e^f|bomDcduj|U=XtVXv3=EvC3{VhO_4gbr6Wc^ZMHU7Ij=vLKE;{IDXBK6b
z=jW$bbEW1Kr*d&-rYV%97MCcfR3{gd)+*R4C?yu<mRTrSE0koU=5cXyrY2|PD_C=J
zLX=NtWEA1j%`MF-$png}ZMI?5W)j1$ck)4IIgb3I#FXUxT>Z)A%qo-rGV4u_XO`qB
z%7+TxV^#nPs<6WhS7XuQ=1c>b3<PPJlXoziPHtlsg=$ov{FYe|T|F~U-DWSARL030
QSOX_Bv2||lVKZa|0Qa0yg8%>k

delta 131
zc-lKEw3lCAomDdIpPt;tXoZJH3=HhG3{a3`o_3g(iEW~yA`4KsbfU{ezU<7R?DG8l
z6l<>3oZ{3;jG`>Lr8y;=iy5_<CY!JbPL5;coBWblbn<^@rOB6A3?|0_#r`wvPM*u6
cy7@M1JR_s-WGnVSAlc2{$*8+ogu{>#0BZ>)nE(I)

-- 
2.39.5