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