[openwrt/openwrt] armvirt: set kernel partition as the EFI system partition

[LEDE Commits]

ynezz pushed a commit to openwrt/openwrt.git, branch openwrt-23.05:
https://git.openwrt.org/84f566b00c1745797e3d3ab66311306a5c27b50f

commit 84f566b00c1745797e3d3ab66311306a5c27b50f
Author: Mathew McBride <matt at traverse.com.au>
AuthorDate: Thu Apr 20 06:38:22 2023 +0000

    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 at traverse.com.au>
    (cherry picked from commit 9a76b99c1bd781248c18d69abe570f35932db8a3)
---
 target/linux/armvirt/image/Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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 \