Aren/haiku
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Increase HAIKU_BOOT_ARCHIVE_IMAGE_OFFSET for debug builds.

Browse Source
This commit is contained in:
Oliver Tappe 2014-06-02 01:46:25 +02:00
parent 1a7bcf6962
commit 911821275a
1 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
build/jam/ArchitectureRules
View File

@ -275,6 +275,9 @@ 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 ;
@ -323,7 +326,11 @@ 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))
HAIKU_BOOT_ARCHIVE_IMAGE_OFFSET = 300 ; # in kB if $(debugBootLoader) {
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) {
@ -335,7 +342,11 @@ 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))
HAIKU_BOOT_ARCHIVE_IMAGE_OFFSET = 300 ; # in kB if $(debugBootLoader) {
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 ;