From df50c8308b58d4ee8e9aea523f92ae7512ef0e77 Mon Sep 17 00:00:00 2001 From: Ross Burton Date: Mon, 14 Dec 2020 18:31:45 +0000 Subject: image-uefi.conf: add EFI arch variable Refactor EFI_BOOT_IMAGE so that the EFI name for the architecture is exposed as EFI_ARCH, so that other recipes (such as bootloaders) can reuse it. (From OE-Core rev: d3bf2d0fbd50309d7cf8f066c258ba1ebdb05f47) Signed-off-by: Ross Burton Signed-off-by: Richard Purdie --- meta/conf/image-uefi.conf | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) (limited to 'meta/conf') diff --git a/meta/conf/image-uefi.conf b/meta/conf/image-uefi.conf index aaeff12ccb..882a0e720c 100644 --- a/meta/conf/image-uefi.conf +++ b/meta/conf/image-uefi.conf @@ -8,9 +8,12 @@ EFI_PREFIX ?= "/boot" # Location inside rootfs. EFI_FILES_PATH = "${EFI_PREFIX}${EFIDIR}" +# The EFI name for the architecture +EFI_ARCH ?= "INVALID" +EFI_ARCH_x86 = "ia32" +EFI_ARCH_x86-64 = "x64" +EFI_ARCH_aarch64 = "aa64" +EFI_ARCH_arm = "arm" + # Determine name of bootloader image -EFI_BOOT_IMAGE ?= "bootINVALID.efi" -EFI_BOOT_IMAGE_x86-64 = "bootx64.efi" -EFI_BOOT_IMAGE_x86 = "bootia32.efi" -EFI_BOOT_IMAGE_aarch64 = "bootaa64.efi" -EFI_BOOT_IMAGE_arm = "bootarm.efi" +EFI_BOOT_IMAGE ?= "boot${EFI_ARCH}.efi" -- cgit v1.2.3-54-g00ecf