From c5d81c27398aa6b19adef0616163ac667c11f227 Mon Sep 17 00:00:00 2001 From: David Karoly Date: Wed, 1 Dec 2021 14:21:25 +0100 Subject: [PATCH] build: prepare for x86 EFI loader MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change-Id: Ic9e4181042bf634cd590d8c95935a987a4871b0d Reviewed-on: https://review.haiku-os.org/c/haiku/+/4753 Tested-by: Commit checker robot Reviewed-by: Jérôme Duval --- build/jam/ImageRules | 2 ++ build/jam/images/MMCImage | 2 ++ src/system/boot/Jamfile | 2 ++ 3 files changed, 6 insertions(+) diff --git a/build/jam/ImageRules b/build/jam/ImageRules index a3be1dec72..8142be43d0 100644 --- a/build/jam/ImageRules +++ b/build/jam/ImageRules @@ -1685,6 +1685,8 @@ rule BuildEfiSystemPartition image : efiLoader Depends $(image) : $(fatshell) ; switch $(TARGET_ARCH) { + case x86 : + EFINAME on $(image) = "BOOTIA32.EFI" ; case x86_64 : EFINAME on $(image) = "BOOTX64.EFI" ; case arm : diff --git a/build/jam/images/MMCImage b/build/jam/images/MMCImage index a21888a43d..17f037df14 100644 --- a/build/jam/images/MMCImage +++ b/build/jam/images/MMCImage @@ -22,6 +22,8 @@ rule BuildSDImage image : files if $(TARGET_BOOT_PLATFORM) = efi { switch $(TARGET_ARCH) { + case x86 : + EFINAME on $(image) = "BOOTIA32.EFI" ; case x86_64 : EFINAME on $(image) = "BOOTX64.EFI" ; case arm : diff --git a/src/system/boot/Jamfile b/src/system/boot/Jamfile index de1b8f6b19..663938d16a 100644 --- a/src/system/boot/Jamfile +++ b/src/system/boot/Jamfile @@ -107,6 +107,8 @@ rule BuildEFILoader { Depends $(efiLoader) : $(bootLoader) ; switch $(TARGET_ARCH) { + case x86 : + OUTPUT_TARGET on $(efiLoader) = pei-i386 ; case x86_64 : OUTPUT_TARGET on $(efiLoader) = pei-x86-64 ; case arm :