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

If I got it right this should enable switching the ata vs ide stack by just adding

Browse Source 
HAIKU_ATA_STACK = 1 ;
in your UserBuildConfig.


git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@30496 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
François Revol
2009-04-30 00:04:08 +00:00
parent 838eca4665
commit 797f475dba
2 changed files with 25 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
build/jam/HaikuImage
+18 -4
View File
@@ -18,6 +18,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 = "" ;
}
SYSTEM_BIN = "[" addattr alert arp base64 basename bash bc beep bootman bzip2 SYSTEM_BIN = "[" addattr alert arp base64 basename bash bc beep bootman bzip2
cal cat catattr checkfs chgrp chmod chop chown chroot cksum clear cal cat catattr checkfs chgrp chmod chop chown chroot cksum clear
clockconfig cmp comm compress copyattr CortexAddOnHost cp clockconfig cmp comm compress copyattr CortexAddOnHost cp
@@ -138,7 +147,7 @@ SYSTEM_ADD_ONS_DRIVERS_NET = $(X86_ONLY)3com $(X86_ONLY)broadcom440x
$(X86_ONLY)attansic_l2 $(X86_ONLY)ar81xx usb_ecm $(X86_ONLY)attansic_l2 $(X86_ONLY)ar81xx usb_ecm
; ;
#SYSTEM_ADD_ONS_DRIVERS_POWER = $(X86_ONLY)acpi_button ; #SYSTEM_ADD_ONS_DRIVERS_POWER = $(X86_ONLY)acpi_button ;
SYSTEM_ADD_ONS_BUS_MANAGERS = pci $(X86_ONLY)ps2 $(X86_ONLY)isa ide scsi SYSTEM_ADD_ONS_BUS_MANAGERS = pci $(X86_ONLY)ps2 $(X86_ONLY)isa $(IDE_ONLY)ide $(ATA_ONLY)ata scsi
config_manager agp_gart usb firewire $(X86_ONLY)acpi config_manager agp_gart usb firewire $(X86_ONLY)acpi
; ;
SYSTEM_ADD_ONS_FILE_SYSTEMS = bfs cdda ext2 fat iso9660 nfs attribute_overlay SYSTEM_ADD_ONS_FILE_SYSTEMS = bfs cdda ext2 fat iso9660 nfs attribute_overlay
@@ -151,8 +160,13 @@ AddFilesToHaikuImage system add-ons kernel bus_managers
: $(SYSTEM_ADD_ONS_BUS_MANAGERS) ; : $(SYSTEM_ADD_ONS_BUS_MANAGERS) ;
AddFilesToHaikuImage system add-ons kernel busses agp_gart AddFilesToHaikuImage system add-ons kernel busses agp_gart
: $(X86_ONLY)<agp_gart>intel ; : $(X86_ONLY)<agp_gart>intel ;
if $(HAIKU_ATA_STACK) = 1 {
AddFilesToHaikuImage system add-ons kernel busses ide AddFilesToHaikuImage system add-ons kernel busses ide
: generic_ide_pci it8211 legacy_sata silicon_image_3112 $(X86_ONLY)ide_isa ; : generic_ide_pci it8211 legacy_sata silicon_image_3112 $(X86_ONLY)ide_isa ;
} else {
AddFilesToHaikuImage system add-ons kernel busses ata
: generic_ide_pci it8211 legacy_sata silicon_image_3112 $(X86_ONLY)ide_isa ;
}
AddFilesToHaikuImage system add-ons kernel busses scsi AddFilesToHaikuImage system add-ons kernel busses scsi
: ahci ; : ahci ;
AddFilesToHaikuImage system add-ons kernel busses usb AddFilesToHaikuImage system add-ons kernel busses usb
@@ -164,7 +178,7 @@ AddFilesToHaikuImage system add-ons kernel debugger
AddFilesToHaikuImage system add-ons kernel file_systems AddFilesToHaikuImage system add-ons kernel file_systems
: $(SYSTEM_ADD_ONS_FILE_SYSTEMS) ; : $(SYSTEM_ADD_ONS_FILE_SYSTEMS) ;
AddFilesToHaikuImage system add-ons kernel generic AddFilesToHaikuImage system add-ons kernel generic
: dpc ide_adapter locked_pool mpu401 scsi_periph ; : dpc $(IDE_ONLY)ide_adapter $(ATA_ONLY)ata_adapter locked_pool mpu401 scsi_periph ;
AddFilesToHaikuImage system add-ons kernel partitioning_systems AddFilesToHaikuImage system add-ons kernel partitioning_systems
: intel session ; : intel session ;
AddFilesToHaikuImage system add-ons kernel interrupt_controllers AddFilesToHaikuImage system add-ons kernel interrupt_controllers
@@ -407,9 +421,9 @@ AddFilesToHaikuImage system : haiku_loader ;
# boot module links # boot module links
AddBootModuleSymlinksToHaikuImage AddBootModuleSymlinksToHaikuImage
$(X86_ONLY)acpi pci $(X86_ONLY)isa config_manager ide scsi usb $(X86_ONLY)acpi pci $(X86_ONLY)isa config_manager $(IDE_ONLY)ide $(ATA_ONLY)ata scsi usb
$(PPC_ONLY)openpic $(PPC_ONLY)openpic
ide_adapter locked_pool scsi_periph $(IDE_ONLY)ide_adapter $(ATA_ONLY)ata_adapter locked_pool scsi_periph
ahci generic_ide_pci it8211 legacy_sata silicon_image_3112 $(X86_ONLY)ide_isa ahci generic_ide_pci it8211 legacy_sata silicon_image_3112 $(X86_ONLY)ide_isa
<usb>uhci <usb>ohci <usb>ehci <usb>uhci <usb>ohci <usb>ehci
scsi_cd scsi_disk usb_disk scsi_cd scsi_disk usb_disk
src/add-ons/kernel/busses/Jamfile
+7 -2
View File
@@ -1,7 +1,12 @@
SubDir HAIKU_TOP src add-ons kernel busses ; SubDir HAIKU_TOP src add-ons kernel busses ;
#SubInclude HAIKU_TOP src add-ons kernel busses ata ; # HACK: remove this when the old ide code is removed!
SubInclude HAIKU_TOP src add-ons kernel busses agp_gart ; if $(HAIKU_ATA_STACK) {
SubInclude HAIKU_TOP src add-ons kernel busses ata ;
} else {
SubInclude HAIKU_TOP src add-ons kernel busses ide ; SubInclude HAIKU_TOP src add-ons kernel busses ide ;
}
SubInclude HAIKU_TOP src add-ons kernel busses agp_gart ;
SubInclude HAIKU_TOP src add-ons kernel busses scsi ; SubInclude HAIKU_TOP src add-ons kernel busses scsi ;
SubInclude HAIKU_TOP src add-ons kernel busses usb ; SubInclude HAIKU_TOP src add-ons kernel busses usb ;