From 58eea1911b6c5e31f9fa6436106f7ebefafef519 Mon Sep 17 00:00:00 2001 From: Anton Midyukov Date: Tue, 16 Mar 2021 21:12:05 +0700 Subject: [PATCH] boot.mk, efi, grub: Add support riscv64 For riscv64 available grub-efi. Needed added support for mkimage (mki-copy-efiboot-chrooted). --- features.in/efi/config.mk | 2 +- features.in/grub/config.mk | 2 +- lib/boot.mk | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/features.in/efi/config.mk b/features.in/efi/config.mk index 10d28d69..bf84e2f8 100644 --- a/features.in/efi/config.mk +++ b/features.in/efi/config.mk @@ -1,4 +1,4 @@ -EFI_ARCHES := x86_64 aarch64 +EFI_ARCHES := x86_64 aarch64 riscv64 +efi: use/efi/signed; @: diff --git a/features.in/grub/config.mk b/features.in/grub/config.mk index 8dcf92e5..117af348 100644 --- a/features.in/grub/config.mk +++ b/features.in/grub/config.mk @@ -1,7 +1,7 @@ # default is plain text prompt # NB: might be usbflash-ready hybrid iso -ifeq (,$(filter-out i586 x86_64 ppc64le aarch64,$(ARCH))) +ifeq (,$(filter-out i586 x86_64 ppc64le aarch64 riscv64,$(ARCH))) use/grub: sub/stage1 $(ISOHYBRID:%=use/isohybrid) @$(call add_feature) diff --git a/lib/boot.mk b/lib/boot.mk index 2da27d13..08a63156 100644 --- a/lib/boot.mk +++ b/lib/boot.mk @@ -10,7 +10,7 @@ boot/iso: ifeq (,$(filter-out i586 x86_64,$(ARCH))) @$(call try,BOOTLOADER,isolinux) endif -ifeq (,$(filter-out aarch64,$(ARCH))) +ifeq (,$(filter-out aarch64 riscv64,$(ARCH))) @$(call try,BOOTLOADER,efiboot) endif ifeq (,$(filter-out e2k%,$(ARCH)))