recipes/pcat: move recipe blocks into local overlay

blk/001

@@ -11,4 +11,4 @@ MASTER INDEX
 550-649 unused
 650 AVR assembler             690 AVR SPI programmer
 700-729 unused                730 8086 assembler
-800 8086 boot code            830 PC/AT recipe
+800 8086 boot code

blk/830

@@ -1,5 +0,0 @@
-PC/AT recipe
-
-832 MBR bootloader             834 KEY/EMIT drivers
-836-838 BLK drivers            840 AT-XY drivers
-842 xcomp unit

recipes/pcat/Makefile

@@ -1,23 +1,30 @@
 TARGET = disk.bin
-BASEDIR = ../..
+BASE = ../..
-CDIR = $(BASEDIR)/cvm
+CDIR = $(BASE)/cvm
+BLKPACK = $(BASE)/tools/blkpack
 STAGE = $(CDIR)/stage
 
 .PHONY: all
 all: $(TARGET) 
-mbr.bin: mbr.fs $(STAGE)
+os.bin: xcomp.fs $(STAGE) blkfs
-	cat mbr.fs | $(STAGE) > $@
+	$(STAGE) blkfs < xcomp.fs > $@
 
-os.bin: xcomp.fs $(STAGE)
+$(BLKPACK):
-	cat xcomp.fs | $(STAGE) > $@
+	$(MAKE) -C ../tools
 
-disk.bin: mbr.bin os.bin
+blkfs: $(BLKPACK)
-	cat mbr.bin os.bin > $@
+	$(BLKPACK) $(BASE)/blk blk > $@
-	dd if=$(CDIR)/blkfs of=$@ bs=512 seek=16
 
 $(STAGE):
 	$(MAKE) -C $(CDIR) stage
 
+mbr.bin: mbr.fs $(STAGE)
+	cat mbr.fs | $(STAGE) > $@
+
+$(TARGET): mbr.bin os.bin
+	cat mbr.bin os.bin > $@
+	dd if=blkfs of=$@ bs=512 seek=16
+
 .PHONY: emul
 emul: $(TARGET)
 	qemu-system-i386 -drive file=$(TARGET),if=floppy,format=raw

recipes/pcat/blk/600

@@ -0,0 +1,5 @@
+PC/AT recipe
+
+602 MBR bootloader             604 KEY/EMIT drivers
+606-608 BLK drivers            610 AT-XY drivers
+612 xcomp unit

recipes/pcat/blk/612

@@ -3,11 +3,11 @@
 RS_ADDR 0x80 - CONSTANT SYSVARS
 750 LOAD  ( 8086 asm )
 262 LOAD  ( xcomp ) 270 LOAD  ( xcomp overrides )
-805 820 LOADR
+805 820 LOADR ( 8086 boot code )
 353 LOAD  ( xcomp core low )
-834 LOAD  ( KEY/EMIT drivers )
+604 LOAD  ( KEY/EMIT drivers )
-836 838 LOADR  ( BLK drivers )
+606 608 LOADR  ( BLK drivers )
-840 LOAD  ( AT-XY drivers )
+610 LOAD  ( AT-XY drivers )
 380 LOAD  ( xcomp core high )
 (entry) _ ( Update LATEST ) PC ORG @ 8 + !
 ," BLK$ FD$ ' FD@ BLK@* ! ' FD! BLK!* ! " EOT,

recipes/pcat/xcomp.fs

@@ -1,3 +1,3 @@
-842 LOAD ( PC/AT xcomp )
+612 LOAD ( PC/AT xcomp )
 ORG @ 256 /MOD 2 PC! 2 PC!
 H@ 256 /MOD 2 PC! 2 PC!