From e58b9cf283d54ed70a05af7d2e9a104bc1731536 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fran=C3=A7ois=20Revol?= Date: Tue, 4 Mar 2008 01:05:50 +0000 Subject: [PATCH] Reordered boot module list as well, it works much better when scsi_cd is here! Added legacy_sata just in case. At least now qemu finds the bfs track and tries to run Bootscript, but I get loads of ide timeouts so it ends up panicing anyway. git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@24224 a95241bf-73f2-0310-859d-f6bbb57e9c96 --- build/jam/FloppyBootImage | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/build/jam/FloppyBootImage b/build/jam/FloppyBootImage index 34dea38758..2c775fe66c 100644 --- a/build/jam/FloppyBootImage +++ b/build/jam/FloppyBootImage @@ -43,7 +43,7 @@ AddFilesToFloppyBootArchive beos system add-ons kernel bus_managers AddFilesToFloppyBootArchive beos system add-ons kernel busses agp_gart : $(X86_ONLY)intel ; AddFilesToFloppyBootArchive beos system add-ons kernel busses ide - : ahci generic_ide_pci $(X86_ONLY)ide_isa silicon_image_3112 ; + : ahci generic_ide_pci $(X86_ONLY)ide_isa silicon_image_3112 legacy_sata ; AddFilesToFloppyBootArchive beos system add-ons kernel console : vga_text ; AddFilesToFloppyBootArchive beos system add-ons kernel file_systems : $(BEOS_ADD_ONS_FILE_SYSTEMS) ; @@ -94,12 +94,13 @@ AddFilesToFloppyBootArchive beos system add-ons kernel network protocols # boot module links AddBootModuleSymlinksToFloppyBootArchive $(BEOS_ADD_ONS_BUS_MANAGERS) - ahci generic_ide_pci $(X86_ONLY)ide_isa silicon_image_3112 - $(BEOS_ADD_ONS_FILE_SYSTEMS) - block_io fast_log ide_adapter locked_pool scsi_periph - intel session $(PPC_ONLY)openpic + block_io fast_log ide_adapter locked_pool scsi_periph $(X86_ONLY)generic_x86 + ahci generic_ide_pci $(X86_ONLY)ide_isa silicon_image_3112 legacy_sata + scsi_cd scsi_dsk + intel session + $(BEOS_ADD_ONS_FILE_SYSTEMS) $(BOOT_ADD_ONS_NET) ;