Skip to content

Commit 7b21ed7

Browse files
josefbacikwilldeacon
authored andcommitted
arm64: properly install vmlinuz.efi
If you select CONFIG_EFI_ZBOOT, we will generate vmlinuz.efi, and then when we go to install the kernel we'll install the vmlinux instead because install.sh only recognizes Image.gz as wanting the compressed install image. With CONFIG_EFI_ZBOOT we don't get the proper kernel installed, which means it doesn't boot, which makes for a very confused and subsequently angry kernel developer. Fix this by properly installing our compressed kernel if we've enabled CONFIG_EFI_ZBOOT. Signed-off-by: Josef Bacik <[email protected]> Cc: <[email protected]> # 6.1.x Fixes: c37b830 ("arm64: efi: enable generic EFI compressed boot") Reviewed-by: Simon Glass <[email protected]> Link: https://lore.kernel.org/r/6edb1402769c2c14c4fbef8f7eaedb3167558789.1702570674.git.josef@toxicpanda.com Signed-off-by: Will Deacon <[email protected]>
1 parent 8fd7588 commit 7b21ed7

File tree

1 file changed

+2
-1
lines changed

1 file changed

+2
-1
lines changed

arch/arm64/boot/install.sh

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,8 @@
1717
# $3 - kernel map file
1818
# $4 - default install path (blank if root directory)
1919

20-
if [ "$(basename $2)" = "Image.gz" ]; then
20+
if [ "$(basename $2)" = "Image.gz" ] || [ "$(basename $2)" = "vmlinuz.efi" ]
21+
then
2122
# Compressed install
2223
echo "Installing compressed kernel"
2324
base=vmlinuz

0 commit comments

Comments
 (0)