[haiku-commits] haiku: hrev48179 - build/jam/images
- From: ithamar@xxxxxxxxxxxxxxxxxxx
- To: haiku-commits@xxxxxxxxxxxxx
- Date: Fri, 31 Oct 2014 11:33:42 +0100 (CET)
hrev48179 adds 1 changeset to branch 'master'
old head: 16286325845103afbcd9ecf1cd37a531d9d54c14
new head: 47c530330519332c91110ddf85d276d4f3835d31
overview: http://cgit.haiku-os.org/haiku/log/?qt=range&q=47c5303+%5E1628632
----------------------------------------------------------------------------
47c5303: revert accidental adding of xhci to boot floppy
I should not be doing multiple (unrelated) things at the same
time I guess ;)
[ Ithamar R. Adema <ithamar@xxxxxxxxxxxxxxxxxxx> ]
----------------------------------------------------------------------------
Revision: hrev48179
Commit: 47c530330519332c91110ddf85d276d4f3835d31
URL: http://cgit.haiku-os.org/haiku/commit/?id=47c5303
Author: Ithamar R. Adema <ithamar@xxxxxxxxxxxxxxxxxxx>
Date: Fri Oct 31 10:32:15 2014 UTC
----------------------------------------------------------------------------
1 file changed, 2 insertions(+), 2 deletions(-)
build/jam/images/FloppyBootImage | 4 ++--
----------------------------------------------------------------------------
diff --git a/build/jam/images/FloppyBootImage b/build/jam/images/FloppyBootImage
index 125acdc..c3e9d12 100644
--- a/build/jam/images/FloppyBootImage
+++ b/build/jam/images/FloppyBootImage
@@ -61,7 +61,7 @@ AddFilesToFloppyBootArchive system add-ons kernel
interrupt_controllers
if $(USB_BOOT) = 1 {
AddFilesToFloppyBootArchive system add-ons kernel busses usb
- : <usb>uhci <usb>ohci <usb>ehci <usb>xhci ;
+ : <usb>uhci <usb>ohci <usb>ehci ;
}
if $(TARGET_ARCH) = x86 || $(TARGET_ARCH) = x86_64 {
@@ -117,7 +117,7 @@ AddBootModuleSymlinksToFloppyBootArchive [
FFilterByBuildFeatures
generic_x86@x86
ahci generic_ide_pci ide_isa@x86 silicon_image_3112 legacy_sata
it8211
- $(USB_ONLY)<usb>uhci $(USB_ONLY)<usb>ohci $(USB_ONLY)<usb>ehci
$(USB_ONLY)<usb>xhci
+ $(USB_ONLY)<usb>uhci $(USB_ONLY)<usb>ohci $(USB_ONLY)<usb>ehci
scsi_cd scsi_disk $(USB_ONLY)usb_disk norflash@arm
intel session
$(SYSTEM_ADD_ONS_FILE_SYSTEMS)
Other related posts:
- » [haiku-commits] haiku: hrev48179 - build/jam/images - ithamar
