From: Arne Fitzenreiter <arne_f@ipfire.org>
Date: Thu, 20 Feb 2020 11:21:28 +0000 (+0100)
Subject: u-boot: remove kirkwood kernel detection from bootscript
X-Git-Url: http://git.ipfire.org/?p=people%2Fms%2Fipfire-2.x.git;a=commitdiff_plain;h=777ba8192ccda88d0fb66cb42b28ec2fd209db87

u-boot: remove kirkwood kernel detection from bootscript

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

diff --git a/config/u-boot/boot.cmd b/config/u-boot/boot.cmd
index b86b6809ae..1c1171bfe9 100644
--- a/config/u-boot/boot.cmd
+++ b/config/u-boot/boot.cmd
@@ -11,15 +11,11 @@ if test ${boot_part} = ""; then
 	setenv boot_part ${dev_num}:1;
 fi;
 
-if test ${soc} = "kirkwood"; then
-	setenv kernel_type -kirkwood;
+if test ${cpu} = "armv8"; then
+	echo ;
 else
-	if test ${cpu} = "armv8"; then
-		echo ;
-	else
-		setenv kernel_type -multi;
+	setenv kernel_type -multi;
 	fi;
-fi;
 
 # Import uEnv txt...
 if fatload ${boot_dev} ${boot_part} ${kernel_addr_r} uEnv.txt; then
diff --git a/config/u-boot/boot.scr b/config/u-boot/boot.scr
index b3c6bc2c82..72b41bb65a 100644
Binary files a/config/u-boot/boot.scr and b/config/u-boot/boot.scr differ