duskos

commit 8516d6d9a19e5cf5807d59342cd288e80d31df40
parent fe91b60bb9b2455d114c3afa37c077acd9233d09
Author: Virgil Dupras <hsoft@hardcoded.net>
Date:   Thu,  6 Jul 2023 06:33:21 -0400

Fix PC and RPi targets

With core.blk and z80.blk, I busted my older FAT12 hardcoded sizes. I bumped it
to fix it, but I need to straighten out the FAT creation situation and make it
support FAT16 and auto-detect from geometry.

Diffstat:
M
Makefile
 | 
4
++--
M
buildpc.fs
 | 
2
+-
M
buildrpi.fs
 | 
2
+-

3 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/Makefile b/Makefile
@@ -22,7 +22,7 @@ dis: posix/dis.c
 	$(CC) posix/dis.c -Wall -o $@
 
 pc.img: dusk $(ALLSRCS)
-	dd if=/dev/zero of=$@ bs=512 count=2880
+	dd if=/dev/zero of=$@ bs=512 count=4096
 	./dusk < buildpc.fs
 	$(SYNCFS_CMD)
 
@@ -47,7 +47,7 @@ bios13run: bios13.img
 	qemu-system-i386 $(QEMU_FLAGS) -drive file=bios13.img,$(QEMU_DRVOPTS)
 
 rpifat.img: dusk $(ALLSRCS) # also builds rpikernel.img
-	dd if=/dev/zero of=$@ bs=1K count=2048
+	dd if=/dev/zero of=$@ bs=512 count=4096
 	touch rpikernel.img
 	./dusk < buildrpi.fs
 	$(SYNCFS_CMD)
diff --git a/buildpc.fs b/buildpc.fs
@@ -2,7 +2,7 @@
 f<< /xcomp/i386/pc/build.fs
 
 S" pc.img" mountImage ( drv ) value mydrv
-mydrv 2796 createFAT value myfat
+mydrv 4000 createFAT value myfat
 mydrv setupMBR
 mydrv DriveFile :new $200 over File :seek spitBoot
 S" /xcomp/i386/pc/init.fs" S" /xcomp/init.fs" myfat combineInit
diff --git a/buildrpi.fs b/buildrpi.fs
@@ -5,6 +5,6 @@ S" rpikernel.img" mountImage ( drv ) const mydrv
 mydrv DriveFile :new spitBoot
 
 S" rpifat.img" mountImage ( drv ) const mydrv
-mydrv 2796 createFAT value myfat
+mydrv 4000 createFAT value myfat
 S" /xcomp/arm/rpi/init.fs" S" /xcomp/init.fs" myfat combineInit
 bye