From 3f1460bceee87a897676c1f370d4211dd8f73e8e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Axel=20D=C3=B6rfler?= Date: Wed, 12 Aug 2009 14:47:46 +0000 Subject: [PATCH] * Removed the (intel) gart stuff from the floppy image. Not sure why this was on it. With the other changes already made, we can now use a 1440k boot image for x86 as well, again. * If you build a CD, you'll have to take extra care to see whether it still fits on the floppy or not - space is really tight already. * Made USB support optional for the CD-ROM. It's turned on, though, since we do want to support USB-CD-ROMs by default; this is just something you can use once in case we need to enlarge the boot floppy to 2880k again. git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@32282 a95241bf-73f2-0310-859d-f6bbb57e9c96 --- build/jam/BuildSetup | 13 ++++--- build/jam/FloppyBootImage | 76 +++++++++++++++++++++------------------ 2 files changed, 49 insertions(+), 40 deletions(-) diff --git a/build/jam/BuildSetup b/build/jam/BuildSetup index bf4c89a18f..75f969ca0c 100644 --- a/build/jam/BuildSetup +++ b/build/jam/BuildSetup @@ -199,18 +199,20 @@ switch $(HAIKU_CPU) { HAIKU_DEFINES += __ARM__ ; HAIKU_BOOT_PLATFORM = u-boot ; HAIKU_BOOT_BOARD ?= verdex ; - HAIKU_BOOT_FLOPPY_IMAGE_SIZE = 1440 ; # in kB (there is not realy a floppy on the gumstix ;) ) + HAIKU_BOOT_FLOPPY_IMAGE_SIZE = 1440 ; + # in kB (there is not really a floppy on the gumstix ;) ) # offset in floppy image (>= sizeof(haiku_loader)) HAIKU_BOOT_ARCHIVE_IMAGE_OFFSET = 192 ; # in kB - unused yet - HAIKU_NO_WERROR = 1 ; # we use #warning as placeholders for things to write... + HAIKU_NO_WERROR = 1 ; + # we use #warning as placeholders for things to write... } case x86 : { HAIKU_DEFINES += __INTEL__ ; HAIKU_BOOT_PLATFORM = bios_ia32 ; - HAIKU_BOOT_FLOPPY_IMAGE_SIZE = 2880 ; # in kB + HAIKU_BOOT_FLOPPY_IMAGE_SIZE = 1440 ; # in kB # offset in floppy image (>= sizeof(haiku_loader)) - HAIKU_BOOT_ARCHIVE_IMAGE_OFFSET = 300 ; # in kB + HAIKU_BOOT_ARCHIVE_IMAGE_OFFSET = 270 ; # in kB # yasm is required for target arch x86 if ! $(HAIKU_YASM) { @@ -224,7 +226,8 @@ switch $(HAIKU_CPU) { HAIKU_BOOT_FLOPPY_IMAGE_SIZE = 1440 ; # in kB # offset in floppy image (>= sizeof(haiku_loader)) HAIKU_BOOT_ARCHIVE_IMAGE_OFFSET = 150 ; # in kB - HAIKU_NO_WERROR = 1 ; # we use #warning as placeholders for things to write... + HAIKU_NO_WERROR = 1 ; + # we use #warning as placeholders for things to write... } case mipsel : { diff --git a/build/jam/FloppyBootImage b/build/jam/FloppyBootImage index 17b54fac3b..9740d56b53 100644 --- a/build/jam/FloppyBootImage +++ b/build/jam/FloppyBootImage @@ -26,33 +26,35 @@ if $(HAIKU_ATA_STACK) = 1 { } local NET_BOOT = 0 ; +local USB_BOOT = 1 ; + +local USB_ONLY = ; +if $(USB_BOOT) = 1 { + USB_ONLY = "" ; +} local BOOT_ADD_ONS_NET ; if $(NET_BOOT) = 1 { -BOOT_ADD_ONS_NET = -# nbd -# remote_disk -# $(SYSTEM_ADD_ONS_DRIVERS_NET) -# stack socket -# $(SYSTEM_NETWORK_DEVICES) -# $(SYSTEM_NETWORK_DATALINK_PROTOCOLS) -# $(SYSTEM_NETWORK_PPP) -# $(SYSTEM_NETWORK_PROTOCOLS) -; + BOOT_ADD_ONS_NET = + remote_disk + $(SYSTEM_ADD_ONS_DRIVERS_NET) + stack socket + $(SYSTEM_NETWORK_DEVICES) + $(SYSTEM_NETWORK_DATALINK_PROTOCOLS) + $(SYSTEM_NETWORK_PPP) + $(SYSTEM_NETWORK_PROTOCOLS) + ; } -SYSTEM_ADD_ONS_BUS_MANAGERS = agp_gart $(ATA_ONLY)ata config_manager pci - $(IDE_ONLY)ide $(X86_ONLY)isa scsi usb +SYSTEM_ADD_ONS_BUS_MANAGERS = $(ATA_ONLY)ata config_manager pci + $(IDE_ONLY)ide $(X86_ONLY)isa scsi $(USB_ONLY)usb ; SYSTEM_ADD_ONS_FILE_SYSTEMS = bfs iso9660 attribute_overlay write_overlay ; -#cdda fat googlefs nfs ; # modules AddFilesToFloppyBootArchive system add-ons kernel bus_managers : $(SYSTEM_ADD_ONS_BUS_MANAGERS) ; -AddFilesToFloppyBootArchive system add-ons kernel busses agp_gart - : $(X86_ONLY)intel ; AddFilesToFloppyBootArchive system add-ons kernel busses ide : generic_ide_pci $(X86_ONLY)ide_isa silicon_image_3112 legacy_sata it8211 ; AddFilesToFloppyBootArchive system add-ons kernel busses scsi @@ -66,20 +68,24 @@ AddFilesToFloppyBootArchive system add-ons kernel partitioning_systems : intel session ; AddFilesToFloppyBootArchive system add-ons kernel interrupt_controllers : $(PPC_ONLY)openpic ; -AddFilesToFloppyBootArchive system add-ons kernel busses usb - : uhci ohci ehci ; + +if $(USB_BOOT) = 1 { + AddFilesToFloppyBootArchive system add-ons kernel busses usb + : uhci ohci ehci ; +} if $(TARGET_ARCH) = x86 { AddFilesToFloppyBootArchive system add-ons kernel cpu : generic_x86 ; } # drivers -AddNewDriversToFloppyBootArchive disk scsi : scsi_cd scsi_disk ; -AddDriversToFloppyBootArchive disk usb : usb_disk ; +AddNewDriversToFloppyBootArchive disk scsi : scsi_cd scsi_disk ; +if $(USB_BOOT) = 1 { + AddDriversToFloppyBootArchive disk usb : usb_disk ; +} if $(NET_BOOT) = 1 { -#AddDriversToFloppyBootArchive disk virtual : nbd ; -AddDriversToFloppyBootArchive disk virtual : remote_disk ; -AddDriversToFloppyBootArchive net : $(SYSTEM_ADD_ONS_DRIVERS_NET) ; + AddDriversToFloppyBootArchive disk virtual : remote_disk ; + AddDriversToFloppyBootArchive net : $(SYSTEM_ADD_ONS_DRIVERS_NET) ; } # kernel @@ -94,17 +100,17 @@ AddFilesToFloppyBootArchive home config settings kernel drivers : $(driverSettingsFiles) ; if $(NET_BOOT) = 1 { -# add-ons -AddFilesToFloppyBootArchive system add-ons kernel network - : stack socket ; -AddFilesToFloppyBootArchive system add-ons kernel network devices - : $(SYSTEM_NETWORK_DEVICES) ; -AddFilesToFloppyBootArchive system add-ons kernel network datalink_protocols - : $(SYSTEM_NETWORK_DATALINK_PROTOCOLS) ; -AddFilesToFloppyBootArchive system add-ons kernel network ppp - : $(SYSTEM_NETWORK_PPP) ; -AddFilesToFloppyBootArchive system add-ons kernel network protocols - : $(SYSTEM_NETWORK_PROTOCOLS) ; + # add-ons + AddFilesToFloppyBootArchive system add-ons kernel network + : stack socket ; + AddFilesToFloppyBootArchive system add-ons kernel network devices + : $(SYSTEM_NETWORK_DEVICES) ; + AddFilesToFloppyBootArchive system add-ons kernel network datalink_protocols + : $(SYSTEM_NETWORK_DATALINK_PROTOCOLS) ; + AddFilesToFloppyBootArchive system add-ons kernel network ppp + : $(SYSTEM_NETWORK_PPP) ; + AddFilesToFloppyBootArchive system add-ons kernel network protocols + : $(SYSTEM_NETWORK_PROTOCOLS) ; } # boot module links @@ -115,8 +121,8 @@ AddBootModuleSymlinksToFloppyBootArchive $(X86_ONLY)generic_x86 ahci generic_ide_pci $(X86_ONLY)ide_isa silicon_image_3112 legacy_sata it8211 - uhci ohci ehci - scsi_cd scsi_disk usb_disk + $(USB_ONLY)uhci $(USB_ONLY)ohci $(USB_ONLY)ehci + scsi_cd scsi_disk $(USB_ONLY)usb_disk intel session $(SYSTEM_ADD_ONS_FILE_SYSTEMS) $(BOOT_ADD_ONS_NET)