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

Use arch specific floppy image size, Atari machines don't know about 2.88kB... plus it still fits in.

Browse Source 
git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@30469 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
François Revol
2009-04-27 19:28:13 +00:00
parent f5be3a125f
commit 4eae7ffa1e
2 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
build/jam/BuildSetup
+3
View File
@@ -171,6 +171,7 @@ switch $(HAIKU_CPU) {
{ {
HAIKU_DEFINES += __POWERPC__ ; HAIKU_DEFINES += __POWERPC__ ;
HAIKU_BOOT_PLATFORM = openfirmware ; HAIKU_BOOT_PLATFORM = openfirmware ;
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 = 192 ; # in kB - unused yet HAIKU_BOOT_ARCHIVE_IMAGE_OFFSET = 192 ; # in kB - unused yet
} }
@@ -178,6 +179,7 @@ switch $(HAIKU_CPU) {
{ {
HAIKU_DEFINES += __INTEL__ ; HAIKU_DEFINES += __INTEL__ ;
HAIKU_BOOT_PLATFORM = bios_ia32 ; HAIKU_BOOT_PLATFORM = bios_ia32 ;
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 HAIKU_BOOT_ARCHIVE_IMAGE_OFFSET = 300 ; # in kB
@@ -190,6 +192,7 @@ switch $(HAIKU_CPU) {
{ {
HAIKU_DEFINES += __M68K__ ; HAIKU_DEFINES += __M68K__ ;
HAIKU_BOOT_PLATFORM = atari_m68k ; HAIKU_BOOT_PLATFORM = atari_m68k ;
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 = 130 ; # in kB HAIKU_BOOT_ARCHIVE_IMAGE_OFFSET = 130 ; # in kB
} }
build/jam/ImageRules
+2 -1
View File
@@ -1056,6 +1056,7 @@ rule BuildFloppyBootImage image : haikuLoader : archive
Depends $(image) : $(haikuLoader) ; Depends $(image) : $(haikuLoader) ;
Depends $(image) : $(archive) ; Depends $(image) : $(archive) ;
#MakeLocateDebug $(image) ; #MakeLocateDebug $(image) ;
FLOPPY_IMAGE_SIZE on $(image) = $(HAIKU_BOOT_FLOPPY_IMAGE_SIZE) ;
ARCHIVE_IMAGE_OFFSET on $(image) = $(HAIKU_BOOT_ARCHIVE_IMAGE_OFFSET) ; ARCHIVE_IMAGE_OFFSET on $(image) = $(HAIKU_BOOT_ARCHIVE_IMAGE_OFFSET) ;
BuildFloppyBootImage1 $(image) : $(haikuLoader) $(archive) ; BuildFloppyBootImage1 $(image) : $(haikuLoader) $(archive) ;
} }
@@ -1064,7 +1065,7 @@ actions BuildFloppyBootImage1
{ {
$(RM) $(<) $(RM) $(<)
# make an empty image # make an empty image
dd if=/dev/zero of=$(<) bs=2k count=1440 dd if=/dev/zero of=$(<) bs=1k count=$(FLOPPY_IMAGE_SIZE)
# add haiku_loader # add haiku_loader
dd if=$(>[1]) of=$(<) conv=notrunc dd if=$(>[1]) of=$(<) conv=notrunc
# add the boot drivers tgz archive # add the boot drivers tgz archive