u-boot-script: Adjust to new kernel filename

Message ID 8b2b154f-e34f-a293-cbe8-d5433669acfb@siemens.com
State Accepted, archived
Headers show
Series u-boot-script: Adjust to new kernel filename | expand

Commit Message

Jan Kiszka March 26, 2021, 10:28 p.m. UTC
From: Jan Kiszka <jan.kiszka@siemens.com>

Fixes: d6954739fe43 ("linux-custom: Fix decompressed kernel name for arm64")
Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>
---

Seems we are lacking tests that do complete boot sequences, at least for 
arm64 boards.

 meta/recipes-bsp/u-boot-script/files/update-u-boot-script | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

Comments

Jan Kiszka April 7, 2021, 10:29 p.m. UTC | #1
On 27.03.21 09:28, [ext] Jan Kiszka wrote:
> From: Jan Kiszka <jan.kiszka@siemens.com>
> 
> Fixes: d6954739fe43 ("linux-custom: Fix decompressed kernel name for arm64")
> Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>
> ---
> 
> Seems we are lacking tests that do complete boot sequences, at least for 
> arm64 boards.
> 
>  meta/recipes-bsp/u-boot-script/files/update-u-boot-script | 6 +-----
>  1 file changed, 1 insertion(+), 5 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 39989a89..40d31081 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
> @@ -18,11 +18,7 @@ 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)
> +	aarch64|mips|riscv64)
>  		KERNEL_FILE="vmlinux"
>  		BOOT="booti"
>  		;;
> 

Ping. This is a critical regression fix affecting lots of targets.

Jan
Anton Mikanovich April 8, 2021, 12:16 a.m. UTC | #2
08.04.2021 09:29, Jan Kiszka wrote:
> Ping. This is a critical regression fix affecting lots of targets.
>
> Jan
>
Applied to next, sorry for delay.

Patch

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 39989a89..40d31081 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
@@ -18,11 +18,7 @@  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)
+	aarch64|mips|riscv64)
 		KERNEL_FILE="vmlinux"
 		BOOT="booti"
 		;;