i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

bootloader: Enable GPT partition support in EFI loader

Browse Source 
This was enabled per-architecture, but it is reasonable to always
enable GPT support for all EFI systems, no matter which CPU is used.

Change-Id: I53ca2caf048fbc4ead6cfb74c8734ac9ad382224
Reviewed-on: https://review.haiku-os.org/c/haiku/+/4085
Reviewed-by: Fredrik Holmqvist <[email protected]>
Reviewed-by: Alex von Gluck IV <[email protected]>
Tested-by: Commit checker robot <[email protected]>
This commit is contained in:
Alexander von Gluck IV
2021-06-12 14:04:26 +00:00
committed by Alex von Gluck IV
parent 4365774b68
commit 35fad4a467
1 changed files with 10 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/system/boot/loader/Jamfile
+10 -21
View File
@@ -30,6 +30,13 @@ for platform in [ MultiBootSubDirSetup ] {
BOOT_SUPPORT_FILE_SYSTEM_FAT BOOT_SUPPORT_FILE_SYSTEM_FAT
; ;
if $(TARGET_BOOT_PLATFORM) = efi {
DEFINES +=
_BOOT_PLATFORM_EFI
BOOT_SUPPORT_PARTITION_EFI
;
}
# Add architecture specific partition/file system modules # Add architecture specific partition/file system modules
switch $(TARGET_KERNEL_ARCH) { switch $(TARGET_KERNEL_ARCH) {
@@ -53,11 +60,7 @@ for platform in [ MultiBootSubDirSetup ] {
#BOOT_SUPPORT_FILE_SYSTEM_FAT #BOOT_SUPPORT_FILE_SYSTEM_FAT
; ;
if $(TARGET_BOOT_PLATFORM) = efi { if $(TARGET_BOOT_PLATFORM) != efi {
DEFINES +=
_BOOT_PLATFORM_EFI
;
} else {
DEFINES += DEFINES +=
_BOOT_PLATFORM_BIOS _BOOT_PLATFORM_BIOS
BOOT_SUPPORT_ELF32 BOOT_SUPPORT_ELF32
@@ -66,20 +69,11 @@ for platform in [ MultiBootSubDirSetup ] {
} }
case "sparc" : case "sparc" :
{ {
DEFINES += DEFINES += BOOT_SUPPORT_ELF64 ;
BOOT_SUPPORT_ELF64
;
} }
case "riscv64" : case "riscv64" :
{ {
DEFINES += DEFINES += BOOT_SUPPORT_ELF64 ;
BOOT_SUPPORT_ELF64
;
if $(TARGET_BOOT_PLATFORM) = efi {
DEFINES +=
_BOOT_PLATFORM_EFI
;
}
} }
case "m68k" : case "m68k" :
{ {
@@ -88,11 +82,6 @@ for platform in [ MultiBootSubDirSetup ] {
case "arm" : case "arm" :
{ {
DEFINES += BOOT_SUPPORT_ELF32 ; DEFINES += BOOT_SUPPORT_ELF32 ;
if $(TARGET_BOOT_PLATFORM) = efi {
DEFINES +=
_BOOT_PLATFORM_EFI
;
}
} }
} }