Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

riscv: efi: enable generic EFI compressed boot

Wire up the generic EFI zboot support for RISC-V.

Signed-off-by: Ard Biesheuvel <ardb@kernel.org>
Acked-by: Palmer Dabbelt <palmer@rivosinc.com>
Tested-by: Conor Dooley <conor.dooley@microchip.com>

+12 -1
+5 -1
arch/riscv/Makefile
··· 136 136 ifeq ($(CONFIG_RISCV_M_MODE)$(CONFIG_SOC_CANAAN),yy) 137 137 KBUILD_IMAGE := $(boot)/loader.bin 138 138 else 139 + ifeq ($(CONFIG_EFI_ZBOOT),) 139 140 KBUILD_IMAGE := $(boot)/Image.gz 141 + else 142 + KBUILD_IMAGE := $(boot)/vmlinuz.efi 140 143 endif 141 144 endif 142 - BOOT_TARGETS := Image Image.gz loader loader.bin xipImage 145 + endif 146 + BOOT_TARGETS := Image Image.gz loader loader.bin xipImage vmlinuz.efi 143 147 144 148 all: $(notdir $(KBUILD_IMAGE)) 145 149
+1
arch/riscv/boot/.gitignore
··· 4 4 loader 5 5 loader.lds 6 6 loader.bin 7 + vmlinuz* 7 8 xipImage
+6
arch/riscv/boot/Makefile
··· 58 58 59 59 $(obj)/loader.bin: $(obj)/loader FORCE 60 60 $(call if_changed,objcopy) 61 + 62 + EFI_ZBOOT_PAYLOAD := Image 63 + EFI_ZBOOT_BFD_TARGET := elf$(BITS)-littleriscv 64 + EFI_ZBOOT_MACH_TYPE := RISCV$(BITS) 65 + 66 + include $(srctree)/drivers/firmware/efi/libstub/Makefile.zboot