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

Apply Francois changes to enabling the ATA stack via "HAIKU_ATA_STACK = 1 ;"

Browse Source 
in the UserBuildConfig to the FloppyBootImage as well.


git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@30557 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Stephan Aßmus
2009-05-02 10:20:29 +00:00
parent 404077189c
commit d65905e3b8
1 changed files with 15 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
build/jam/FloppyBootImage
+15 -5
View File
@@ -16,6 +16,15 @@ if $(INCLUDE_GPL_ADDONS) = 1 {
GPL_ONLY = "" ; GPL_ONLY = "" ;
} }
#HACK: remove when old ide code is removed!
local ATA_ONLY = ;
local IDE_ONLY = ;
if $(HAIKU_ATA_STACK) = 1 {
ATA_ONLY = "" ;
} else {
IDE_ONLY = "" ;
}
local NET_BOOT = 0 ; local NET_BOOT = 0 ;
local BOOT_ADD_ONS_NET ; local BOOT_ADD_ONS_NET ;
@@ -32,8 +41,8 @@ BOOT_ADD_ONS_NET =
; ;
} }
SYSTEM_ADD_ONS_BUS_MANAGERS = pci $(X86_ONLY)isa ide scsi SYSTEM_ADD_ONS_BUS_MANAGERS = agp_gart $(ATA_ONLY)ata config_manager pci
config_manager agp_gart usb $(IDE_ONLY)ide $(X86_ONLY)isa scsi usb
; ;
SYSTEM_ADD_ONS_FILE_SYSTEMS = bfs iso9660 attribute_overlay write_overlay ; SYSTEM_ADD_ONS_FILE_SYSTEMS = bfs iso9660 attribute_overlay write_overlay ;
#cdda fat googlefs nfs ; #cdda fat googlefs nfs ;
@@ -52,7 +61,7 @@ AddFilesToFloppyBootArchive system add-ons kernel console : vga_text ;
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
: ide_adapter locked_pool scsi_periph ; : $(ATA_ONLY)ata_adapter $(IDE_ONLY)ide_adapter locked_pool scsi_periph ;
AddFilesToFloppyBootArchive system add-ons kernel partitioning_systems AddFilesToFloppyBootArchive system add-ons kernel partitioning_systems
: intel session ; : intel session ;
AddFilesToFloppyBootArchive system add-ons kernel interrupt_controllers AddFilesToFloppyBootArchive system add-ons kernel interrupt_controllers
@@ -102,9 +111,10 @@ AddFilesToFloppyBootArchive system add-ons kernel network protocols
AddBootModuleSymlinksToFloppyBootArchive AddBootModuleSymlinksToFloppyBootArchive
$(SYSTEM_ADD_ONS_BUS_MANAGERS) $(SYSTEM_ADD_ONS_BUS_MANAGERS)
$(PPC_ONLY)openpic $(PPC_ONLY)openpic
ide_adapter locked_pool scsi_periph $(ATA_ONLY)ata_adapter $(IDE_ONLY)ide_adapter locked_pool scsi_periph
$(X86_ONLY)generic_x86 $(X86_ONLY)generic_x86
ahci generic_ide_pci $(X86_ONLY)ide_isa silicon_image_3112 legacy_sata it8211 ahci generic_ide_pci $(X86_ONLY)ide_isa silicon_image_3112 legacy_sata
it8211
<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 session intel session