From 67ba05e6db7bb24b42cacfd19f57800fda739e42 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=B4me=20Duval?= Date: Mon, 9 Dec 2013 19:48:13 +0100 Subject: [PATCH] FloppyBootImage: removed special case for x86_64 * completes hrev46470 * to be noted, adding generic_x86 for x86_64 let Haiku crash on boot. --- build/jam/images/FloppyBootImage | 37 +++++++++++--------------------- 1 file changed, 13 insertions(+), 24 deletions(-) diff --git a/build/jam/images/FloppyBootImage b/build/jam/images/FloppyBootImage index d094a09450..4762fa9af2 100644 --- a/build/jam/images/FloppyBootImage +++ b/build/jam/images/FloppyBootImage @@ -110,30 +110,19 @@ if $(NET_BOOT) = 1 { } # boot module links -if $(TARGET_ARCH) = x86_64 { - AddBootModuleSymlinksToFloppyBootArchive - ata dpc config_manager pci scsi $(USB_ONLY)usb ata_adapter locked_pool - scsi_periph generic_x86 ahci generic_ide_pci legacy_sata - $(USB_ONLY)uhci $(USB_ONLY)ohci $(USB_ONLY)ehci - scsi_cd scsi_disk $(USB_ONLY)usb_disk - intel session - $(SYSTEM_ADD_ONS_FILE_SYSTEMS) - ; -} else { - AddBootModuleSymlinksToFloppyBootArchive - $(SYSTEM_ADD_ONS_BUS_MANAGERS) - openpic@ppc - ata_adapter@ata ide_adapter@ide locked_pool scsi_periph - generic_x86@x86 - ahci generic_ide_pci ide_isa@x86 silicon_image_3112 legacy_sata - it8211 - $(USB_ONLY)uhci $(USB_ONLY)ohci $(USB_ONLY)ehci - scsi_cd scsi_disk $(USB_ONLY)usb_disk norflash@arm - intel session - $(SYSTEM_ADD_ONS_FILE_SYSTEMS) - $(BOOT_ADD_ONS_NET) - ; -} +AddBootModuleSymlinksToFloppyBootArchive [ FFilterByBuildFeatures + $(SYSTEM_ADD_ONS_BUS_MANAGERS) + openpic@ppc + ata_adapter@ata ide_adapter@ide locked_pool scsi_periph + generic_x86@x86 + ahci generic_ide_pci ide_isa@x86 silicon_image_3112 legacy_sata + it8211 + $(USB_ONLY)uhci $(USB_ONLY)ohci $(USB_ONLY)ehci + scsi_cd scsi_disk $(USB_ONLY)usb_disk norflash@arm + intel session + $(SYSTEM_ADD_ONS_FILE_SYSTEMS) + $(BOOT_ADD_ONS_NET) +] ; #pragma mark - Build The Archive