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

Make the tgz archive offset in floppy image settable. Set it to 270k for now, until zbeos gets some diet.

Browse Source 
git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@28657 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
François Revol
2008-11-15 03:30:00 +00:00
parent e02ed691ca
commit 1c532eedf1
3 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
build/jam/BuildSetup
+7
View File
@@ -216,16 +216,22 @@ switch $(HAIKU_CPU) {
{ {
HAIKU_DEFINES += __POWERPC__ ; HAIKU_DEFINES += __POWERPC__ ;
HAIKU_BOOT_PLATFORM = openfirmware ; HAIKU_BOOT_PLATFORM = openfirmware ;
# offset in floppy image (>= sizeof(zbeos))
HAIKU_BOOT_ARCHIVE_IMAGE_OFFSET = 192 ; # in kB - unused yet
} }
case x86 : case x86 :
{ {
HAIKU_DEFINES += __INTEL__ ; HAIKU_DEFINES += __INTEL__ ;
HAIKU_BOOT_PLATFORM = bios_ia32 ; HAIKU_BOOT_PLATFORM = bios_ia32 ;
# offset in floppy image (>= sizeof(zbeos))
HAIKU_BOOT_ARCHIVE_IMAGE_OFFSET = 270 ; # in kB
} }
case m68k : case m68k :
{ {
HAIKU_DEFINES += __M68K__ ; HAIKU_DEFINES += __M68K__ ;
HAIKU_BOOT_PLATFORM = atari_m68k ; HAIKU_BOOT_PLATFORM = atari_m68k ;
# offset in floppy image (>= sizeof(zbeos))
HAIKU_BOOT_ARCHIVE_IMAGE_OFFSET = 130 ; # in kB
} }
case * : case * :
Exit "Currently unsupported target CPU:" $(HAIKU_CPU) ; Exit "Currently unsupported target CPU:" $(HAIKU_CPU) ;
@@ -233,6 +239,7 @@ switch $(HAIKU_CPU) {
HAIKU_ARCH ?= $(HAIKU_CPU) ; HAIKU_ARCH ?= $(HAIKU_CPU) ;
HAIKU_ARCH_MACRO_DEFINE = ARCH_$(HAIKU_ARCH) ; HAIKU_ARCH_MACRO_DEFINE = ARCH_$(HAIKU_ARCH) ;
HAIKU_DEFINES += $(HAIKU_ARCH_MACRO_DEFINE) ; HAIKU_DEFINES += $(HAIKU_ARCH_MACRO_DEFINE) ;
HAIKU_DEFINES += BOOT_ARCHIVE_IMAGE_OFFSET=$(HAIKU_BOOT_ARCHIVE_IMAGE_OFFSET) ;
# directories # directories
HAIKU_OBJECT_BASE_DIR = [ FDirName $(HAIKU_OBJECT_DIR) haiku ] ; HAIKU_OBJECT_BASE_DIR = [ FDirName $(HAIKU_OBJECT_DIR) haiku ] ;
build/jam/ImageRules
+2 -1
View File
@@ -1047,6 +1047,7 @@ rule BuildFloppyBootImage image : zbeos : archive
Depends $(image) : $(zbeos) ; Depends $(image) : $(zbeos) ;
Depends $(image) : $(archive) ; Depends $(image) : $(archive) ;
#MakeLocateDebug $(image) ; #MakeLocateDebug $(image) ;
ARCHIVE_IMAGE_OFFSET on $(image) = $(HAIKU_BOOT_ARCHIVE_IMAGE_OFFSET) ;
BuildFloppyBootImage1 $(image) : $(zbeos) $(archive) ; BuildFloppyBootImage1 $(image) : $(zbeos) $(archive) ;
} }
@@ -1060,7 +1061,7 @@ actions BuildFloppyBootImage1
# add the boot drivers tgz archive # add the boot drivers tgz archive
# keep the offset in sync with # keep the offset in sync with
# src/system/boot/loader/file_systems/tarfs/tarfs.cpp:kFloppyArchiveOffset # src/system/boot/loader/file_systems/tarfs/tarfs.cpp:kFloppyArchiveOffset
dd if=$(>[2]) of=$(<) bs=192k seek=1 conv=notrunc dd if=$(>[2]) of=$(<) bs=$(ARCHIVE_IMAGE_OFFSET)k seek=1 conv=notrunc
} }
src/system/boot/platform/bios_ia32/shell.S
+1 -1
View File
@@ -37,7 +37,7 @@ sNumSectors:
// written by the "makeflop" command in 512 byte blocks // written by the "makeflop" command in 512 byte blocks
// 0x180 is the allowed maximum, as the zipped TAR with the // 0x180 is the allowed maximum, as the zipped TAR with the
// kernel and the boot module might start at offset 192 kB // kernel and the boot module might start at offset 192 kB
.word 0x0180 .word BOOT_ARCHIVE_IMAGE_OFFSET*2
floppy_start: floppy_start:
cli cli