From: Arne Fitzenreiter <arne_f@ipfire.org>
Date: Thu, 19 Jul 2018 08:29:44 +0000 (+0100)
Subject: u-boot: boot aarch64 kernel without -multi extension
X-Git-Tag: v2.21-core123~54
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=0487a49fec8636a106bd01cb06be2d9bfaf209d7;p=ipfire-2.x.git

u-boot: boot aarch64 kernel without -multi extension

Signed-off-by: Arne Fitzenreiter <arne_f@ipfire.org>
---

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 188d54456d..0d9e67b968 100644
Binary files a/config/u-boot/boot.scr and b/config/u-boot/boot.scr differ