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

FloppyBootImage: removed special case for x86_64

Browse Source 
* now includes acpi, should help for #10266.
This commit is contained in:
Jérôme Duval
2013-12-01 21:16:29 +01:00
parent 0efca1ac8d
commit 44b4797910
1 changed files with 39 additions and 69 deletions
Download Patch File Download Diff File Expand all files Collapse all files
build/jam/images/FloppyBootImage
+39 -69
View File
@@ -26,85 +26,57 @@ if $(NET_BOOT) = 1 {
} }
SYSTEM_ADD_ONS_BUS_MANAGERS = [ FFilterByBuildFeatures SYSTEM_ADD_ONS_BUS_MANAGERS = [ FFilterByBuildFeatures
acpi@x86 ata@ata config_manager dpc pci acpi@x86,x86_64 ata@ata config_manager dpc pci
ide@ide isa@x86 scsi $(USB_ONLY)usb ide@ide isa@x86,x86_64 scsi $(USB_ONLY)usb
] ; ] ;
SYSTEM_ADD_ONS_FILE_SYSTEMS = SYSTEM_ADD_ONS_FILE_SYSTEMS =
attribute_overlay bfs iso9660 packagefs write_overlay attribute_overlay bfs iso9660 packagefs write_overlay
; ;
# modules
AddFilesToFloppyBootArchive system add-ons kernel bus_managers
: $(SYSTEM_ADD_ONS_BUS_MANAGERS) ;
if $(TARGET_ARCH) = x86_64 { if $(HAIKU_ATA_STACK) = 1 {
AddFilesToFloppyBootArchive system add-ons kernel bus_managers
: 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 legacy_sata ; : generic_ide_pci ide_isa@x86 silicon_image_3112 legacy_sata
AddFilesToFloppyBootArchive system add-ons kernel busses scsi it8211 ;
: ahci ;
AddFilesToFloppyBootArchive system add-ons kernel file_systems
: $(SYSTEM_ADD_ONS_FILE_SYSTEMS) ;
AddFilesToFloppyBootArchive system add-ons kernel generic
: ata_adapter locked_pool scsi_periph ;
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 { } else {
# modules AddFilesToFloppyBootArchive system add-ons kernel busses ide
AddFilesToFloppyBootArchive system add-ons kernel bus_managers : generic_ide_pci ide_isa@x86 silicon_image_3112 legacy_sata
: $(SYSTEM_ADD_ONS_BUS_MANAGERS) ; it8211 ;
}
if $(HAIKU_ATA_STACK) = 1 { AddFilesToFloppyBootArchive system add-ons kernel busses scsi
AddFilesToFloppyBootArchive system add-ons kernel busses ata : ahci ;
: generic_ide_pci ide_isa@x86 silicon_image_3112 legacy_sata AddFilesToFloppyBootArchive system add-ons kernel console : vga_text ;
it8211 ; AddFilesToFloppyBootArchive system add-ons kernel file_systems
} else { : $(SYSTEM_ADD_ONS_FILE_SYSTEMS) ;
AddFilesToFloppyBootArchive system add-ons kernel busses ide AddFilesToFloppyBootArchive system add-ons kernel generic
: generic_ide_pci ide_isa@x86 silicon_image_3112 legacy_sata : ata_adapter@ata ide_adapter@ide locked_pool scsi_periph ;
it8211 ; AddFilesToFloppyBootArchive system add-ons kernel partitioning_systems
} : intel session ;
AddFilesToFloppyBootArchive system add-ons kernel interrupt_controllers
: openpic@ppc ;
AddFilesToFloppyBootArchive system add-ons kernel busses scsi if $(USB_BOOT) = 1 {
: ahci ; AddFilesToFloppyBootArchive system add-ons kernel busses usb
AddFilesToFloppyBootArchive system add-ons kernel console : vga_text ; : <usb>uhci <usb>ohci <usb>ehci ;
AddFilesToFloppyBootArchive system add-ons kernel file_systems }
: $(SYSTEM_ADD_ONS_FILE_SYSTEMS) ;
AddFilesToFloppyBootArchive system add-ons kernel generic
: ata_adapter@ata ide_adapter@ide locked_pool scsi_periph ;
AddFilesToFloppyBootArchive system add-ons kernel partitioning_systems
: intel session ;
AddFilesToFloppyBootArchive system add-ons kernel interrupt_controllers
: openpic@ppc ;
if $(USB_BOOT) = 1 { if $(TARGET_ARCH) = x86 || $(TARGET_ARCH) = x86_64 {
AddFilesToFloppyBootArchive system add-ons kernel busses usb AddFilesToFloppyBootArchive system add-ons kernel cpu : generic_x86 ;
: <usb>uhci <usb>ohci <usb>ehci ; }
}
if $(TARGET_ARCH) = x86 || $(TARGET_ARCH) = x86_64 { # drivers
AddFilesToFloppyBootArchive system add-ons kernel cpu : generic_x86 ; AddNewDriversToFloppyBootArchive disk scsi : scsi_cd scsi_disk ;
} AddNewDriversToFloppyBootArchive disk : norflash@arm ;
if $(USB_BOOT) = 1 {
# drivers AddDriversToFloppyBootArchive disk usb : usb_disk ;
AddNewDriversToFloppyBootArchive disk scsi : scsi_cd scsi_disk ; }
AddNewDriversToFloppyBootArchive disk : norflash@arm ; if $(NET_BOOT) = 1 {
if $(USB_BOOT) = 1 { AddDriversToFloppyBootArchive disk virtual : remote_disk ;
AddDriversToFloppyBootArchive disk usb : usb_disk ; AddDriversToFloppyBootArchive net : $(SYSTEM_ADD_ONS_DRIVERS_NET) ;
}
if $(NET_BOOT) = 1 {
AddDriversToFloppyBootArchive disk virtual : remote_disk ;
AddDriversToFloppyBootArchive net : $(SYSTEM_ADD_ONS_DRIVERS_NET) ;
}
} }
# kernel # kernel
@@ -222,5 +194,3 @@ RmTemps $(HAIKU_BOOT_FLOPPY) : $(HAIKU_FLOPPY_BOOT_ARCHIVE) ;
NotFile haiku-boot-floppy ; NotFile haiku-boot-floppy ;
Depends haiku-boot-floppy : $(HAIKU_BOOT_FLOPPY) ; Depends haiku-boot-floppy : $(HAIKU_BOOT_FLOPPY) ;