[PATCH v4 9/9] loongarch: efi: enable generic EFI compressed boot

[Xi Ruoyao]

Hi Ard,

Should we also add

--

diff --git a/arch/loongarch/Makefile b/arch/loongarch/Makefile
index 063a578bbdaa..6ee3d7826893 100644
--- a/arch/loongarch/Makefile
+++ b/arch/loongarch/Makefile
@@ -9,10 +9,16 @@ KBUILD_DEFCONFIG := loongson3_defconfig
 
 ifndef CONFIG_EFI_STUB
 KBUILD_IMAGE	:= $(boot)/vmlinux.elf
-else
+else # CONFIG_EFI_STUB
+
+ifndef CONFIG_EFI_ZBOOT
 KBUILD_IMAGE	:= $(boot)/vmlinux.efi
+else
+KBUILD_IMAGE	:= $(boot)/vmlinuz.efi
 endif
 
+endif # CONFIG_EFI_STUB
+
 #
 # Select the object file format to substitute into the linker script.
 #

--

or do we deliberately expect builders to run "make vmlinuz.efi"
explicitly?

On Sat, 2022-08-27 at 10:38 +0200, Ard Biesheuvel wrote:
> Wire up the generic EFI zboot support for LoongArch64
> 
> Signed-off-by: Ard Biesheuvel <ardb at kernel.org>
> ---
>  arch/loongarch/Makefile      | 2 +-
>  arch/loongarch/boot/Makefile | 6 ++++++
>  2 files changed, 7 insertions(+), 1 deletion(-)
> 
> diff --git a/arch/loongarch/Makefile b/arch/loongarch/Makefile
> index 4bc47f47cfd8..7051a95f7f31 100644
> --- a/arch/loongarch/Makefile
> +++ b/arch/loongarch/Makefile
> @@ -93,7 +93,7 @@ vdso_install:
>  
>  all:   $(notdir $(KBUILD_IMAGE))
>  
> -vmlinux.elf vmlinux.efi: vmlinux
> +vmlinux.elf vmlinux.efi vmlinuz.efi: vmlinux
>         $(Q)$(MAKE) $(build)=$(boot) $(bootvars-y) $(boot)/$@
>  
>  install:
> diff --git a/arch/loongarch/boot/Makefile
> b/arch/loongarch/boot/Makefile
> index fecf34f50e56..4e1c374c5782 100644
> --- a/arch/loongarch/boot/Makefile
> +++ b/arch/loongarch/boot/Makefile
> @@ -18,3 +18,9 @@ $(obj)/vmlinux.elf: vmlinux FORCE
>  targets += vmlinux.efi
>  $(obj)/vmlinux.efi: vmlinux FORCE
>         $(call if_changed,objcopy)
> +
> +EFI_ZBOOT_PAYLOAD      := vmlinux.efi
> +EFI_ZBOOT_BFD_TARGET   := elf64-loongarch
> +EFI_ZBOOT_MACH_TYPE    := LOONGARCH64
> +
> +include $(srctree)/drivers/firmware/efi/libstub/Makefile.zboot

-- 
Xi Ruoyao <xry111 at xry111.site>
School of Aerospace Science and Technology, Xidian University