[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <13de0332-df33-f13c-bed8-334b0cb84214@microchip.com>
Date: Fri, 16 Sep 2022 07:09:48 +0000
From: <Conor.Dooley@...rochip.com>
To: <ardb@...nel.org>, <linux-efi@...r.kernel.org>
CC: <linux-arm-kernel@...ts.infradead.org>,
<linux-kernel@...r.kernel.org>,
<James.Bottomley@...senPartnership.com>, <mjg59@...f.ucam.org>,
<pjones@...hat.com>, <ilias.apalodimas@...aro.org>,
<heinrich.schuchardt@...onical.com>, <takahiro.akashi@...aro.org>,
<palmer@...belt.com>, <atishp@...shpatra.org>, <arnd@...db.de>,
<chenhuacai@...ngson.cn>, <xry111@...111.site>,
<lennart@...ttering.net>, <jeremy.linton@....com>,
<will@...nel.org>, <catalin.marinas@....com>
Subject: Re: [PATCH v5 7/8] riscv: efi: enable generic EFI compressed boot
On 10/09/2022 09:11, Ard Biesheuvel wrote:
> EXTERNAL EMAIL: Do not click links or open attachments unless you know the content is safe
>
> Wire up the generic EFI zboot support for RISC-V.
>
> Signed-off-by: Ard Biesheuvel <ardb@...nel.org>
As promised:
Tested-by: Conor Dooley <conor.dooley@...rochip.com>
> ---
> arch/riscv/Makefile | 6 +++++-
> arch/riscv/boot/.gitignore | 1 +
> arch/riscv/boot/Makefile | 6 ++++++
> 3 files changed, 12 insertions(+), 1 deletion(-)
>
> diff --git a/arch/riscv/Makefile b/arch/riscv/Makefile
> index 3fa8ef336822..d63295e21373 100644
> --- a/arch/riscv/Makefile
> +++ b/arch/riscv/Makefile
> @@ -136,10 +136,14 @@ ifneq ($(CONFIG_XIP_KERNEL),y)
> ifeq ($(CONFIG_RISCV_M_MODE)$(CONFIG_SOC_CANAAN),yy)
> KBUILD_IMAGE := $(boot)/loader.bin
> else
> +ifeq ($(CONFIG_EFI_ZBOOT),)
> KBUILD_IMAGE := $(boot)/Image.gz
> +else
> +KBUILD_IMAGE := $(boot)/vmlinuz.efi
> +endif
> endif
> endif
> -BOOT_TARGETS := Image Image.gz loader loader.bin xipImage
> +BOOT_TARGETS := Image Image.gz loader loader.bin xipImage vmlinuz.efi
>
> all: $(notdir $(KBUILD_IMAGE))
>
> diff --git a/arch/riscv/boot/.gitignore b/arch/riscv/boot/.gitignore
> index 0cea9f7fa9d5..e1bc507e8cb2 100644
> --- a/arch/riscv/boot/.gitignore
> +++ b/arch/riscv/boot/.gitignore
> @@ -4,4 +4,5 @@ Image.*
> loader
> loader.lds
> loader.bin
> +vmlinuz*
> xipImage
> diff --git a/arch/riscv/boot/Makefile b/arch/riscv/boot/Makefile
> index becd0621071c..d1a49adcb1d7 100644
> --- a/arch/riscv/boot/Makefile
> +++ b/arch/riscv/boot/Makefile
> @@ -58,3 +58,9 @@ $(obj)/Image.lzo: $(obj)/Image FORCE
>
> $(obj)/loader.bin: $(obj)/loader FORCE
> $(call if_changed,objcopy)
> +
> +EFI_ZBOOT_PAYLOAD := Image
> +EFI_ZBOOT_BFD_TARGET := elf$(BITS)-littleriscv
> +EFI_ZBOOT_MACH_TYPE := RISCV$(BITS)
> +
> +include $(srctree)/drivers/firmware/efi/libstub/Makefile.zboot
> --
> 2.35.1
>
Powered by blists - more mailing lists