From c88f4908d84a819a170fae820c8e5bc230cddd20 Mon Sep 17 00:00:00 2001
From: Alex Smith <alex@alex-smith.me.uk>
Date: Sat, 8 Sep 2012 09:33:13 +0100
Subject: [PATCH] Added missing AHCI driver in FloppyBootImage, should fix
 #8943.

---
 build/jam/FloppyBootImage | 21 +++++++++++++++++----
 build/jam/Haiku64Image    |  4 ++--
 2 files changed, 19 insertions(+), 6 deletions(-)

diff --git a/build/jam/FloppyBootImage b/build/jam/FloppyBootImage
index fa713da315..ece250f398 100644
--- a/build/jam/FloppyBootImage
+++ b/build/jam/FloppyBootImage
@@ -54,9 +54,11 @@ SYSTEM_ADD_ONS_FILE_SYSTEMS = bfs iso9660 attribute_overlay write_overlay ;
 
 if $(TARGET_ARCH) = x86_64 {
 	AddFilesToFloppyBootArchive system add-ons kernel bus_managers
-		: ata config_manager dpc pci scsi ;
+		: ata config_manager dpc pci isa scsi $(USB_ONLY)usb ;
 	AddFilesToFloppyBootArchive system add-ons kernel busses ata
-		: generic_ide_pci ;
+		: generic_ide_pci legacy_sata ;
+	AddFilesToFloppyBootArchive system add-ons kernel busses scsi
+		: ahci ;
 	AddFilesToFloppyBootArchive system add-ons kernel file_systems
 		: $(SYSTEM_ADD_ONS_FILE_SYSTEMS) ;
 	AddFilesToFloppyBootArchive system add-ons kernel generic
@@ -64,9 +66,17 @@ if $(TARGET_ARCH) = x86_64 {
 	AddFilesToFloppyBootArchive system add-ons kernel partitioning_systems
 		: intel session ;
 
+	if $(USB_BOOT) = 1 {
+		AddFilesToFloppyBootArchive system add-ons kernel busses usb
+			: <usb>uhci <usb>ohci <usb>ehci ;
+	}
+
 	AddFilesToFloppyBootArchive system add-ons kernel cpu : generic_x86 ;
 
 	AddNewDriversToFloppyBootArchive disk scsi : scsi_cd scsi_disk ;
+	if $(USB_BOOT) = 1 {
+		AddDriversToFloppyBootArchive disk usb : usb_disk ;
+	}
 } else {
 	# modules
 	AddFilesToFloppyBootArchive system add-ons kernel bus_managers
@@ -142,8 +152,11 @@ if $(NET_BOOT) = 1 {
 # boot module links
 if $(TARGET_ARCH) = x86_64 {
 	AddBootModuleSymlinksToFloppyBootArchive
-		ata dpc config_manager pci scsi ata_adapter locked_pool scsi_periph
-		generic_x86 generic_ide_pci scsi_cd scsi_disk intel session
+		ata dpc config_manager pci scsi $(USB_ONLY)usb ata_adapter locked_pool
+		scsi_periph generic_x86 ahci generic_ide_pci legacy_sata
+		$(USB_ONLY)<usb>uhci $(USB_ONLY)<usb>ohci $(USB_ONLY)<usb>ehci
+		scsi_cd scsi_disk $(USB_ONLY)usb_disk
+		intel session
 		$(SYSTEM_ADD_ONS_FILE_SYSTEMS)
 	;
 } else {
diff --git a/build/jam/Haiku64Image b/build/jam/Haiku64Image
index 956ba8f666..351933d3e1 100644
--- a/build/jam/Haiku64Image
+++ b/build/jam/Haiku64Image
@@ -91,7 +91,7 @@ AddFilesToHaikuImage system add-ons kernel bus_managers
 
 if $(HAIKU_ATA_STACK) = 1 {
 	AddFilesToHaikuImage system add-ons kernel busses ata
-		: generic_ide_pci ;
+		: generic_ide_pci legacy_sata ;
 }
 
 AddFilesToHaikuImage system add-ons kernel busses scsi
@@ -329,7 +329,7 @@ AddFilesToHaikuImage system : haiku_loader ;
 # boot module links
 AddBootModuleSymlinksToHaikuImage
 	$(ATA_ONLY)ata pci config_manager dpc scsi usb $(ATA_ONLY)ata_adapter
-	locked_pool scsi_periph ahci generic_ide_pci
+	locked_pool scsi_periph ahci generic_ide_pci legacy_sata
 	<usb>uhci <usb>ohci <usb>ehci
 	scsi_cd scsi_disk usb_disk
 	intel