| Message ID | 20220827083850.2702465-10-ardb@kernel.org (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | efi: implement generic compressed boot support | expand |
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@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
On Sun, 2022-08-28 at 17:52 +0800, Xi Ruoyao wrote: > 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 > + Oh, it depends on Huacai's not-merged-yet patch... Sorry for noise.
Hi, all, > -----原始邮件----- > 发件人: "Xi Ruoyao" <xry111@xry111.site> > 发送时间:2022-08-28 17:52:20 (星期日) > 收件人: "Ard Biesheuvel" <ardb@kernel.org>, linux-efi@vger.kernel.org > 抄送: linux-arm-kernel@lists.infradead.org, "James E.J. Bottomley" <James.Bottomley@HansenPartnership.com>, "Matthew Garrett" <mjg59@srcf.ucam.org>, "Peter Jones" <pjones@redhat.com>, "Ilias Apalodimas" <ilias.apalodimas@linaro.org>, "Heinrich Schuchardt" <heinrich.schuchardt@canonical.com>, "AKASHI Takahiro" <takahiro.akashi@linaro.org>, "Palmer Dabbelt" <palmer@dabbelt.com>, "Atish > Patra" <atishp@atishpatra.org>, "Arnd Bergmann" <arnd@arndb.de>, "Huacai Chen" <chenhuacai@loongson.cn>, "Lennart Poettering" <lennart@poettering.net>, "Jeremy Linton" <jeremy.linton@arm.com> > 主题: Re: [PATCH v4 9/9] loongarch: efi: enable generic EFI compressed boot > > 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? I prefer to add to KBUILD_IMAGE, we can even add to make install. Huacai > > 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@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@xry111.site> > School of Aerospace Science and Technology, Xidian University 本邮件及其附件含有龙芯中科的商业秘密信息，仅限于发送给上面地址中列出的个人或群组。禁止任何其他人以任何形式使用（包括但不限于全部或部分地泄露、复制或散发）本邮件及其附件中的信息。如果您错收本邮件，请您立即电话或邮件通知发件人并删除本邮件。 This email and its attachments contain confidential information from Loongson Technology , which is intended only for the person or entity whose address is listed above. Any use of the information contained herein in any way (including, but not limited to, total or partial disclosure, reproduction or dissemination) by persons other than the intended recipient(s) is prohibited. If you receive this email in error, please notify the sender by phone or email immediately and delete it.
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
Wire up the generic EFI zboot support for LoongArch64 Signed-off-by: Ard Biesheuvel <ardb@kernel.org> --- arch/loongarch/Makefile | 2 +- arch/loongarch/boot/Makefile | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletion(-)