Aren/haiku
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Added missing AHCI driver in FloppyBootImage, should fix #8943.

Browse Source
This commit is contained in:
Alex Smith 2012-09-08 09:33:13 +01:00
parent ceb29f6dac
commit c88f4908d8
2 changed files with 19 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
build/jam/FloppyBootImage
View File

@ -54,9 +54,11 @@ SYSTEM_ADD_ONS_FILE_SYSTEMS = bfs iso9660 attribute_overlay write_overlay ;
if $(TARGET_ARCH) = x86_64 { if $(TARGET_ARCH) = x86_64 {
AddFilesToFloppyBootArchive system add-ons kernel bus_managers 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 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 AddFilesToFloppyBootArchive system add-ons kernel file_systems
: $(SYSTEM_ADD_ONS_FILE_SYSTEMS) ; : $(SYSTEM_ADD_ONS_FILE_SYSTEMS) ;
AddFilesToFloppyBootArchive system add-ons kernel generic AddFilesToFloppyBootArchive system add-ons kernel generic
@ -64,9 +66,17 @@ if $(TARGET_ARCH) = x86_64 {
AddFilesToFloppyBootArchive system add-ons kernel partitioning_systems AddFilesToFloppyBootArchive system add-ons kernel partitioning_systems
: intel session ; : 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 ; AddFilesToFloppyBootArchive system add-ons kernel cpu : generic_x86 ;
AddNewDriversToFloppyBootArchive disk scsi : scsi_cd scsi_disk ; AddNewDriversToFloppyBootArchive disk scsi : scsi_cd scsi_disk ;
if $(USB_BOOT) = 1 {
AddDriversToFloppyBootArchive disk usb : usb_disk ;
}
} else { } else {
# modules # modules
AddFilesToFloppyBootArchive system add-ons kernel bus_managers AddFilesToFloppyBootArchive system add-ons kernel bus_managers
@ -142,8 +152,11 @@ if $(NET_BOOT) = 1 {
# boot module links # boot module links
if $(TARGET_ARCH) = x86_64 { if $(TARGET_ARCH) = x86_64 {
AddBootModuleSymlinksToFloppyBootArchive AddBootModuleSymlinksToFloppyBootArchive
ata dpc config_manager pci scsi ata_adapter locked_pool scsi_periph ata dpc config_manager pci scsi $(USB_ONLY)usb ata_adapter locked_pool
generic_x86 generic_ide_pci scsi_cd scsi_disk intel session 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) $(SYSTEM_ADD_ONS_FILE_SYSTEMS)
; ;
} else { } else {

4
build/jam/Haiku64Image
View File

@ -91,7 +91,7 @@ AddFilesToHaikuImage system add-ons kernel bus_managers
if $(HAIKU_ATA_STACK) = 1 { if $(HAIKU_ATA_STACK) = 1 {
AddFilesToHaikuImage system add-ons kernel busses ata AddFilesToHaikuImage system add-ons kernel busses ata
: generic_ide_pci ; : generic_ide_pci legacy_sata ;
} }
AddFilesToHaikuImage system add-ons kernel busses scsi AddFilesToHaikuImage system add-ons kernel busses scsi
@ -329,7 +329,7 @@ AddFilesToHaikuImage system : haiku_loader ;
# boot module links # boot module links
AddBootModuleSymlinksToHaikuImage AddBootModuleSymlinksToHaikuImage
$(ATA_ONLY)ata pci config_manager dpc scsi usb $(ATA_ONLY)ata_adapter $(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 <usb>uhci <usb>ohci <usb>ehci
scsi_cd scsi_disk usb_disk scsi_cd scsi_disk usb_disk
intel intel