i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

* Removed the (intel) gart stuff from the floppy image. Not sure why this was

Browse Source 
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
This commit is contained in:
Axel Dörfler
2009-08-12 14:47:46 +00:00
parent 30f4c392a4
commit 3f1460bcee
2 changed files with 49 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files
build/jam/BuildSetup
+8 -5
View File
@@ -199,18 +199,20 @@ switch $(HAIKU_CPU) {
HAIKU_DEFINES += __ARM__ ; HAIKU_DEFINES += __ARM__ ;
HAIKU_BOOT_PLATFORM = u-boot ; HAIKU_BOOT_PLATFORM = u-boot ;
HAIKU_BOOT_BOARD ?= verdex ; 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)) # offset in floppy image (>= sizeof(haiku_loader))
HAIKU_BOOT_ARCHIVE_IMAGE_OFFSET = 192 ; # in kB - unused yet 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 : case x86 :
{ {
HAIKU_DEFINES += __INTEL__ ; HAIKU_DEFINES += __INTEL__ ;
HAIKU_BOOT_PLATFORM = bios_ia32 ; 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)) # 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 # yasm is required for target arch x86
if ! $(HAIKU_YASM) { if ! $(HAIKU_YASM) {
@@ -224,7 +226,8 @@ switch $(HAIKU_CPU) {
HAIKU_BOOT_FLOPPY_IMAGE_SIZE = 1440 ; # in kB HAIKU_BOOT_FLOPPY_IMAGE_SIZE = 1440 ; # in kB
# offset in floppy image (>= sizeof(haiku_loader)) # offset in floppy image (>= sizeof(haiku_loader))
HAIKU_BOOT_ARCHIVE_IMAGE_OFFSET = 150 ; # in kB 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 : case mipsel :
{ {
build/jam/FloppyBootImage
+41 -35
View File
@@ -26,33 +26,35 @@ if $(HAIKU_ATA_STACK) = 1 {
} }
local NET_BOOT = 0 ; local NET_BOOT = 0 ;
local USB_BOOT = 1 ;
local USB_ONLY = ;
if $(USB_BOOT) = 1 {
USB_ONLY = "" ;
}
local BOOT_ADD_ONS_NET ; local BOOT_ADD_ONS_NET ;
if $(NET_BOOT) = 1 { if $(NET_BOOT) = 1 {
BOOT_ADD_ONS_NET = BOOT_ADD_ONS_NET =
# nbd remote_disk
# remote_disk $(SYSTEM_ADD_ONS_DRIVERS_NET)
# $(SYSTEM_ADD_ONS_DRIVERS_NET) stack socket
# stack socket $(SYSTEM_NETWORK_DEVICES)
# $(SYSTEM_NETWORK_DEVICES) $(SYSTEM_NETWORK_DATALINK_PROTOCOLS)
# $(SYSTEM_NETWORK_DATALINK_PROTOCOLS) $(SYSTEM_NETWORK_PPP)
# $(SYSTEM_NETWORK_PPP) $(SYSTEM_NETWORK_PROTOCOLS)
# $(SYSTEM_NETWORK_PROTOCOLS) ;
;
} }
SYSTEM_ADD_ONS_BUS_MANAGERS = agp_gart $(ATA_ONLY)ata config_manager pci SYSTEM_ADD_ONS_BUS_MANAGERS = $(ATA_ONLY)ata config_manager pci
$(IDE_ONLY)ide $(X86_ONLY)isa scsi usb $(IDE_ONLY)ide $(X86_ONLY)isa scsi $(USB_ONLY)usb
; ;
SYSTEM_ADD_ONS_FILE_SYSTEMS = bfs iso9660 attribute_overlay write_overlay ; SYSTEM_ADD_ONS_FILE_SYSTEMS = bfs iso9660 attribute_overlay write_overlay ;
#cdda fat googlefs nfs ;
# modules # modules
AddFilesToFloppyBootArchive system add-ons kernel bus_managers AddFilesToFloppyBootArchive system add-ons kernel bus_managers
: $(SYSTEM_ADD_ONS_BUS_MANAGERS) ; : $(SYSTEM_ADD_ONS_BUS_MANAGERS) ;
AddFilesToFloppyBootArchive system add-ons kernel busses agp_gart
: $(X86_ONLY)<agp_gart>intel ;
AddFilesToFloppyBootArchive system add-ons kernel busses ide AddFilesToFloppyBootArchive system add-ons kernel busses ide
: generic_ide_pci $(X86_ONLY)ide_isa silicon_image_3112 legacy_sata it8211 ; : generic_ide_pci $(X86_ONLY)ide_isa silicon_image_3112 legacy_sata it8211 ;
AddFilesToFloppyBootArchive system add-ons kernel busses scsi AddFilesToFloppyBootArchive system add-ons kernel busses scsi
@@ -66,20 +68,24 @@ AddFilesToFloppyBootArchive system add-ons kernel partitioning_systems
: intel session ; : intel session ;
AddFilesToFloppyBootArchive system add-ons kernel interrupt_controllers AddFilesToFloppyBootArchive system add-ons kernel interrupt_controllers
: $(PPC_ONLY)openpic ; : $(PPC_ONLY)openpic ;
AddFilesToFloppyBootArchive system add-ons kernel busses usb
: <usb>uhci <usb>ohci <usb>ehci ; if $(USB_BOOT) = 1 {
AddFilesToFloppyBootArchive system add-ons kernel busses usb
: <usb>uhci <usb>ohci <usb>ehci ;
}
if $(TARGET_ARCH) = x86 { if $(TARGET_ARCH) = x86 {
AddFilesToFloppyBootArchive system add-ons kernel cpu : generic_x86 ; AddFilesToFloppyBootArchive system add-ons kernel cpu : generic_x86 ;
} }
# drivers # drivers
AddNewDriversToFloppyBootArchive disk scsi : scsi_cd scsi_disk ; AddNewDriversToFloppyBootArchive disk scsi : scsi_cd scsi_disk ;
AddDriversToFloppyBootArchive disk usb : usb_disk ; if $(USB_BOOT) = 1 {
AddDriversToFloppyBootArchive disk usb : usb_disk ;
}
if $(NET_BOOT) = 1 { if $(NET_BOOT) = 1 {
#AddDriversToFloppyBootArchive disk virtual : nbd ; AddDriversToFloppyBootArchive disk virtual : remote_disk ;
AddDriversToFloppyBootArchive disk virtual : remote_disk ; AddDriversToFloppyBootArchive net : $(SYSTEM_ADD_ONS_DRIVERS_NET) ;
AddDriversToFloppyBootArchive net : $(SYSTEM_ADD_ONS_DRIVERS_NET) ;
} }
# kernel # kernel
@@ -94,17 +100,17 @@ AddFilesToFloppyBootArchive home config settings kernel drivers
: $(driverSettingsFiles) ; : $(driverSettingsFiles) ;
if $(NET_BOOT) = 1 { if $(NET_BOOT) = 1 {
# add-ons # add-ons
AddFilesToFloppyBootArchive system add-ons kernel network AddFilesToFloppyBootArchive system add-ons kernel network
: stack socket ; : stack socket ;
AddFilesToFloppyBootArchive system add-ons kernel network devices AddFilesToFloppyBootArchive system add-ons kernel network devices
: $(SYSTEM_NETWORK_DEVICES) ; : $(SYSTEM_NETWORK_DEVICES) ;
AddFilesToFloppyBootArchive system add-ons kernel network datalink_protocols AddFilesToFloppyBootArchive system add-ons kernel network datalink_protocols
: $(SYSTEM_NETWORK_DATALINK_PROTOCOLS) ; : $(SYSTEM_NETWORK_DATALINK_PROTOCOLS) ;
AddFilesToFloppyBootArchive system add-ons kernel network ppp AddFilesToFloppyBootArchive system add-ons kernel network ppp
: $(SYSTEM_NETWORK_PPP) ; : $(SYSTEM_NETWORK_PPP) ;
AddFilesToFloppyBootArchive system add-ons kernel network protocols AddFilesToFloppyBootArchive system add-ons kernel network protocols
: $(SYSTEM_NETWORK_PROTOCOLS) ; : $(SYSTEM_NETWORK_PROTOCOLS) ;
} }
# boot module links # boot module links
@@ -115,8 +121,8 @@ AddBootModuleSymlinksToFloppyBootArchive
$(X86_ONLY)generic_x86 $(X86_ONLY)generic_x86
ahci generic_ide_pci $(X86_ONLY)ide_isa silicon_image_3112 legacy_sata ahci generic_ide_pci $(X86_ONLY)ide_isa silicon_image_3112 legacy_sata
it8211 it8211
<usb>uhci <usb>ohci <usb>ehci $(USB_ONLY)<usb>uhci $(USB_ONLY)<usb>ohci $(USB_ONLY)<usb>ehci
scsi_cd scsi_disk usb_disk scsi_cd scsi_disk $(USB_ONLY)usb_disk
intel session intel session
$(SYSTEM_ADD_ONS_FILE_SYSTEMS) $(SYSTEM_ADD_ONS_FILE_SYSTEMS)
$(BOOT_ADD_ONS_NET) $(BOOT_ADD_ONS_NET)