diff options
| author | Josef Bacik <josef@toxicpanda.com> | 2023-12-14 17:18:50 +0100 |
|---|---|---|
| committer | Will Deacon <will@kernel.org> | 2023-12-17 13:31:53 +0100 |
| commit | 7b21ed7d119dc06b0ed2ba3e406a02cafe3a8d03 (patch) | |
| tree | 8ff845d40b1bbff063d3620c36423ab31fcf4827 /arch/arm64/boot/install.sh | |
| parent | arm64: replace <asm-generic/export.h> with <linux/export.h> (diff) | |
| download | linux-7b21ed7d119dc06b0ed2ba3e406a02cafe3a8d03.tar.xz linux-7b21ed7d119dc06b0ed2ba3e406a02cafe3a8d03.zip | |
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 <josef@toxicpanda.com>
Cc: <stable@vger.kernel.org> # 6.1.x
Fixes: c37b830fef13 ("arm64: efi: enable generic EFI compressed boot")
Reviewed-by: Simon Glass <sjg@chromium.org>
Link: https://lore.kernel.org/r/6edb1402769c2c14c4fbef8f7eaedb3167558789.1702570674.git.josef@toxicpanda.com
Signed-off-by: Will Deacon <will@kernel.org>
Diffstat (limited to 'arch/arm64/boot/install.sh')
| -rwxr-xr-x | arch/arm64/boot/install.sh | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/arm64/boot/install.sh b/arch/arm64/boot/install.sh index 7399d706967a..9b7a09808a3d 100755 --- a/arch/arm64/boot/install.sh +++ b/arch/arm64/boot/install.sh @@ -17,7 +17,8 @@ # $3 - kernel map file # $4 - default install path (blank if root directory) -if [ "$(basename $2)" = "Image.gz" ]; then +if [ "$(basename $2)" = "Image.gz" ] || [ "$(basename $2)" = "vmlinuz.efi" ] +then # Compressed install echo "Installing compressed kernel" base=vmlinuz |