u-boot: fix KVER syntax

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@ipfire.org>
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>

diff --git a/config/rootfiles/core/188/update.sh b/config/rootfiles/core/188/update.sh
index facaeede8d0c41c78e0ea15cd55c9e778fbf4c08..d15ca967445d2d8cc3b2290d86526ad81e9da743 100644 (file)
--- a/config/rootfiles/core/188/update.sh
+++ b/config/rootfiles/core/188/update.sh
@@ -130,7 +130,7 @@ dracut --regenerate-all --force
 KVER="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/uInit-${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 a2799678033ade2c1c124a0bcf5a0215b7de55ac..5faa3a1eca4b07f43484cf3d7ee2660ff65fa735 100644 (file)
--- a/config/u-boot/boot.cmd
+++ b/config/u-boot/boot.cmd
@@ -77,8 +77,8 @@ else
 fi;
 
 setenv fdt_high ffffffff;
-fatload ${boot_dev} ${boot_part} ${kernel_addr_r} vmlinuz-${KVER}-ipfire${kernel_type};
-fatload ${boot_dev} ${boot_part} ${fdt_addr_r} dtb-${KVER}-ipfire${kernel_type}/${fdtfile};
+fatload ${boot_dev} ${boot_part} ${kernel_addr_r} vmlinuz-${KVER};
+fatload ${boot_dev} ${boot_part} ${fdt_addr_r} dtb-${KVER}/${fdtfile};
 
 if test "${FDTCMDS}" = ""; then
        echo ;
@@ -88,7 +88,7 @@ else
 fi;
 
 setenv ramdisk_addr ${ramdisk_addr_r}
-if fatload ${boot_dev} ${boot_part} ${ramdisk_addr} uInit-${KVER}-ipfire${kernel_type}; then
+if fatload ${boot_dev} ${boot_part} ${ramdisk_addr} uInit-${KVER}; then
        echo Ramdisk loaded...;
 else
        echo Ramdisk not loaded...;