From mboxrd@z Thu Jan  1 00:00:00 1970
From: Arne Fitzenreiter <arne_f@ipfire.org>
To: development@lists.ipfire.org
Subject: [PATCH] u-boot: fix KVER syntax
Date: Fri, 20 Sep 2024 14:22:01 +0200
Message-ID: <20240920122234.9879-1-arne_f@ipfire.org>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============5833665690263606161=="
List-Id: <development.lists.ipfire.org>

--===============5833665690263606161==
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: quoted-printable

with some kernel build changes KVER also contains the -ipfire string
so this has to be removed in u-boot.

Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org>
---
 config/rootfiles/core/188/update.sh | 2 +-
 config/u-boot/boot.cmd              | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/config/rootfiles/core/188/update.sh b/config/rootfiles/core/188/=
update.sh
index 276223052..b152b1541 100644
--- a/config/rootfiles/core/188/update.sh
+++ b/config/rootfiles/core/188/update.sh
@@ -126,7 +126,7 @@ dracut --regenerate-all --force
 KVER=3D"xxxKVERxxx"
 case "$(uname -m)" in
 	aarch64)
-		mkimage -A arm64 -T ramdisk -C lzma -d /boot/initramfs-${KVER}-ipfire.img =
/boot/uInit-${KVER}-ipfire
+		mkimage -A arm64 -T ramdisk -C lzma -d /boot/initramfs-${KVER}.img /boot/u=
Init-${KVER}
 		# dont remove initramfs because grub need this to boot.
 		;;
 esac
diff --git a/config/u-boot/boot.cmd b/config/u-boot/boot.cmd
index a27996780..5faa3a1ec 100644
--- a/config/u-boot/boot.cmd
+++ b/config/u-boot/boot.cmd
@@ -77,8 +77,8 @@ else
 fi;
=20
 setenv fdt_high ffffffff;
-fatload ${boot_dev} ${boot_part} ${kernel_addr_r} vmlinuz-${KVER}-ipfire${ke=
rnel_type};
-fatload ${boot_dev} ${boot_part} ${fdt_addr_r} dtb-${KVER}-ipfire${kernel_ty=
pe}/${fdtfile};
+fatload ${boot_dev} ${boot_part} ${kernel_addr_r} vmlinuz-${KVER};
+fatload ${boot_dev} ${boot_part} ${fdt_addr_r} dtb-${KVER}/${fdtfile};
=20
 if test "${FDTCMDS}" =3D ""; then
 	echo ;
@@ -88,7 +88,7 @@ else
 fi;
=20
 setenv ramdisk_addr ${ramdisk_addr_r}
-if fatload ${boot_dev} ${boot_part} ${ramdisk_addr} uInit-${KVER}-ipfire${ke=
rnel_type}; then
+if fatload ${boot_dev} ${boot_part} ${ramdisk_addr} uInit-${KVER}; then
 	echo Ramdisk loaded...;
 else
 	echo Ramdisk not loaded...;
--=20
2.43.0


--===============5833665690263606161==--