From d65905e3b815044451787e27ce1588ace4846884 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Stephan=20A=C3=9Fmus?= Date: Sat, 2 May 2009 10:20:29 +0000 Subject: [PATCH] Apply Francois changes to enabling the ATA stack via "HAIKU_ATA_STACK = 1 ;" in the UserBuildConfig to the FloppyBootImage as well. git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@30557 a95241bf-73f2-0310-859d-f6bbb57e9c96 --- build/jam/FloppyBootImage | 20 +++++++++++++++----- 1 file changed, 15 insertions(+), 5 deletions(-) diff --git a/build/jam/FloppyBootImage b/build/jam/FloppyBootImage index e2af8e535b..17b54fac3b 100644 --- a/build/jam/FloppyBootImage +++ b/build/jam/FloppyBootImage @@ -16,6 +16,15 @@ if $(INCLUDE_GPL_ADDONS) = 1 { 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 BOOT_ADD_ONS_NET ; @@ -32,8 +41,8 @@ BOOT_ADD_ONS_NET = ; } -SYSTEM_ADD_ONS_BUS_MANAGERS = pci $(X86_ONLY)isa ide scsi - config_manager agp_gart usb +SYSTEM_ADD_ONS_BUS_MANAGERS = agp_gart $(ATA_ONLY)ata config_manager pci + $(IDE_ONLY)ide $(X86_ONLY)isa scsi usb ; SYSTEM_ADD_ONS_FILE_SYSTEMS = bfs iso9660 attribute_overlay write_overlay ; #cdda fat googlefs nfs ; @@ -52,7 +61,7 @@ AddFilesToFloppyBootArchive system add-ons kernel console : vga_text ; AddFilesToFloppyBootArchive system add-ons kernel file_systems : $(SYSTEM_ADD_ONS_FILE_SYSTEMS) ; 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 : intel session ; AddFilesToFloppyBootArchive system add-ons kernel interrupt_controllers @@ -102,9 +111,10 @@ AddFilesToFloppyBootArchive system add-ons kernel network protocols AddBootModuleSymlinksToFloppyBootArchive $(SYSTEM_ADD_ONS_BUS_MANAGERS) $(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 - 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 uhci ohci ehci scsi_cd scsi_disk usb_disk intel session