From: Arne Fitzenreiter <arne_f@ipfire.org>
Date: Sat, 4 Jan 2025 21:50:40 +0000 (+0100)
Subject: u-boot: remove some arm32bit parts from bootscript
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=15667b3394ff07a9970f0c7ea76f27f08b5d1323;p=people%2Fms%2Fipfire-2.x.git

u-boot: remove some arm32bit parts 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 61c50d064..dc634ca98 100644
--- a/config/u-boot/boot.cmd
+++ b/config/u-boot/boot.cmd
@@ -58,16 +58,6 @@ if test "${SERIAL-CONSOLE}" = "ON"; then
 						setenv console ttyAMA0,115200n8;
 					fi;
 				fi;
-			else
-				if test "${fdtfile}" = "bcm2837-rpi-3-b-plus.dtb"; then
-					setenv console ttyS1,115200n8;
-				else
-					if test "${fdtfile}" = "bcm2837-rpi-3-b.dtb"; then
-						setenv console ttyS1,115200n8;
-					else
-						setenv console ttyAMA0,115200n8;
-					fi;
-				fi;
 			fi;
 		else
 			setenv console ttyS0,115200n8;
@@ -80,7 +70,10 @@ else
 	setenv bootargs console=tty1 root=${root_dev} rootwait;
 fi;
 
-setenv fdt_high ffffffff;
+if test ${fdt_high} = ""; then
+	setenv fdt_high ffffffff;
+fi;
+
 fatload ${boot_dev} ${boot_part} ${kernel_addr_r} vmlinuz-${KVER};
 fatload ${boot_dev} ${boot_part} ${fdt_addr_r} dtb-${KVER}/${fdtfile};
 
@@ -99,10 +92,8 @@ else
 	setenv ramdisk_addr -;
 fi;
 
-bootz ${kernel_addr_r} ${ramdisk_addr} ${fdt_addr_r};
 booti ${kernel_addr_r} ${ramdisk_addr} ${fdt_addr_r};
 
-bootz ${kernel_addr_r} - ${fdt_addr_r};
 booti ${kernel_addr_r} - ${fdt_addr_r};
 
 # Recompile with: