From: Mathew McBride <matt@traverse.com.au>
Date: Thu, 20 Apr 2023 06:38:22 +0000 (+0000)
Subject: armvirt: set kernel partition as the EFI system partition
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=84f566b00c1745797e3d3ab66311306a5c27b50f;p=openwrt%2Fstaging%2Fblocktrron.git

armvirt: set kernel partition as the EFI system partition

U-Boot with EFI boot manager functionality will store
EFI boot order data on the ESP in the ubootefi.var file.

Signed-off-by: Mathew McBride <matt@traverse.com.au>
(cherry picked from commit 9a76b99c1bd781248c18d69abe570f35932db8a3)
---

diff --git a/target/linux/armvirt/image/Makefile b/target/linux/armvirt/image/Makefile
index bd75f85996..50c993b522 100644
--- a/target/linux/armvirt/image/Makefile
+++ b/target/linux/armvirt/image/Makefile
@@ -45,7 +45,7 @@ define Build/combined
 		$(CP) $(STAGING_DIR_IMAGE)/grub2/boot$(if $(CONFIG_aarch64),aa64,arm).efi $@.boot/efi/openwrt/
 		$(CP) $(STAGING_DIR_IMAGE)/grub2/boot$(if $(CONFIG_aarch64),aa64,arm).efi $@.boot/efi/boot/
 	)
-	FAT_TYPE="32" PADDING="1" SIGNATURE="$(IMG_PART_SIGNATURE)" \
+	KERNELPARTTYPE=ef FAT_TYPE="32" PADDING="1" SIGNATURE="$(IMG_PART_SIGNATURE)" \
 		$(if $(filter $(1),efi),GUID="$(IMG_PART_DISKGUID)") $(SCRIPT_DIR)/gen_image_generic.sh \
 		$@ \
 		$(CONFIG_TARGET_KERNEL_PARTSIZE) $@.boot \