From 710dac2313c46704bb8ccd2512838cce82a7a1ef Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fran=C3=A7ois=20Revol?= Date: Wed, 27 Oct 2010 15:51:54 +0000 Subject: [PATCH] M68K: Do not force HAIKU_BOOT_PLATFORM and make the floppy image size depend on it. One should use HAIKU_BOOT_PLATFORM={atari_m68k|amiga_m68k} now instead of setting TARGET_BOOT_PLATFORM. Note we aren't yet at the point where jam can make you a floppy image due to broken vm stuff. It might be interesting to also switch the extension used on the image, amiga emulators prefer .adf for ex. git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@39165 a95241bf-73f2-0310-859d-f6bbb57e9c96 --- build/jam/BuildSetup | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/build/jam/BuildSetup b/build/jam/BuildSetup index 06f5eb3891..088a9af2dc 100644 --- a/build/jam/BuildSetup +++ b/build/jam/BuildSetup @@ -266,8 +266,18 @@ switch $(HAIKU_CPU) { case m68k : { HAIKU_DEFINES += __M68K__ ; - HAIKU_BOOT_PLATFORM = atari_m68k ; - HAIKU_BOOT_FLOPPY_IMAGE_SIZE = 1440 ; # in kB + HAIKU_BOOT_PLATFORM ?= atari_m68k ; + switch $(HAIKU_BOOT_PLATFORM) { + case atari_m68k : + { + HAIKU_BOOT_FLOPPY_IMAGE_SIZE = 1440 ; # in kB + } + case amiga_m68k : + { + # for now we have trouble reading from double-sided images + HAIKU_BOOT_FLOPPY_IMAGE_SIZE = 880 ; # in kB + } + } # offset in floppy image (>= sizeof(haiku_loader)) HAIKU_BOOT_ARCHIVE_IMAGE_OFFSET = 150 ; # in kB HAIKU_NO_WERROR = 1 ;