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

Revert "Increase HAIKU_BOOT_ARCHIVE_IMAGE_OFFSET for debug builds."

Browse Source 
* That change did not make any sense, as the floppy-boot images
  can't be built in debug mode anyway (the result is much too large).

This reverts commit 911821275a.
This commit is contained in:
Oliver Tappe
2014-06-11 09:43:42 +02:00
parent bc4db40c40
commit 006637a9b6
1 changed files with 2 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
build/jam/ArchitectureRules
+2 -13
View File
@@ -275,9 +275,6 @@ rule KernelArchitectureSetup architecture
local gccVersion = $(HAIKU_GCC_VERSION_$(architecture)) ; local gccVersion = $(HAIKU_GCC_VERSION_$(architecture)) ;
local cpu = $(HAIKU_CPU_$(architecture)) ; local cpu = $(HAIKU_CPU_$(architecture)) ;
local debugBootLoader
= [ ConfigVar DEBUG : HAIKU_TOP src system boot loader ] ;
switch $(cpu) { switch $(cpu) {
case ppc : case ppc :
HAIKU_BOOT_PLATFORM ?= openfirmware ; HAIKU_BOOT_PLATFORM ?= openfirmware ;
@@ -326,11 +323,7 @@ rule KernelArchitectureSetup architecture
HAIKU_BOOT_PLATFORM = bios_ia32 ; HAIKU_BOOT_PLATFORM = bios_ia32 ;
HAIKU_BOOT_FLOPPY_IMAGE_SIZE = 2880 ; # in kB HAIKU_BOOT_FLOPPY_IMAGE_SIZE = 2880 ; # in kB
# offset in floppy image (>= sizeof(haiku_loader)) # offset in floppy image (>= sizeof(haiku_loader))
if $(debugBootLoader) { HAIKU_BOOT_ARCHIVE_IMAGE_OFFSET = 300 ; # in kB
HAIKU_BOOT_ARCHIVE_IMAGE_OFFSET = 350 ; # in kB
} else {
HAIKU_BOOT_ARCHIVE_IMAGE_OFFSET = 300 ; # in kB
}
# nasm is required for target arch x86 # nasm is required for target arch x86
if ! $(HAIKU_NASM) { if ! $(HAIKU_NASM) {
@@ -342,11 +335,7 @@ rule KernelArchitectureSetup architecture
HAIKU_BOOT_PLATFORM = bios_ia32 ; HAIKU_BOOT_PLATFORM = bios_ia32 ;
HAIKU_BOOT_FLOPPY_IMAGE_SIZE = 2880 ; # in kB HAIKU_BOOT_FLOPPY_IMAGE_SIZE = 2880 ; # in kB
# offset in floppy image (>= sizeof(haiku_loader)) # offset in floppy image (>= sizeof(haiku_loader))
if $(debugBootLoader) { HAIKU_BOOT_ARCHIVE_IMAGE_OFFSET = 300 ; # in kB
HAIKU_BOOT_ARCHIVE_IMAGE_OFFSET = 350 ; # in kB
} else {
HAIKU_BOOT_ARCHIVE_IMAGE_OFFSET = 300 ; # in kB
}
# x86_64 kernel source is under arch/x86. # x86_64 kernel source is under arch/x86.
HAIKU_KERNEL_ARCH = x86 ; HAIKU_KERNEL_ARCH = x86 ;