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

Modified the floppy boot image target so that it can be used to build an x86_64 boot image.

Browse Source 
* set_haiku_revision doesn't currently support ELF64, don't use a
  revisioned kernel image on x86_64 for now.
* Don't try to build add-ons for x86_64 yet.
This commit is contained in:
Alex Smith
2012-06-19 21:36:13 +01:00
parent e114f50ddd
commit 7c488bff70
1 changed files with 54 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files
build/jam/FloppyBootImage
+54 -45
View File
@@ -52,44 +52,51 @@ SYSTEM_ADD_ONS_BUS_MANAGERS = $(X86_ONLY)acpi $(ATA_ONLY)ata config_manager dpc
SYSTEM_ADD_ONS_FILE_SYSTEMS = bfs iso9660 attribute_overlay write_overlay ; SYSTEM_ADD_ONS_FILE_SYSTEMS = bfs iso9660 attribute_overlay write_overlay ;
# modules if $(TARGET_ARCH) != x86_64 {
AddFilesToFloppyBootArchive system add-ons kernel bus_managers # modules
: $(SYSTEM_ADD_ONS_BUS_MANAGERS) ; AddFilesToFloppyBootArchive system add-ons kernel bus_managers
AddFilesToFloppyBootArchive system add-ons kernel busses ide : $(SYSTEM_ADD_ONS_BUS_MANAGERS) ;
: generic_ide_pci $(X86_ONLY)ide_isa silicon_image_3112 legacy_sata it8211 ; AddFilesToFloppyBootArchive system add-ons kernel busses ide
AddFilesToFloppyBootArchive system add-ons kernel busses scsi : generic_ide_pci $(X86_ONLY)ide_isa silicon_image_3112 legacy_sata it8211 ;
: ahci ; AddFilesToFloppyBootArchive system add-ons kernel busses scsi
AddFilesToFloppyBootArchive system add-ons kernel console : vga_text ; : ahci ;
AddFilesToFloppyBootArchive system add-ons kernel file_systems AddFilesToFloppyBootArchive system add-ons kernel console : vga_text ;
: $(SYSTEM_ADD_ONS_FILE_SYSTEMS) ; AddFilesToFloppyBootArchive system add-ons kernel file_systems
AddFilesToFloppyBootArchive system add-ons kernel generic : $(SYSTEM_ADD_ONS_FILE_SYSTEMS) ;
: $(ATA_ONLY)ata_adapter $(IDE_ONLY)ide_adapter locked_pool scsi_periph ; AddFilesToFloppyBootArchive system add-ons kernel generic
AddFilesToFloppyBootArchive system add-ons kernel partitioning_systems : $(ATA_ONLY)ata_adapter $(IDE_ONLY)ide_adapter locked_pool scsi_periph ;
: intel session ; AddFilesToFloppyBootArchive system add-ons kernel partitioning_systems
AddFilesToFloppyBootArchive system add-ons kernel interrupt_controllers : intel session ;
: $(PPC_ONLY)openpic ; AddFilesToFloppyBootArchive system add-ons kernel interrupt_controllers
: $(PPC_ONLY)openpic ;
if $(USB_BOOT) = 1 { if $(USB_BOOT) = 1 {
AddFilesToFloppyBootArchive system add-ons kernel busses usb AddFilesToFloppyBootArchive system add-ons kernel busses usb
: <usb>uhci <usb>ohci <usb>ehci ; : <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 ;
if $(USB_BOOT) = 1 { if $(USB_BOOT) = 1 {
AddDriversToFloppyBootArchive disk usb : usb_disk ; AddDriversToFloppyBootArchive disk usb : usb_disk ;
} }
if $(NET_BOOT) = 1 { if $(NET_BOOT) = 1 {
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
AddFilesToFloppyBootArchive system : <revisioned>kernel_$(TARGET_ARCH) ; if $(TARGET_ARCH) = x86_64 {
# TODO x86_64: ELF64 support not added to set_haiku_revision.
AddFilesToFloppyBootArchive system : kernel_$(TARGET_ARCH) ;
} else {
AddFilesToFloppyBootArchive system : <revisioned>kernel_$(TARGET_ARCH) ;
}
# scripts and data files # scripts and data files
@@ -114,19 +121,21 @@ if $(NET_BOOT) = 1 {
} }
# boot module links # boot module links
AddBootModuleSymlinksToFloppyBootArchive if $(TARGET_ARCH) != x86_64 {
$(SYSTEM_ADD_ONS_BUS_MANAGERS) AddBootModuleSymlinksToFloppyBootArchive
$(PPC_ONLY)openpic $(SYSTEM_ADD_ONS_BUS_MANAGERS)
$(ATA_ONLY)ata_adapter $(IDE_ONLY)ide_adapter locked_pool scsi_periph $(PPC_ONLY)openpic
$(X86_ONLY)generic_x86 $(ATA_ONLY)ata_adapter $(IDE_ONLY)ide_adapter locked_pool scsi_periph
ahci generic_ide_pci $(X86_ONLY)ide_isa silicon_image_3112 legacy_sata $(X86_ONLY)generic_x86
it8211 ahci generic_ide_pci $(X86_ONLY)ide_isa silicon_image_3112 legacy_sata
$(USB_ONLY)<usb>uhci $(USB_ONLY)<usb>ohci $(USB_ONLY)<usb>ehci it8211
scsi_cd scsi_disk $(USB_ONLY)usb_disk $(USB_ONLY)<usb>uhci $(USB_ONLY)<usb>ohci $(USB_ONLY)<usb>ehci
intel session scsi_cd scsi_disk $(USB_ONLY)usb_disk
$(SYSTEM_ADD_ONS_FILE_SYSTEMS) intel session
$(BOOT_ADD_ONS_NET) $(SYSTEM_ADD_ONS_FILE_SYSTEMS)
; $(BOOT_ADD_ONS_NET)
;
}
#pragma mark - Build The Archive #pragma mark - Build The Archive