[PATCH v3 08/14] u-boot-script: Account for variations of kernel files and boot commands

[Jan Kiszka <jan.kiszka@siemens.com>]

From: Jan Kiszka <jan.kiszka@siemens.com>

The addition RISC-V revealed that we already had an issue with mipsel
regarding vmlinuz vs. vmlinux, it was just not stressed so far.

Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>
---
 .../u-boot-script/files/update-u-boot-script       | 22 ++++++++++++++++------
 1 file changed, 16 insertions(+), 6 deletions(-)

diff --git a/meta/recipes-bsp/u-boot-script/files/update-u-boot-script b/meta/recipes-bsp/u-boot-script/files/update-u-boot-script
index d006a23e..a18e59bc 100755
--- a/meta/recipes-bsp/u-boot-script/files/update-u-boot-script
+++ b/meta/recipes-bsp/u-boot-script/files/update-u-boot-script
@@ -17,6 +17,21 @@ BOOT_CMD=$(mktemp)
 
 KERNEL_VERSION=$(linux-version list | linux-version sort --reverse | head -1)
 
+case $(uname -m) in
+	aarch64)
+		KERNEL_FILE="vmlinuz"
+		BOOT="booti"
+		;;
+	mips|riscv64)
+		KERNEL_FILE="vmlinux"
+		BOOT="booti"
+		;;
+	*)
+		KERNEL_FILE="vmlinuz"
+		BOOT="bootz"
+		;;
+esac
+
 echo "${SCRIPT_PREPEND}" >> ${BOOT_CMD}
 
 echo "setenv bootargs ${KERNEL_ARGS}" >> ${BOOT_CMD}
@@ -24,7 +39,7 @@ echo "setenv bootargs ${KERNEL_ARGS}" >> ${BOOT_CMD}
 echo "load \${devtype} \${devnum}:${ROOT_PARTITION} \${fdt_addr_r}" \
      "/usr/lib/linux-image-${KERNEL_VERSION}/\${fdtfile}" >> ${BOOT_CMD}
 echo "load \${devtype} \${devnum}:\${distro_bootpart} \${kernel_addr_r}" \
-     "/boot/vmlinuz-${KERNEL_VERSION}" >> ${BOOT_CMD}
+     "/boot/${KERNEL_FILE}-${KERNEL_VERSION}" >> ${BOOT_CMD}
 
 case "${NO_INITRD}" in
 yes|1)
@@ -53,11 +68,6 @@ if [ -n "${OVERLAYS}" ]; then
 	done
 fi
 
-BOOT="bootz"
-if [ "$(uname -m)" = "aarch64" ]; then
-	BOOT="booti"
-fi
-
 echo "${BOOT} \${kernel_addr_r} ${INITRD_ADDR} \${fdt_addr_r}" >> ${BOOT_CMD}
 
 mkimage -T script -A invalid -C none -d ${BOOT_CMD} /boot/boot.scr > /dev/null
-- 
2.16.4