system/boot: Add support for multiple bootloaders

build/jam/ArchitectureRules

@@ -239,13 +239,15 @@ rule KernelArchitectureSetup architecture
 
 	switch $(cpu) {
 		case ppc :
-			HAIKU_BOOT_PLATFORM ?= openfirmware ;
+			HAIKU_KERNEL_PLATFORM ?= openfirmware ;
-			HAIKU_BOOT_FLOPPY_IMAGE_SIZE = 2880 ; # in kB
+			HAIKU_BOOT_TARGETS += openfirmware ;
+			HAIKU_BOOT_FLOPPY_IMAGE_SIZE = 1440 ; # in kB
 			# offset in floppy image (>= sizeof(haiku_loader))
 			HAIKU_BOOT_ARCHIVE_IMAGE_OFFSET = 384 ; # in kB
 
 		case arm :
-			HAIKU_BOOT_PLATFORM ?= u-boot ;
+			HAIKU_KERNEL_PLATFORM ?= u-boot ;
+			HAIKU_BOOT_TARGETS += u-boot ;
 
 			HAIKU_BOOT_SDIMAGE_SIZE ?= 128 ;
 			# SOC's like allwinner need an offset to skip the hardcoded initial loader
@@ -269,7 +271,9 @@ rule KernelArchitectureSetup architecture
 			HAIKU_BOOT_LOADER_BASE ?= 0x1000000 ;
 
 		case x86 :
-			HAIKU_BOOT_PLATFORM ?= bios_ia32 ;
+			HAIKU_KERNEL_PLATFORM ?= bios_ia32 ;
+			HAIKU_BOOT_TARGETS += bios_ia32 pxe_ia32 ;
+
 			HAIKU_BOOT_FLOPPY_IMAGE_SIZE = 2880 ; # in kB
 			# offset in floppy image (>= sizeof(haiku_loader))
 			HAIKU_BOOT_ARCHIVE_IMAGE_OFFSET = 320 ; # in kB
@@ -280,8 +284,10 @@ rule KernelArchitectureSetup architecture
 			}
 
 		case x86_64 :
-			# x86_64 completely shares the x86 bootloader.
+			# x86_64 completely shares the x86 bootloader for MBR.
-			HAIKU_BOOT_PLATFORM ?= bios_ia32 ;
+			HAIKU_KERNEL_PLATFORM ?= bios_ia32 ;
+			HAIKU_BOOT_TARGETS += bios_ia32 efi pxe_ia32 ;
+
 			HAIKU_BOOT_FLOPPY_IMAGE_SIZE = 2880 ; # in kB
 			# offset in floppy image (>= sizeof(haiku_loader))
 			HAIKU_BOOT_ARCHIVE_IMAGE_OFFSET = 320 ; # in kB
@@ -295,8 +301,9 @@ rule KernelArchitectureSetup architecture
 			}
 
 		case m68k :
-			HAIKU_BOOT_PLATFORM ?= atari_m68k ;
+			HAIKU_KERNEL_PLATFORM ?= atari_m68k ;
-			switch $(HAIKU_BOOT_PLATFORM) {
+			HAIKU_BOOT_TARGETS += atari_m68k ;
+			switch $(HAIKU_KERNEL_PLATFORM) {
 				case atari_m68k :
 				{
 					HAIKU_BOOT_FLOPPY_IMAGE_SIZE = 1440 ; # in kB
@@ -319,7 +326,7 @@ rule KernelArchitectureSetup architecture
 	# private kernel headers to be used when compiling kernel code
 	HAIKU_PRIVATE_KERNEL_HEADERS =
 		[ PrivateHeaders $(DOT) kernel libroot shared
-			kernel/boot/platform/$(HAIKU_BOOT_PLATFORM) ]
+			kernel/boot/platform/$(HAIKU_KERNEL_PLATFORM) ]
 		[ ArchHeaders $(HAIKU_KERNEL_ARCH) ]
 		[ FDirName $(HAIKU_COMMON_DEBUG_OBJECT_DIR_$(architecture)) system
 			kernel ]
@@ -379,11 +386,8 @@ rule KernelArchitectureSetup architecture
 			HAIKU_KERNEL_C++FLAGS += -mtune=68020-60 ;
 
 		case x86 :
-			# EFI Bootloader
+			HAIKU_KERNEL_CCFLAGS += -march=pentium ;
-			if $(HAIKU_BOOT_PLATFORM) = efi {
+			HAIKU_KERNEL_C++FLAGS += -march=pentium ;
-				HAIKU_BOOT_CCFLAGS += -mno-red-zone -maccumulate-outgoing-args ;
-				HAIKU_BOOT_C++FLAGS += -mno-red-zone -maccumulate-outgoing-args ;
-			}
 
 		case x86_64 :
 			# Kernel lives in the top 2GB of the address space, use kernel code
@@ -398,23 +402,6 @@ rule KernelArchitectureSetup architecture
 			HAIKU_KERNEL_PIC_LINKFLAGS += -z max-page-size=0x1000 ;
 			HAIKU_KERNEL_ADDON_LINKFLAGS += -z max-page-size=0x1000 ;
 
-			# BIOS Bootloader is 32-bit.
-			if $(HAIKU_BOOT_PLATFORM) = bios_ia32 {
-				if $(HAIKU_CC_IS_CLANG_$(architecture)) = 1 {
-					HAIKU_BOOT_LINKFLAGS += -m elf_i386 ;
-				} else {
-					HAIKU_BOOT_LINKFLAGS += -m elf_i386_haiku ;
-				}
-				HAIKU_BOOT_CCFLAGS += -m32 -march=pentium ;
-				HAIKU_BOOT_C++FLAGS += -m32 -march=pentium ;
-			}
-
-			# EFI Bootloader
-			if $(HAIKU_BOOT_PLATFORM) = efi {
-				HAIKU_BOOT_CCFLAGS += -mno-red-zone -maccumulate-outgoing-args ;
-				HAIKU_BOOT_C++FLAGS += -mno-red-zone -maccumulate-outgoing-args ;
-			}
-
 			if x86 in $(HAIKU_ARCHS[2-]) || x86_gcc2 in $(HAIKU_ARCHS[2-]) {
 				Echo "Enable kernel ia32 compatibility" ;
 				HAIKU_KERNEL_DEFINES += _COMPAT_MODE ;
@@ -422,15 +409,50 @@ rule KernelArchitectureSetup architecture
 			}
 	}
 
-	if $(HAIKU_BOOT_PLATFORM) = efi {
+	local bootTarget ;
-		HAIKU_BOOT_CCFLAGS += -fpic -fno-stack-protector -fPIC -fshort-wchar
+	for bootTarget in $(HAIKU_BOOT_TARGETS) {
-			-Wno-error=unused-variable ;
+		switch $(bootTarget) {
-		HAIKU_BOOT_C++FLAGS += -fpic -fno-stack-protector -fPIC -fshort-wchar
+			case efi :
-			-Wno-error=unused-variable ;
+				# efi bootloader is PIC
-		HAIKU_BOOT_LDFLAGS = -Bstatic -Bsymbolic -shared -nostdlib -znocombreloc -nostartfiles -no-undefined ;
+				HAIKU_BOOT_$(bootTarget:U)_CCFLAGS += -fpic -fno-stack-protector
+					-fPIC -fshort-wchar -mno-red-zone -maccumulate-outgoing-args
+					-Wno-error=unused-variable -Wno-error=main ;
+				HAIKU_BOOT_$(bootTarget:U)_C++FLAGS += -fpic -fno-stack-protector
+					-fPIC -fshort-wchar -mno-red-zone -maccumulate-outgoing-args
+					-Wno-error=unused-variable -Wno-error=main ;
+				HAIKU_BOOT_$(bootTarget:U)_LDFLAGS = -Bstatic -Bsymbolic
+					-nostdlib -znocombreloc -nostartfiles -no-undefined ;
+			case bios_ia32 :
+				# bios_ia32 is non-PIC
+				HAIKU_BOOT_$(bootTarget:U)_CCFLAGS += -fno-pic -march=pentium ;
+				HAIKU_BOOT_$(bootTarget:U)_C++FLAGS += -fno-pic -march=pentium ;
+				if $(HAIKU_CC_IS_CLANG_$(architecture)) = 1 {
+					HAIKU_BOOT_$(bootTarget:U)_LDFLAGS += -m elf_i386 ;
 				} else {
-		HAIKU_BOOT_CCFLAGS += -fno-pic ;
+					HAIKU_BOOT_$(bootTarget:U)_LDFLAGS += -m elf_i386_haiku ;
-		HAIKU_BOOT_C++FLAGS += -fno-pic ;
+				}
+				if $(gccVersion[1]) >= 3 {
+					HAIKU_BOOT_$(bootTarget:U)_CCFLAGS += -Wno-error=main -m32 ;
+					HAIKU_BOOT_$(bootTarget:U)_C++FLAGS += -Wno-error=main -m32 ;
+				}
+			case pxe_ia32 :
+				# pxe_ia32 is non-PIC
+				HAIKU_BOOT_$(bootTarget:U)_CCFLAGS += -fno-pic -march=pentium ;
+				HAIKU_BOOT_$(bootTarget:U)_C++FLAGS += -fno-pic -march=pentium ;
+				if $(HAIKU_CC_IS_CLANG_$(architecture)) = 1 {
+					HAIKU_BOOT_$(bootTarget:U)_LDFLAGS += -m elf_i386 ;
+				} else {
+					HAIKU_BOOT_$(bootTarget:U)_LDFLAGS += -m elf_i386_haiku ;
+				}
+				if $(gccVersion[1]) >= 3 {
+					HAIKU_BOOT_$(bootTarget:U)_CCFLAGS += -Wno-error=main -m32 ;
+					HAIKU_BOOT_$(bootTarget:U)_C++FLAGS += -Wno-error=main -m32 ;
+				}
+			case * :
+				# all other bootloaders are non-PIC
+				HAIKU_BOOT_$(bootTarget:U)_CCFLAGS += -fno-pic -Wno-error=main ;
+				HAIKU_BOOT_$(bootTarget:U)_C++FLAGS += -fno-pic -Wno-error=main ;
+		}
 	}
 
 	# warning flags

build/jam/BootRules

@@ -1,3 +1,65 @@
+rule MultiBootSubDirSetup bootTargets
+{
+	local result ;
+	local bootTarget ;
+	bootTargets ?= $(HAIKU_BOOT_TARGETS) ;
+	for bootTarget in $(bootTargets) {
+		local bootTargetObject = $(bootTarget:G=<boot-target-object>) ;
+		result += $(bootTargetObject) ;
+
+		TARGET_BOOT_PLATFORM on $(bootTargetObject) = $(bootTarget) ;
+
+		SOURCE_GRIST on $(bootTargetObject)
+			= $(SOURCE_GRIST:E=)!$(bootTarget) ;
+
+		HDRGRIST on $(bootTargetObject)
+			= $(HDRGRIST:E=)!$(bootTarget) ;
+
+		local var ;
+		for var in TARGET_ARCH {
+			$(var) on $(architectureObject) = $($(var)_$(architecture)) ;
+		}
+
+		# Clone the current config variable values and the variables SubDir
+		# resets.
+		for var in $(AUTO_SET_UP_CONFIG_VARIABLES) SUBDIR$(SUBDIRRESET) {
+			$(var) on $(architectureObject) = $($(var)) ;
+		}
+
+		local hostTarget = HOST TARGET ;
+		local objectDirVars =
+			COMMON_ARCH COMMON_DEBUG DEBUG_$(HAIKU_DEBUG_LEVELS)
+			;
+		objectDirVars =
+			COMMON_PLATFORM_LOCATE_TARGET
+			$(hostTarget)_$(objectDirVars)_LOCATE_TARGET
+			LOCATE_TARGET
+			LOCATE_SOURCE
+			SEARCH_SOURCE
+			;
+
+		for var in $(objectDirVars) {
+			$(var) on $(bootTargetObject) = ;
+		}
+
+		on $(bootTargetObject) {
+			SetupObjectsDir ;
+			SetupFeatureObjectsDir $(bootTarget) ;
+
+			for var in $(objectDirVars) {
+				$(var) on $(bootTargetObject) = $($(var)) ;
+			}
+		}
+	}
+
+	return $(result) ;
+}
+
+rule MultiBootGristFiles files
+{
+	return $(files:G=$(TARGET_BOOT_PLATFORM)) ;
+}
+
 rule SetupBoot
 {
 	# Usage SetupBoot <sources_or_objects> : <extra_cc_flags> : <include_private_headers> ;
@@ -19,13 +81,20 @@ rule SetupBoot
 			$(HAIKU_BOOT_C++_HEADERS_DIR_$(TARGET_PACKAGING_ARCH)) ;
 	}
 
+	# MultiBootSubDirSetup sets the target boot platform on the target object,
+	# so this will be correct here in SetupBoot.
+	# This does mean, however, that MultiBootSubDirSetup needs to be used in
+	# all Jamfiles for things to work correctly.
+	# Also means ArchitectureRules need to use platform specific variables,
+	# rather than the previously generic TARGET_BOOT_CCFLAGS and friends.
+	local platform = $(TARGET_BOOT_PLATFORM:U) ;
 	local object ;
 	for object in $(objects) {
 		# add boot flags for the object
-		ObjectCcFlags $(object) : $(TARGET_BOOT_CCFLAGS) $(2) ;
+		ObjectCcFlags $(object) : $(HAIKU_BOOT_CCFLAGS) $(HAIKU_BOOT_$(platform)_CCFLAGS) $(2) ;
-		ObjectC++Flags $(object) : $(TARGET_BOOT_C++FLAGS) $(2) ;
+		ObjectC++Flags $(object) : $(HAIKU_BOOT_C++FLAGS) $(HAIKU_BOOT_$(platform)_C++FLAGS) $(2) ;
 		ObjectDefines $(object) : $(TARGET_KERNEL_DEFINES) ;
-		ASFLAGS on $(object) = $(TARGET_BOOT_CCFLAGS) ;
+		ASFLAGS on $(object) = $(HAIKU_BOOT_$(platform)_CCFLAGS) ;
 
 		# override warning flags
 		TARGET_WARNING_CCFLAGS_$(TARGET_PACKAGING_ARCH) on $(object)
@@ -47,11 +116,12 @@ rule BootLd
 
 	LINK on $(1) = $(TARGET_LD_$(TARGET_PACKAGING_ARCH)) ;
 
-	LINKFLAGS on $(1) = $(TARGET_BOOT_LINKFLAGS) $(4) ;
+	LINKFLAGS on $(1) = $(HAIKU_BOOT_$(TARGET_BOOT_PLATFORM:U)_LDFLAGS) $(4) ;
 	if $(3) { LINKFLAGS on $(1) += --script=$(3) ; }
 
 	# Remove any preset LINKLIBS, but link against libgcc.a. Linking against
 	# libsupc++ is opt-out.
+	if $(TARGET_BOOT_PLATFORM) != efi {
 		local libs ;
 		if ! [ on $(1) return $(HAIKU_NO_LIBSUPC++) ] {
 			libs += [ TargetBootLibsupc++ true ] ;
@@ -59,6 +129,7 @@ rule BootLd
 		}
 		LINKLIBS on $(1) = $(libs) [ TargetBootLibgcc true ] ;
 		Depends $(1) : [ TargetBootLibgcc ] ;
+	}
 
 	# TODO: Do we really want to invoke SetupBoot here? The objects should
 	# have been compiled with BootObjects anyway, so we're doing that twice.
@@ -99,7 +170,7 @@ rule BootMergeObject
 	SetupBoot $(2) : $(3) ;
 	Objects $(2) ;
 	MergeObjectFromObjects $(1) : $(2:S=$(SUFOBJ)) : $(4) ;
-	LINKFLAGS on $(1) += $(TARGET_BOOT_LINKFLAGS) ;
+	LINKFLAGS on $(1) += $(HAIKU_BOOT_$(TARGET_BOOT_PLATFORM:U)_LDFLAGS) ;
 }
 
 rule BootStaticLibrary

build/jam/BuildSetup

@@ -656,7 +656,7 @@ for var in $(archDependentBuildVars)_$(TARGET_PACKAGING_ARCHS) {
 TARGET_BOOT_LIBGCC		= $(HAIKU_BOOT_LIBGCC_$(TARGET_PACKAGING_ARCH)) ;
 TARGET_BOOT_LIBSUPC++	= $(HAIKU_BOOT_LIBSUPC++_$(TARGET_PACKAGING_ARCH)) ;
 
-TARGET_BOOT_PLATFORM	?= $(HAIKU_BOOT_PLATFORM) ;
+TARGET_KERNEL_PLATFORM	?= $(HAIKU_KERNEL_PLATFORM) ;
 
 local architecture ;
 for architecture in $(TARGET_PACKAGING_ARCHS) {

build/jam/ImageRules

@@ -1492,12 +1492,12 @@ rule BuildFloppyBootImage image : haikuLoader : archive
 	FLOPPY_IMAGE_SIZE on $(image) = $(HAIKU_BOOT_FLOPPY_IMAGE_SIZE) ;
 	ARCHIVE_IMAGE_OFFSET on $(image) = $(HAIKU_BOOT_ARCHIVE_IMAGE_OFFSET) ;
 	BuildFloppyBootImage1 $(image) : $(haikuLoader) $(archive) ;
-	if $(HAIKU_BOOT_PLATFORM) = atari_m68k {
+	if $(HAIKU_KERNEL_PLATFORM) = atari_m68k {
 		Depends $(image) : <build>fixup_tos_boot_checksum ;
 		BuildFloppyBootImageFixupM68K $(image)
 			: <build>fixup_tos_boot_checksum ;
 	}
-	if $(HAIKU_BOOT_PLATFORM) = amiga_m68k {
+	if $(HAIKU_KERNEL_PLATFORM) = amiga_m68k {
 		Depends $(image) : <build>fixup_amiga_boot_checksum ;
 		BuildFloppyBootImageFixupM68K $(image)
 			: <build>fixup_amiga_boot_checksum ;
@@ -1544,20 +1544,21 @@ actions BuildFloppyBootImageFixupM68K
 
 #pragma mark - CD Boot Image rules
 
-rule BuildCDBootImage image : bootfloppy : extrafiles
+rule BuildCDBootImage image : bootfloppy : bootefi : extrafiles
 {
 	Depends $(image) : $(bootfloppy) ;
+	Depends $(image) : $(bootefi) ;
 	Depends $(image) : $(extrafiles) ;
 	BOOTIMG on $(image) = $(bootfloppy) ;
+	BOOTEFI on $(image) = $(bootefi) ;
 
-	BuildCDBootImage1 $(image) : $(bootfloppy) $(extrafiles) ;
+	BuildCDBootImage1 $(image) : $(bootfloppy) $(bootefi) $(extrafiles) ;
 }
 
 actions BuildCDBootImage1
 {
 	$(RM) $(<)
-	mkisofs -b $(BOOTIMG) -r -J -V bootimg -o $(<) $(>[1]) $(>[2-]) \
+	mkisofs -b $(BOOTIMG) -eltorito-alt-boot -no-emul-boot -e $(BOOTEFI) -r -J -V bootimg -o $(<) $(>[1]) $(>[2]) $(>[3-])
-		|| genisoimage -b $(BOOTIMG) -r -J -V bootimg -o $(<) $(>[1]) $(>[2-])
 }
 
 
@@ -1600,3 +1601,22 @@ actions BuildCDBootPPCImage1 bind MAPS
 		boot/haikuloader.xcf -r -o $(<) $(HAIKU_OUTPUT_DIR)/cd
 	$(RM) -r $(HAIKU_OUTPUT_DIR)/cd
 }
+
+#pragma mark - EFI System Partition rules
+
+rule BuildEfiSystemPartition image : efiLoader
+{
+	Depends $(image) : $(efiLoader) ;
+
+	BuildEfiSystemPartition1 $(image) : $(efiLoader) ;
+}
+
+actions BuildEfiSystemPartition1
+{
+	$(RM) $(<)
+	dd if=/dev/zero of=$(<) bs=1024 count=2880
+	mformat -i $(<) -n 36 -h 2 -t 80
+	mmd -D s -i $(<) ::/EFI
+	mmd -D s -i $(<) ::/EFI/BOOT
+	mcopy -D o -i $(<) $(>) ::/EFI/BOOT/BOOTX64.EFI
+}

build/jam/board/sam460ex/BoardSetup

@@ -3,7 +3,7 @@
 HAIKU_BOARD_DESCRIPTION = "ACube Sam460ex" ;
 
 # must force both since they are set before this file is read.
-HAIKU_BOOT_PLATFORM = u-boot ;
+HAIKU_KERNEL_PLATFORM = u-boot ;
 
 #FIXME!!!!!!!!!!!!!!!
 #

build/jam/images/AnybootImage

@@ -19,13 +19,41 @@ actions BuildAnybootImage1 {
 	$(2[1]) -b $(2[2]) $(2[3]) $(2[4]) $(1)
 }
 
+rule BuildAnybootImageEfi anybootImage : mbrPart : efiPart : isoPart : imageFile {
+	local anyboot = <build>anyboot ;
+
+	Depends $(anybootImage) : $(anyboot) ;
+	Depends $(anybootImage) : $(isoPart) ;
+	Depends $(anybootImage) : $(mbrPart) ;
+	Depends $(anybootImage) : $(efiPart) ;
+	Depends $(anybootImage) : $(imageFile) ;
+
+	BuildAnybootImageEfi1 $(anybootImage) : $(anyboot) $(mbrPart) $(efiPart) $(isoPart) $(imageFile) ;
+}
+
+actions BuildAnybootImageEfi1 {
+	$(2[1]) -b $(2[2]) -e $(2[3]) $(2[4]) $(2[5]) $(1)
+}
+
 local baseMBR = base_mbr.bin ;
 local mbrSource = [ FDirName $(HAIKU_TOP) src bin writembr mbr.S ] ;
 BuildMBR $(baseMBR) : $(mbrSource) ;
 MakeLocate $(baseMBR) : $(HAIKU_OUTPUT_DIR) ;
 MakeLocate $(HAIKU_ANYBOOT) : $(HAIKU_ANYBOOT_DIR) ;
+
+if $(HAIKU_ANYBOOT_UEFI) = 1 {
+	Echo "Anyboot is MBR/UEFI hybrid" ;
+	local efiLoader = haiku_loader.efi ;
+	local efiPartition = esp.image ;
+	MakeLocate $(efiPartition) ;
+	BuildEfiSystemPartition $(efiPartition) : $(efiLoader) ;
+	BuildAnybootImageEfi $(HAIKU_ANYBOOT) : $(baseMBR) : $(efiPartition) : $(HAIKU_CD_BOOT_IMAGE)
+		: $(HAIKU_IMAGE_NAME) ;
+} else {
+	Echo "Anyboot is MBR only" ;
 	BuildAnybootImage $(HAIKU_ANYBOOT) : $(baseMBR) : $(HAIKU_CD_BOOT_IMAGE)
 		: $(HAIKU_IMAGE_NAME) ;
+}
 
 # TODO: this one seems to cause the build to fail each other run (caching?)
 #RmTemps $(HAIKU_ANYBOOT) : $(baseMBR) ;

build/jam/images/CDBootImage

@@ -28,9 +28,14 @@ if $(TARGET_ARCH) = ppc {
 
 	BuildCDBootPPCImage $(HAIKU_CD_BOOT_IMAGE) : $(hfsmaps) : $(elfloader) : $(coffloader) : $(chrpscript) : $(extras) ;
 } else {
-	SEARCH on $(extras) = [ FDirName $(HAIKU_TOP) data boot_cd ] ;
+	local efiLoader = haiku_loader.efi ;
+	local efiPartition = esp.image ;
+	MakeLocate $(efiPartition) : $(HAIKU_OUTPUT_DIR) ;
+	BuildEfiSystemPartition $(efiPartition) : $(efiLoader) ;
 
-	BuildCDBootImage $(HAIKU_CD_BOOT_IMAGE) : $(HAIKU_BOOT_FLOPPY) : $(extras) ;
+	BuildCDBootImage $(HAIKU_CD_BOOT_IMAGE) : $(HAIKU_BOOT_FLOPPY) : $(efiPartition) : $(extras) ;
+
+	SEARCH on $(extras) = [ FDirName $(HAIKU_TOP) data boot_cd ] ;
 }
 
 NotFile haiku-boot-cd ;

build/jam/images/FloppyBootImage

@@ -169,7 +169,7 @@ Depends haiku-floppyboot-archive : $(HAIKU_FLOPPY_BOOT_ARCHIVE) ;
 HAIKU_BOOT_FLOPPY = haiku-boot-floppy.image ;
 MakeLocate $(HAIKU_BOOT_FLOPPY) : $(HAIKU_OUTPUT_DIR) ;
 
-BuildFloppyBootImage $(HAIKU_BOOT_FLOPPY) : haiku_loader
+BuildFloppyBootImage $(HAIKU_BOOT_FLOPPY) : haiku_loader.$(HAIKU_KERNEL_PLATFORM)
 	: $(HAIKU_FLOPPY_BOOT_ARCHIVE) ;
 
 # remove the archive

build/jam/packages/HaikuLoader

@@ -3,7 +3,7 @@ HaikuPackage $(haikuLoaderPackage) ;
 
 
 # boot loader
-AddFilesToPackage : haiku_loader ;
+AddFilesToPackage : haiku_loader.$(HAIKU_KERNEL_PLATFORM) ;
 
 
 # Force no compression, so the stage one loader can directly execute the boot

src/add-ons/kernel/bluetooth/btCoreData/Jamfile

@@ -2,7 +2,7 @@ SubDir HAIKU_TOP src add-ons kernel bluetooth btCoreData ;
 
 UsePrivateHeaders kernel net bluetooth ;
 UsePrivateHeaders [ FDirName kernel arch $(TARGET_KERNEL_ARCH) ] ;
-UsePrivateHeaders [ FDirName kernel boot platform $(TARGET_BOOT_PLATFORM) ] ;
+#UsePrivateHeaders [ FDirName kernel boot platform $(TARGET_KERNEL_PLATFORM) ] ;
 
 # disable debug output, if debugging is disabled
 if $(DEBUG) = 0 {

src/add-ons/kernel/bluetooth/hci/Jamfile

@@ -3,7 +3,7 @@ SubDir HAIKU_TOP src add-ons kernel bluetooth hci ;
 UsePrivateKernelHeaders ;
 UsePrivateHeaders net bluetooth ;
 UsePrivateHeaders [ FDirName kernel arch $(TARGET_KERNEL_ARCH) ] ;
-UsePrivateHeaders [ FDirName kernel boot platform $(TARGET_BOOT_PLATFORM) ] ;
+#UsePrivateHeaders [ FDirName kernel boot platform $(TARGET_KERNEL_PLATFORM) ] ;
 
 # disable debug output, if debugging is disabled
 if $(DEBUG) = 0 {

src/add-ons/kernel/bus_managers/isa/arch/arm/Jamfile

@@ -3,7 +3,6 @@ SubDir HAIKU_TOP src add-ons kernel bus_managers isa arch arm ;
 SubDirHdrs [ FDirName $(SUBDIR) $(DOTDOT) $(DOTDOT) ] ;
 
 UsePrivateHeaders kernel [ FDirName kernel arch arm ] ;
-UsePrivateHeaders [ FDirName kernel boot platform $(TARGET_BOOT_PLATFORM) ] ;
 
 KernelStaticLibrary isa_arch_bus_manager : 
 	isa_dma.c

src/add-ons/kernel/bus_managers/isa/arch/m68k/Jamfile

@@ -3,7 +3,6 @@ SubDir HAIKU_TOP src add-ons kernel bus_managers isa arch m68k ;
 SubDirHdrs [ FDirName $(SUBDIR) $(DOTDOT) $(DOTDOT) ] ;
 
 UsePrivateHeaders kernel [ FDirName kernel arch m68k ] ;
-UsePrivateHeaders [ FDirName kernel boot platform $(TARGET_BOOT_PLATFORM) ] ;
 
 KernelStaticLibrary isa_arch_bus_manager : 
 	isa_dma.c

src/add-ons/kernel/bus_managers/isa/arch/ppc/Jamfile

@@ -3,7 +3,6 @@ SubDir HAIKU_TOP src add-ons kernel bus_managers isa arch ppc ;
 SubDirHdrs [ FDirName $(SUBDIR) $(DOTDOT) $(DOTDOT) ] ;
 
 #UsePrivateHeaders kernel [ FDirName kernel arch ppc ] ;
-#UsePrivateHeaders [ FDirName kernel boot platform $(TARGET_BOOT_PLATFORM) ] ;
 UsePrivateKernelHeaders ;
 
 KernelStaticLibrary isa_arch_bus_manager : 

src/add-ons/kernel/bus_managers/isa/arch/x86/Jamfile

@@ -3,7 +3,6 @@ SubDir HAIKU_TOP src add-ons kernel bus_managers isa arch x86 ;
 SubDirHdrs [ FDirName $(SUBDIR) $(DOTDOT) $(DOTDOT) ] ;
 
 UsePrivateHeaders kernel [ FDirName kernel arch x86 ] ;
-UsePrivateHeaders [ FDirName kernel boot platform $(TARGET_BOOT_PLATFORM) ] ;
 
 KernelStaticLibrary isa_arch_bus_manager : 
 	isa_dma.cpp

src/add-ons/kernel/file_cache/Jamfile

@@ -2,7 +2,6 @@ SubDir HAIKU_TOP src add-ons kernel file_cache ;
 
 UsePrivateKernelHeaders ;
 UsePrivateHeaders [ FDirName kernel arch $(TARGET_KERNEL_ARCH) ] ;
-UsePrivateHeaders [ FDirName kernel boot platform $(TARGET_BOOT_PLATFORM) ] ;
 
 KernelAddon log :
 	log.cpp

src/bin/makebootable/Jamfile

@@ -1,5 +1,5 @@
 SubDir HAIKU_TOP src bin makebootable ;
 
-if $(TARGET_BOOT_PLATFORM) {
+if $(TARGET_KERNEL_PLATFORM) {
-	SubInclude HAIKU_TOP src bin makebootable platform $(TARGET_BOOT_PLATFORM) ;
+	SubInclude HAIKU_TOP src bin makebootable platform $(TARGET_KERNEL_PLATFORM) ;
 }

src/system/boot/Jamfile

@@ -1,9 +1,74 @@
 SubDir HAIKU_TOP src system boot ;
 
-SetupFeatureObjectsDir $(TARGET_BOOT_PLATFORM) ;
-
 DEFINES += _BOOT_MODE ;
 
+UsePrivateHeaders [ FDirName libroot locale ] ;
+
+rule BuildCoffLoader {
+	local coffLoader = $(1) ;
+	local bootLoader = $(2) ;
+	# XXX: eventually switch on arch
+	COFF_FORMAT on $(coffLoader) = xcoff-powermac ;
+	HACK_COFF on $(coffLoader) = <build>hack-coff ;
+
+	Depends $(coffLoader) : <build>hack-coff ;
+	Depends $(coffLoader) : $(bootLoader) ;
+	MakeLocateDebug $(coffLoader) ;
+}
+
+actions BuildCoffLoader bind HACK_COFF {
+	rm -f $(1)
+	# get the address of the COFF entry
+	$(TARGET_OBJCOPY_$(TARGET_PACKAGING_ARCH)) -O symbolsrec $(2) $(2).syms
+	EP=`grep _coff_start $(2).syms | tr -d '\r' | cut -d'$' -f2`
+	rm -f $(2).syms
+	# copy to XCOFF format and patch the entry point
+	$(TARGET_OBJCOPY_$(TARGET_PACKAGING_ARCH)) -O $(COFF_FORMAT) --set-start="0x${EP}" $(2) $(1)
+	#$(CP) $(2) $(1)
+	# fill-in some fields objcopy missed
+	$(HACK_COFF) $(1)
+}
+
+rule BuildBiosLoader {
+	local haikuLoader = $(1) ;
+	local bootLoader = $(2) ;
+
+	Depends $(haikuLoader) : $(bootLoader) ;
+	MakeLocateDebug $(haikuLoader) ;
+
+	on $(1) ResAttr $(1) : $(RESFILES) : false ;
+	if ! [ on $(1) return $(DONT_USE_BEOS_RULES) ] {
+		SetType $(1) ;
+		MimeSet $(1) ;
+	}
+}
+
+actions BuildBiosLoader {
+	rm -f $(1)
+	$(TARGET_OBJCOPY_$(TARGET_PACKAGING_ARCH)) -O binary $(2) $(1)
+}
+
+rule BuildEFILoader {
+	local efiLoader = $(1) ;
+	local bootLoader = $(2) ;
+
+	Depends $(efiLoader) : $(bootLoader) ;
+	MakeLocateDebug $(efiLoader) ;
+}
+
+actions BuildEFILoader {
+	rm -f $(1)
+	$(TARGET_OBJCOPY_$(TARGET_PACKAGING_ARCH)) -j .text -j .sdata -j .data -j .dynamic -j .dynsym \
+	-j .rel -j .rela -j .reloc --target=efi-app-x86_64 $(2) $(1)
+}
+
+local extraSources = ;
+if $(TARGET_GCC_VERSION_$(TARGET_PACKAGING_ARCH)[1]) = 2 {
+	extraSources += atomic.S ;
+}
+
+for platform in [ MultiBootSubDirSetup ] {
+	on $(platform) {
 		if $(TARGET_ARCH) = x86_64 && $(TARGET_BOOT_PLATFORM) = efi {
 			SEARCH_SOURCE += [ FDirName $(SUBDIR) $(DOTDOT) libroot os arch
 								x86_64 ] ;
@@ -17,14 +82,7 @@ SEARCH_SOURCE += [ FDirName $(SUBDIR) $(DOTDOT) libroot posix stdlib ] ;
 		SEARCH_SOURCE += [ FDirName $(SUBDIR) $(DOTDOT) libroot posix locale ] ;
 		SEARCH_SOURCE += [ FDirName $(SUBDIR) $(DOTDOT) kernel lib ] ;
 
-UsePrivateHeaders [ FDirName libroot locale ] ;
+		BootMergeObject boot_libroot_$(platform:G=).o :
-
-local extraSources = ;
-if $(TARGET_GCC_VERSION_$(TARGET_PACKAGING_ARCH)[1]) = 2 {
-	extraSources += atomic.S ;
-}
-
-BootMergeObject boot_libroot.o :
 			abs.c
 			ctype.cpp
 			LocaleData.cpp
@@ -52,11 +110,22 @@ BootMergeObject boot_libroot.o :
 			$(extraSources)
 		;
 
-AddResources haiku_loader : boot_loader.rdef ;
+		AddResources haiku_loader.$(TARGET_BOOT_PLATFORM) : boot_loader.rdef ;
 
-BootLd boot_loader_$(TARGET_BOOT_PLATFORM) :
+		local archGrist = [ FGrist src system boot arch $(TARGET_KERNEL_ARCH) $(platform:G=) ] ;
-	boot_platform_$(TARGET_BOOT_PLATFORM).o
+		local archObject = boot_arch_$(TARGET_KERNEL_ARCH).o ;
-	boot_arch_$(TARGET_KERNEL_ARCH).o
+		local ldflags = $(HAIKU_BOOT_$(platform:G=:U)_LDFLAGS) ;
+		ldflags ?= $(TARGET_BOOT_LDFLAGS) ;
+
+		# efi loader needs to be shared.
+		if $(TARGET_BOOT_PLATFORM) = efi {
+			ldflags += -shared ;
+		}
+
+		BootLd boot_loader_$(platform:G=) :
+			boot_platform_$(platform:G=).o
+			$(archObject:G=$(archGrist))
+			[ MultiBootGristFiles
 				boot_loader.a
 				boot_net.a
 				boot_partitions.a
@@ -74,81 +143,24 @@ BootLd boot_loader_$(TARGET_BOOT_PLATFORM) :
 
 				# needed by tarfs, packagefs, and video_splash.cpp
 				boot_zlib.a
-
+			]
 			# libroot functions needed by the stage2 boot loader
-	boot_libroot.o
+			boot_libroot_$(platform:G=).o
 
-	: $(HAIKU_TOP)/src/system/ldscripts/$(TARGET_ARCH)/boot_loader_$(TARGET_BOOT_PLATFORM).ld
+			: $(HAIKU_TOP)/src/system/ldscripts/$(TARGET_ARCH)/boot_loader_$(platform:G=).ld
-	: $(TARGET_BOOT_LDFLAGS)
+			: $(ldflags)
 		;
 
-rule BuildCoffLoader {
-	local coffLoader = $(1) ;
-	local bootLoader = $(2) ;
-	# XXX: eventually switch on arch
-	COFF_FORMAT on $(coffLoader) = xcoff-powermac ;
-	HACK_COFF on $(coffLoader) = <build>hack-coff ;
-
-	Depends $(coffLoader) : <build>hack-coff ;
-	Depends $(coffLoader) : $(bootLoader) ;
-	MakeLocateDebug $(coffLoader) ;
-}
-
-actions BuildCoffLoader bind HACK_COFF {
-	rm -f $(1)
-	# get the address of the COFF entry
-	$(TARGET_OBJCOPY_$(TARGET_PACKAGING_ARCH)) -O symbolsrec $(2) $(2).syms
-	EP=`grep _coff_start $(2).syms | tr -d '\r' | cut -d'$' -f2`
-	rm -f $(2).syms
-	# copy to XCOFF format and patch the entry point
-	$(TARGET_OBJCOPY_$(TARGET_PACKAGING_ARCH)) -O $(COFF_FORMAT) --set-start="0x${EP}" $(2) $(1)
-	#$(CP) $(2) $(1)
-	# fill-in some fields objcopy missed
-	$(HACK_COFF) $(1)
-}
-
 		BuildCoffLoader boot_loader_$(TARGET_BOOT_PLATFORM)_coff : boot_loader_$(TARGET_BOOT_PLATFORM) ;
 
-rule BuildBiosLoader {
+		if $(TARGET_BOOT_PLATFORM) != efi {
-	local haikuLoader = $(1) ;
+			BuildBiosLoader haiku_loader.$(TARGET_BOOT_PLATFORM) : boot_loader_$(TARGET_BOOT_PLATFORM) ;
-	local bootLoader = $(2) ;
+		} else {
-
+			BuildEFILoader haiku_loader.$(TARGET_BOOT_PLATFORM) : boot_loader_$(TARGET_BOOT_PLATFORM) ;
-	Depends $(haikuLoader) : $(bootLoader) ;
-	MakeLocateDebug $(haikuLoader) ;
-
-	on $(1) ResAttr $(1) : $(RESFILES) : false ;
-	if ! [ on $(1) return $(DONT_USE_BEOS_RULES) ] {
-		SetType $(1) ;
-		MimeSet $(1) ;
 		}
 	}
-
-actions BuildBiosLoader {
-	rm -f $(1)
-	$(TARGET_OBJCOPY_$(TARGET_PACKAGING_ARCH)) -O binary $(2) $(1)
 }
 
-BuildBiosLoader haiku_loader : boot_loader_$(TARGET_BOOT_PLATFORM) ;
-
-# different target for PXE, to be build with TARGET_BOOT_PLATFORM=pxe_ia32 jam pxehaiku-loader
-BuildBiosLoader pxehaiku-loader : boot_loader_$(TARGET_BOOT_PLATFORM) ;
-
-rule BuildEFILoader {
-	local efiLoader = $(1) ;
-	local bootLoader = $(2) ;
-
-	Depends $(efiLoader) : $(bootLoader) ;
-	MakeLocateDebug $(efiLoader) ;
-}
-
-actions BuildEFILoader {
-	rm -f $(1)
-	$(TARGET_OBJCOPY_$(TARGET_PACKAGING_ARCH)) -j .text -j .sdata -j .data -j .dynamic -j .dynsym \
-	-j .rel -j .rela -j .reloc --target=efi-app-x86_64 $(2) $(1)
-}
-
-BuildEFILoader haiku_loader.efi : boot_loader_$(TARGET_BOOT_PLATFORM) ;
-
 SubInclude HAIKU_TOP src system boot arch $(TARGET_KERNEL_ARCH) ;
 SubInclude HAIKU_TOP src system boot loader ;
 SubInclude HAIKU_TOP src system boot platform ;

src/system/boot/arch/x86/Jamfile

@@ -1,7 +1,8 @@
 SubDir HAIKU_TOP src system boot arch x86 ;
 
-SetupFeatureObjectsDir $(TARGET_BOOT_PLATFORM) ;
+local platform ;
-
+for platform in [ MultiBootSubDirSetup bios_ia32 efi pxe_ia32 ] {
+	on $(platform) {
 		DEFINES += _BOOT_MODE ;
 
 		local kernelArchSources =
@@ -22,11 +23,12 @@ local librootOsArchSources =
 			byteorder.S
 		;
 
-BootMergeObject boot_arch_$(TARGET_KERNEL_ARCH).o :
+		BootMergeObject [ FGristFiles boot_arch_$(TARGET_KERNEL_ARCH).o ] :
 			$(kernelArchSources)
 			$(kernelArchSpecificSources)
 			$(kernelLibArchSpecificSources)
 			$(librootOsArchSources)
+			: -std=c++11 # additional flags
 		;
 
 		SEARCH on [ FGristFiles $(kernelArchSources) ]
@@ -45,3 +47,5 @@ SEARCH on [ FGristFiles $(kernelLibArchSpecificSources) ]
 		}
 		SEARCH on [ FGristFiles $(librootOsArchSources) ]
 			= [ FDirName $(HAIKU_TOP) src system libroot os arch x86 ] ;
+	}
+}

src/system/boot/loader/Jamfile

@@ -1,7 +1,5 @@
 SubDir HAIKU_TOP src system boot loader ;
 
-SetupFeatureObjectsDir $(TARGET_BOOT_PLATFORM) ;
-
 SubDirHdrs $(HAIKU_TOP) src add-ons kernel partitioning_systems amiga ;
 SubDirHdrs $(HAIKU_TOP) src add-ons kernel partitioning_systems apple ;
 SubDirHdrs $(HAIKU_TOP) src add-ons kernel partitioning_systems gpt ;
@@ -11,7 +9,14 @@ UsePrivateHeaders [ FDirName kernel disk_device_manager ] ;
 UsePrivateHeaders [ FDirName kernel util ] ;
 UsePrivateHeaders shared storage ;
 
+local defines = $(DEFINES) ;
+
+local platform ;
+for platform in [ MultiBootSubDirSetup ] {
+	on $(platform) {
 		{
+			DEFINES = $(defines) ;
+
 			DEFINES +=
 				_BOOT_MODE
 				BOOT_ARCH=\\\"$(TARGET_KERNEL_ARCH)\\\"
@@ -47,7 +52,7 @@ UsePrivateHeaders shared storage ;
 
 						#BOOT_SUPPORT_FILE_SYSTEM_FAT
 					;
-			if $(HAIKU_BOOT_PLATFORM) = efi {
+					if $(TARGET_BOOT_PLATFORM) = efi {
 						DEFINES +=
 							_BOOT_PLATFORM_EFI
 						;
@@ -55,7 +60,7 @@ UsePrivateHeaders shared storage ;
 				}
 			}
 
-	if $(HAIKU_BOOT_PLATFORM) != efi {
+			if $(TARGET_BOOT_PLATFORM) != efi {
 				DEFINES += BOOT_SUPPORT_ELF32 ;
 			}
 
@@ -66,7 +71,7 @@ UsePrivateHeaders shared storage ;
 		}
 
 
-BootStaticLibrary boot_loader :
+		BootStaticLibrary [ MultiBootGristFiles boot_loader ] :
 			PathBlacklist.cpp
 			elf.cpp
 			heap.cpp
@@ -101,7 +106,7 @@ BootStaticLibrary boot_loader :
 		# The partition support is built in an extra static library
 		# so that only the ones that are used will be included.
 
-BootStaticLibrary boot_partitions :
+		BootStaticLibrary [ MultiBootGristFiles boot_partitions ] :
 			FileMapDisk.cpp
 			amiga_rdb.cpp
 			apple.cpp
@@ -146,7 +151,8 @@ SEARCH on [ FGristFiles stage2_crt0.S ]
 
 		SEARCH on [ FGristFiles DataIO.cpp Referenceable.cpp ]
 			= [ FDirName $(HAIKU_TOP) src kits support ] ;
-
+	}
+}
 
 SubInclude HAIKU_TOP src system boot loader file_systems ;
 SubInclude HAIKU_TOP src system boot loader net ;

src/system/boot/loader/file_systems/amiga_ffs/Jamfile

@@ -1,8 +1,5 @@
 SubDir HAIKU_TOP src system boot loader file_systems amiga_ffs ;
 
-SetupFeatureObjectsDir $(TARGET_BOOT_PLATFORM) ;
-
-UsePrivateHeaders [ FDirName kernel boot platform $(TARGET_BOOT_PLATFORM) ] ;
 UsePrivateHeaders [ FDirName kernel disk_device_manager ] ;
 UsePrivateHeaders kernel storage ;
 
@@ -10,9 +7,16 @@ UsePrivateHeaders kernel storage ;
 
 SubDirC++Flags -fno-rtti ;
 
-BootStaticLibrary boot_amiga_ffs :
+local platform ;
+for platform in [ MultiBootSubDirSetup ] {
+	on $(platform) {
+		UsePrivateHeaders [ FDirName kernel boot platform $(TARGET_BOOT_PLATFORM) ] ;
+
+		BootStaticLibrary [ MultiBootGristFiles boot_amiga_ffs ] :
 			amiga_ffs.cpp
 			Volume.cpp
 			Directory.cpp
 			File.cpp
 		;
+	}
+}

src/system/boot/loader/file_systems/bfs/Jamfile

@@ -1,7 +1,5 @@
 SubDir HAIKU_TOP src system boot loader file_systems bfs ;
 
-SetupFeatureObjectsDir $(TARGET_BOOT_PLATFORM) ;
-
 UsePrivateKernelHeaders ;
 UsePrivateHeaders file_systems shared storage ;
 
@@ -12,7 +10,10 @@ local defines = [ FDefines _BOOT_MODE ] ;
 SubDirCcFlags $(defines) ;
 SubDirC++Flags -fno-rtti $(defines) ;
 
-BootStaticLibrary boot_bfs :
+local platform ;
+for platform in [ MultiBootSubDirSetup ] {
+	on $(platform) {
+		BootStaticLibrary [ MultiBootGristFiles boot_bfs ] :
 			bfs.cpp
 			Directory.cpp
 			File.cpp
@@ -27,3 +28,5 @@ SEARCH on [ FGristFiles BPlusTree.cpp ]
 
 		SEARCH on [ FGristFiles QueryParserUtils.cpp ]
 			+= [ FDirName $(HAIKU_TOP) src add-ons kernel file_systems shared ] ;
+	}
+}

src/system/boot/loader/file_systems/fat/Jamfile

@@ -1,21 +1,17 @@
 SubDir HAIKU_TOP src system boot loader file_systems fat ;
 
-SetupFeatureObjectsDir $(TARGET_BOOT_PLATFORM) ;
-
-#UsePrivateHeaders [ FDirName kernel boot platform $(TARGET_BOOT_PLATFORM) ] ;
-#UsePrivateHeaders [ FDirName kernel disk_device_manager ] ;
-#UsePrivateHeaders [ FDirName storage ] ;
 UsePrivateKernelHeaders ;
 UsePrivateHeaders shared storage ;
 
-#SubDirHdrs $(HAIKU_TOP) src add-ons kernel file_systems fat ;
-
 local defines = [ FDefines _BOOT_MODE ] ;
 
 SubDirCcFlags $(defines) ;
 SubDirC++Flags -fno-rtti $(defines) ;
 
-BootStaticLibrary boot_fatfs :
+local platform ;
+for platform in [ MultiBootSubDirSetup ] {
+	on $(platform) {
+		BootStaticLibrary [ MultiBootGristFiles boot_fatfs ] :
 			fatfs.cpp
 			Volume.cpp
 			CachedBlock.cpp
@@ -23,3 +19,5 @@ BootStaticLibrary boot_fatfs :
 			File.cpp
 			Stream.cpp
 		;
+	}
+}

src/system/boot/loader/file_systems/hfs_plus/Jamfile

@@ -1,13 +1,17 @@
 SubDir HAIKU_TOP src system boot loader file_systems hfs_plus ;
 
-SetupFeatureObjectsDir $(TARGET_BOOT_PLATFORM) ;
-
-UsePrivateHeaders [ FDirName kernel boot platform $(TARGET_BOOT_PLATFORM) ] ;
 UsePrivateHeaders [ FDirName kernel disk_device_manager ] ;
 UsePrivateHeaders kernel storage ;
 
 SubDirC++Flags -fno-rtti ;
 
-BootStaticLibrary boot_hfs_plus :
+local platform ;
+for platform in [ MultiBootSubDirSetup ] {
+	on $(platform) {
+		UsePrivateHeaders [ FDirName kernel boot platform $(TARGET_BOOT_PLATFORM) ] ;
+
+		BootStaticLibrary [ MultiBootGristFiles boot_hfs_plus ] :
 			hfs_plus.cpp
 		;
+	}
+}

src/system/boot/loader/file_systems/packagefs/Jamfile

@@ -1,8 +1,5 @@
 SubDir HAIKU_TOP src system boot loader file_systems packagefs ;
 
-SetupFeatureObjectsDir $(TARGET_BOOT_PLATFORM) ;
-
-UsePrivateHeaders [ FDirName kernel boot platform $(TARGET_BOOT_PLATFORM) ] ;
 UsePrivateHeaders kernel shared storage support ;
 UseBuildFeatureHeaders zlib ;
 
@@ -13,13 +10,17 @@ local kernelC++Header = [ FDirName $(HAIKU_TOP) headers private kernel util
 
 SubDirC++Flags -fno-rtti -include $(kernelC++Header) ;
 
+local platform ;
+for platform in [ MultiBootSubDirSetup ] {
+	on $(platform) {
+		UsePrivateHeaders [ FDirName kernel boot platform $(TARGET_BOOT_PLATFORM) ] ;
+
 		SEARCH_SOURCE += [ FDirName $(HAIKU_TOP) src kits package ] ;
 		SEARCH_SOURCE += [ FDirName $(HAIKU_TOP) src kits package hpkg ] ;
 		SEARCH_SOURCE += [ FDirName $(HAIKU_TOP) src kits storage ] ;
 		SEARCH_SOURCE += [ FDirName $(HAIKU_TOP) src kits support ] ;
 
-
+		BootStaticLibrary [ MultiBootGristFiles boot_packagefs ] :
-BootStaticLibrary boot_packagefs :
 			packagefs.cpp
 			PackageSettingsItem.cpp
 
@@ -52,4 +53,5 @@ BootStaticLibrary boot_packagefs :
 
 		Includes [ FGristFiles ZlibCompressionAlgorithm.cpp ]
 			: [ BuildFeatureAttribute zlib : headers ] ;
-
+	}
+}

src/system/boot/loader/file_systems/tarfs/Jamfile

@@ -1,8 +1,5 @@
 SubDir HAIKU_TOP src system boot loader file_systems tarfs ;
 
-SetupFeatureObjectsDir $(TARGET_BOOT_PLATFORM) ;
-
-UsePrivateHeaders [ FDirName kernel boot platform $(TARGET_BOOT_PLATFORM) ] ;
 UsePrivateHeaders [ FDirName kernel disk_device_manager ] ;
 UsePrivateHeaders kernel shared storage ;
 
@@ -25,11 +22,16 @@ local zlibSources =
 	zutil.c
 	;
 
+local platform ;
+for platform in [ MultiBootSubDirSetup ] {
+	on $(platform) {
+		UsePrivateHeaders [ FDirName kernel boot platform $(TARGET_BOOT_PLATFORM) ] ;
+
 		LOCATE on [ FGristFiles $(zlibSources) ] = $(zlibSourceDirectory) ;
 		Depends [ FGristFiles $(zlibSources) ]
 			: [ BuildFeatureAttribute zlib : sources ] ;
 
-BootStaticLibrary boot_zlib :
+		BootStaticLibrary [ MultiBootGristFiles boot_zlib ] :
 			$(zlibSources)
 			;
 
@@ -40,6 +42,8 @@ Includes [ FGristFiles tarfs.cpp ] : [ BuildFeatureAttribute zlib : sources ] ;
 			# header search path for the subdirectory. Should building boot_zlib be
 			# moved to its own directory, this should better be changes as well.
 
-BootStaticLibrary boot_tarfs :
+		BootStaticLibrary [ MultiBootGristFiles boot_tarfs ] :
 			tarfs.cpp
 			;
+	}
+}

src/system/boot/loader/loader.cpp

@@ -260,7 +260,9 @@ load_modules(stage2_args* args, BootVolume& volume)
 	// and now load all partitioning and file system modules
 	// needed to identify the boot volume
 
-	if (!gBootVolume.GetBool(BOOT_VOLUME_BOOTED_FROM_IMAGE, false)) {
+	if (!gBootVolume.GetBool(BOOT_VOLUME_BOOTED_FROM_IMAGE, false)
+		&& gBootVolume.GetInt32(BOOT_METHOD, BOOT_METHOD_DEFAULT)
+			!= BOOT_METHOD_CD) {
 		// iterate over the mounted volumes and load their file system
 		Partition *partition;
 		if (gRoot->GetPartitionFor(volume.RootDirectory(), &partition)

src/system/boot/loader/net/Jamfile

@@ -1,12 +1,14 @@
 SubDir HAIKU_TOP src system boot loader net ;
 
-SetupFeatureObjectsDir $(TARGET_BOOT_PLATFORM) ;
-
-UsePrivateHeaders kernel [ FDirName kernel boot platform $(TARGET_BOOT_PLATFORM) ] ;
 UsePrivateHeaders drivers ;
 
 SubDirC++Flags -D_BOOT_MODE -fno-rtti ;
 
+local platform ;
+for platform in [ MultiBootSubDirSetup ] {
+	on $(platform) {
+		UsePrivateHeaders kernel [ FDirName kernel boot platform $(TARGET_BOOT_PLATFORM) ] ;
+
 		local tcp = ;
 		local iscsi = ;
 		if $(TARGET_ARCH) = ppc {
@@ -14,7 +16,7 @@ if $(TARGET_ARCH) = ppc {
 			iscsi = iSCSITarget.cpp ;
 		}
 
-BootStaticLibrary boot_net :
+		BootStaticLibrary [ MultiBootGristFiles boot_net ] :
 			ARP.cpp
 			ChainBuffer.cpp
 			Ethernet.cpp
@@ -26,3 +28,5 @@ BootStaticLibrary boot_net :
 			$(tcp)
 			$(iscsi)
 		;
+	}
+}

src/system/boot/platform/Jamfile

@@ -1,7 +1,8 @@
 SubDir HAIKU_TOP src system boot platform ;
 
-if $(TARGET_BOOT_PLATFORM) {
+if $(HAIKU_BOOT_TARGETS) {
 	SubInclude HAIKU_TOP src system boot platform generic ;
-	SubInclude HAIKU_TOP src system boot platform $(TARGET_BOOT_PLATFORM) ;
+	for platform in $(HAIKU_BOOT_TARGETS) {
+			SubInclude HAIKU_TOP src system boot platform $(platform) ;
+	}
 }
-

src/system/boot/platform/bios_ia32/Jamfile

@@ -1,8 +1,6 @@
 SubDir HAIKU_TOP src system boot platform bios_ia32 ;
 
-SetupFeatureObjectsDir $(TARGET_BOOT_PLATFORM) ;
+SubDirHdrs $(HAIKU_TOP) headers private kernel boot platform bios_ia32 ;
-
-SubDirHdrs $(HAIKU_TOP) headers private kernel boot platform $(TARGET_BOOT_PLATFORM) ;
 
 UsePrivateHeaders [ FDirName kernel disk_device_manager ] ;
 UsePrivateHeaders [ FDirName graphics common ] ;
@@ -17,6 +15,9 @@ UsePrivateHeaders [ FDirName storage ] ;
 	SubDirC++Flags $(defines) -fno-rtti ;
 }
 
+local platform ;
+for platform in [ MultiBootSubDirSetup bios_ia32 ] {
+	on $(platform) {
 		SEARCH_SOURCE += [ FDirName $(HAIKU_TOP) src add-ons accelerants common ] ;
 
 		BootMergeObject boot_platform_bios_ia32.o :
@@ -50,9 +51,13 @@ BootMergeObject boot_platform_bios_ia32.o :
 			dump_edid.c
 
 			:
-	: boot_platform_generic.a
+			: boot_platform_generic_bios_ia32.a
 		;
+	}
+}
 
-NASMFLAGS on stage1.bin = -f bin -O5 ;
+local flags = -f bin -O5 -dKERNEL_PLATFORM=$(HAIKU_KERNEL_PLATFORM) ;
+NASMFLAGS on stage1.bin = $(flags) ;
+Echo "NASMFLAGS = $(flags)" ;
 
 Object stage1.bin : stage1.nasm ;

src/system/boot/platform/bios_ia32/stage1.nasm

@@ -644,11 +644,14 @@ kErrorString				db	"Failed to load OS. Press any key to reboot..."
 %endif
 
 ; the path to the boot loader
+%defstr platformName KERNEL_PLATFORM
+%defstr loaderName
+%strcat loaderName "haiku_loader",".",platformName
 kPathComponents:
 pathComponent				"system"
 pathComponent				"packages"
 kLastPathComponent:
-pathComponent				"haiku_loader"
+pathComponent				loaderName
 							db	0
 
 

src/system/boot/platform/efi/Jamfile

@@ -1,7 +1,5 @@
 SubDir HAIKU_TOP src system boot platform efi ;
 
-SetupFeatureObjectsDir $(TARGET_BOOT_PLATFORM) ;
-
 UsePrivateHeaders [ FDirName kernel boot ] ;
 UseBuildFeatureHeaders gnuefi ;
 UseBuildFeatureHeaders gnuefi : headersProtocol ;
@@ -46,11 +44,15 @@ Includes [ FGristFiles $(efi_glue_src) $(platform_src) ]
 	[ BuildFeatureAttribute gnuefi : headersArch ]
 	;
 
+local platform ;
+for platform in [ MultiBootSubDirSetup efi ] {
+	on $(platform) {
+
 		BootMergeObject boot_platform_efi.o :
 			$(efi_glue_src)
 			$(platform_src)
 			:
-	: boot_platform_generic.a
+			: boot_platform_generic_efi.a
 		;
 
 		SEARCH on [ FGristFiles relocation_func.cpp ]
@@ -59,3 +61,5 @@ LOCATE on [ FGristFiles $(efi_glue_src) ]
 			= [ BuildFeatureAttribute gnuefi : libdir : path ] ;
 		Depends [ FGristFiles $(efi_glue_src) ]
 			: [ BuildFeatureAttribute gnuefi : libdir ] ;
+	}
+}

src/system/boot/platform/generic/Jamfile

@@ -1,13 +1,14 @@
 SubDir HAIKU_TOP src system boot platform generic ;
 
-SetupFeatureObjectsDir $(TARGET_BOOT_PLATFORM) ;
-
 UseBuildFeatureHeaders zlib ;
 UsePrivateKernelHeaders ;
 
 SubDirC++Flags -D_BOOT_MODE -fno-rtti ;
 
-BootStaticLibrary boot_platform_generic :
+local platform ;
+for platform in [ MultiBootSubDirSetup ] {
+	on $(platform) {
+		BootStaticLibrary boot_platform_generic_$(platform:G=) :
 			text_menu.cpp
 			video_blit.cpp
 			video_splash.cpp
@@ -15,3 +16,5 @@ BootStaticLibrary boot_platform_generic :
 
 		Includes [ FGristFiles video_splash.cpp ]
 			: [ BuildFeatureAttribute zlib : headers ] ;
+	}
+}

src/system/boot/platform/pxe_ia32/Jamfile

@@ -2,7 +2,7 @@ SubDir HAIKU_TOP src system boot platform pxe_ia32 ;
 
 SubDirHdrs $(SUBDIR) $(DOTDOT) bios_ia32 ;
 SubDirHdrs $(HAIKU_TOP) headers private kernel boot platform bios_ia32 ;
-SubDirHdrs $(HAIKU_TOP) headers private kernel boot platform $(TARGET_BOOT_PLATFORM) ;
+SubDirHdrs $(HAIKU_TOP) headers private kernel boot platform pxe_ia32 ;
 
 UsePrivateHeaders [ FDirName kernel disk_device_manager ] ;
 UsePrivateHeaders [ FDirName graphics common ] ;
@@ -47,6 +47,9 @@ local bios_ia32_edid_src =
 ;
 
 
+local platform ;
+for platform in [ MultiBootSubDirSetup pxe_ia32 ] {
+	on $(platform) {
 		BootMergeObject boot_platform_pxe_ia32.o :
 			pxe_stage2.S
 			smp_trampoline.S
@@ -58,7 +61,7 @@ BootMergeObject boot_platform_pxe_ia32.o :
 			$(bios_ia32_edid_src)
 
 			:
-	: boot_platform_generic.a
+			: boot_platform_generic_pxe_ia32.a
 		;
 
 
@@ -74,3 +77,5 @@ SEARCH on [ FGristFiles $(genericPlatformSources) ]
 		# We also need the bios_ia32 stage1.bin for building bin/makebootable
 		SEARCH on stage1.bin
 			= [ FDirName $(SUBDIR) $(DOTDOT) bios_ia32 ] ;
+	}
+}

src/system/kernel/Jamfile

@@ -113,7 +113,7 @@ KernelLd kernel_$(TARGET_ARCH) :
 	kernel_vm.o
 
 	kernel_arch_$(TARGET_KERNEL_ARCH).o
-	kernel_platform_$(TARGET_BOOT_PLATFORM).o
+	kernel_platform_$(TARGET_KERNEL_PLATFORM).o
 
 	linkhack.so
 
@@ -153,7 +153,7 @@ if $(HAIKU_ARCH) in x86_64 arm {
 		kernel_vm.o
 
 		kernel_arch_$(TARGET_KERNEL_ARCH).o
-		kernel_platform_$(TARGET_BOOT_PLATFORM).o
+		kernel_platform_$(TARGET_KERNEL_PLATFORM).o
 
 		linkhack.so
 
@@ -202,6 +202,6 @@ SubInclude HAIKU_TOP src system kernel slab ;
 SubInclude HAIKU_TOP src system kernel util ;
 SubInclude HAIKU_TOP src system kernel vm ;
 
-if $(TARGET_BOOT_PLATFORM) {
+if $(TARGET_KERNEL_PLATFORM) {
-	SubInclude HAIKU_TOP src system kernel platform $(TARGET_BOOT_PLATFORM) ;
+	SubInclude HAIKU_TOP src system kernel platform $(TARGET_KERNEL_PLATFORM) ;
 }

src/system/kernel/device_manager/Jamfile

@@ -1,6 +1,5 @@
 SubDir HAIKU_TOP src system kernel device_manager ;
 
-UsePrivateHeaders [ FDirName kernel boot platform $(TARGET_BOOT_PLATFORM) ] ;
 UsePrivateHeaders [ FDirName kernel util ] shared ;
 
 KernelMergeObject kernel_device_manager.o :

src/system/kernel/disk_device_manager/Jamfile

@@ -4,7 +4,6 @@ SEARCH_SOURCE += [ FDirName $(SUBDIR) jobs ] ;
 SEARCH_SOURCE += [ FDirName $(HAIKU_TOP) src kits storage disk_device ] ;
 	# DiskDeviceTypes.cpp
 
-UsePrivateHeaders [ FDirName kernel boot platform $(TARGET_BOOT_PLATFORM) ] ;
 UsePrivateHeaders [ FDirName kernel disk_device_manager ] ;
 UsePrivateHeaders [ FDirName kernel ] ;
 UsePrivateHeaders [ FDirName kernel fs ] ;

src/system/kernel/platform/u-boot/Jamfile

@@ -1,6 +1,6 @@
 SubDir HAIKU_TOP src system kernel platform u-boot ;
 
-SubDirHdrs $(HAIKU_TOP) headers private kernel platform $(TARGET_BOOT_PLATFORM) ;
+SubDirHdrs $(HAIKU_TOP) headers private kernel platform $(TARGET_KERNEL_PLATFORM) ;
 UseLibraryHeaders [ FDirName libfdt ] ;
 
 SubDirCcFlags $(TARGET_KERNEL_PIC_CCFLAGS) ;

src/tests/system/kernel/disk_device_manager/Jamfile

@@ -8,7 +8,7 @@ SEARCH_SOURCE += [ FDirName $(HAIKU_TOP) src kits storage ] ;
 
 #UsePrivateHeaders $(DOT) ;
 UsePrivateHeaders shared ;
-UsePrivateHeaders [ FDirName kernel boot platform $(TARGET_BOOT_PLATFORM) ] ;
+UsePrivateHeaders [ FDirName kernel boot platform $(TARGET_KERNEL_PLATFORM) ] ;
 UsePrivateHeaders [ FDirName kernel disk_device_manager ] ;
 UsePrivateHeaders [ FDirName kernel arch $(TARGET_KERNEL_ARCH) ] ;
 UsePrivateHeaders [ FDirName kernel fs ] ;

src/tests/system/kernel/scheduler/Jamfile

@@ -4,7 +4,7 @@ SubDir HAIKU_TOP src tests system kernel scheduler ;
 
 UsePrivateHeaders kernel ;
 UsePrivateHeaders [ FDirName kernel arch $(TARGET_KERNEL_ARCH) ] ;
-UsePrivateHeaders [ FDirName kernel boot platform $(TARGET_BOOT_PLATFORM) ] ;
+UsePrivateHeaders [ FDirName kernel boot platform $(TARGET_KERNEL_PLATFORM) ] ;
 #UseHeaders [ FDirName $(HAIKU_TOP) src system kernel cache ] ;
 
 local includes = -include $(SUBDIR)/override_types.h ;

src/tools/makebootable/Jamfile

@@ -1,6 +1,6 @@
 SubDir HAIKU_TOP src tools makebootable ;
 
-if $(TARGET_BOOT_PLATFORM) {
+if $(TARGET_KERNEL_PLATFORM) {
 	SubInclude HAIKU_TOP src tools makebootable platform
-		$(TARGET_BOOT_PLATFORM) ;
+		$(TARGET_KERNEL_PLATFORM) ;
 }