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 <[email protected]>
(cherry picked from commit 9a76b99c1bd781248c18d69abe570f35932db8a3)

diff --git a/target/linux/armvirt/image/Makefile b/target/linux/armvirt/image/Makefile
index bd75f85996d72b42ce7c2f6f7660fa74221ad195..50c993b5225d6f3e273f8e080af93da590f0ef5f 100644 (file)
--- 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 [email protected]/efi/openwrt/
                $(CP) $(STAGING_DIR_IMAGE)/grub2/boot$(if $(CONFIG_aarch64),aa64,arm).efi [email protected]/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) [email protected] \