From 777ba8192ccda88d0fb66cb42b28ec2fd209db87 Mon Sep 17 00:00:00 2001
From: Arne Fitzenreiter <arne_f@ipfire.org>
Date: Thu, 20 Feb 2020 12:21:28 +0100
Subject: [PATCH] u-boot: remove kirkwood kernel detection from bootscript

Signed-off-by: Arne Fitzenreiter <arne_f@ipfire.org>
---
 config/u-boot/boot.cmd |  10 +++-------
 config/u-boot/boot.scr | Bin 2607 -> 2529 bytes
 2 files changed, 3 insertions(+), 7 deletions(-)

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 b3c6bc2c82bb15888fdd866d4016b93ec0e5d0ed..72b41bb65a239d554ea8462b15f0f57e7652ba6b 100644
GIT binary patch
delta 68
zc-mVp@=#b_omDc-@2&m9IKS+v3=EtL8KA)KLHj~hCbo%+iY!3knG;=}OwMN%o6OF^
SJK2#@Wb#Tzp3OTM%Qygd*Ah(t

delta 138
zc-ng?yk10JomDc-YJOcptlREP1_sXe3{bF0ne{R&6Wc^ZMHZm&^NB7`Y>V@gYZYu2
zl(I96vdi=HQ<SU~N-|ROxHyYbOH%X76tYu`@=|l+ODYRe6?9>WthrKiic`5bC(AJ^
Z@N=dnXXGnbb8$k&yciWXr!!V@008R+D7OFr

-- 
2.39.5