bootloader: Enable GPT partition support in EFI loader

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]>
2021-06-12 14:04:26 +00:00
parent 4365774b68
commit 35fad4a467
1 changed files with 10 additions and 21 deletions
@@ -30,6 +30,13 @@ for platform in [ MultiBootSubDirSetup ] {
 				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

 			switch $(TARGET_KERNEL_ARCH) {
@@ -53,11 +60,7 @@ for platform in [ MultiBootSubDirSetup ] {

 						#BOOT_SUPPORT_FILE_SYSTEM_FAT
 					;
-					if $(TARGET_BOOT_PLATFORM) = efi {
-						DEFINES +=
-							_BOOT_PLATFORM_EFI
-						;
-					} else {
+					if $(TARGET_BOOT_PLATFORM) != efi {
 						DEFINES +=
 							_BOOT_PLATFORM_BIOS
 							BOOT_SUPPORT_ELF32
@@ -66,20 +69,11 @@ for platform in [ MultiBootSubDirSetup ] {
 				}
 				case "sparc" :
 				{
-					DEFINES +=
-						BOOT_SUPPORT_ELF64
-					;
+					DEFINES += BOOT_SUPPORT_ELF64 ;
 				}
 				case "riscv64" :
 				{
-					DEFINES +=
-						BOOT_SUPPORT_ELF64
-					;
-					if $(TARGET_BOOT_PLATFORM) = efi {
-						DEFINES +=
-							_BOOT_PLATFORM_EFI
-						;
-					}
+					DEFINES += BOOT_SUPPORT_ELF64 ;
 				}
 				case "m68k" :
 				{
@@ -88,11 +82,6 @@ for platform in [ MultiBootSubDirSetup ] {
 				case "arm" :
 				{
 					DEFINES += BOOT_SUPPORT_ELF32 ;
-					if $(TARGET_BOOT_PLATFORM) = efi {
-						DEFINES +=
-							_BOOT_PLATFORM_EFI
-						;
-					}
 				}
 			}