recipes/trs80: move recipe blocks into local overlay

blk/001

@@ -7,8 +7,7 @@ MASTER INDEX
 200 Z80 assembler             260 Cross compilation
 280 Z80 boot code             350 Core words
 410 PS/2 keyboard subsystem   420 SD Card subsystem
-440-489 unused
+440-519 unused                520 Fonts
-490 TRS-80 Recipe             520 Fonts
 550 TI-84+ Recipe             580-649 unused
 650 AVR assembler             690 AVR SPI programmer
 700-729 unused                730 8086 assembler

recipes/trs80/Makefile

@@ -1,11 +1,18 @@
 TARGET = os.bin
-CDIR = ../../cvm
+BASE = ../..
-STAGE = $(CDIR)/stage
+BLKPACK = $(BASE)/tools/blkpack
+STAGE = $(BASE)/cvm/stage
 
 .PHONY: all
 all: $(TARGET) 
-$(TARGET): xcomp.fs $(STAGE)
+$(TARGET): xcomp.fs $(STAGE) blkfs
-	cat xcomp.fs | $(STAGE) > $@
+	cat xcomp.fs | $(STAGE) blkfs > $@
+
+$(BLKPACK):
+	$(MAKE) -C ../tools
+
+blkfs: $(BLKPACK)
+	$(BLKPACK) $(BASE)/blk blk > $@
 
 $(STAGE):
-	$(MAKE) -C $(CDIR) stage
+	$(MAKE) -C $(BASE)/cvm stage

recipes/trs80/blk/600

@@ -4,7 +4,6 @@ Support code for the TRS-80 recipe. Contains drivers for the
 keyboard, video and floppy. At the moment, they are thin layer
 over the drivers provided by TRSDOS' SVC.
 
-Load with "492 LOAD".
+Load with "602 LOAD".
 
-There is also the RECV program at B502 and the XCOMP unit at
+There is also the RECV program at B612.
-B504

recipes/trs80/xcomp.fs

@@ -9,7 +9,7 @@ RS_ADDR 0x80 - CONSTANT SYSVARS
 0x3000 BIN( !
 283 335 LOADR ( boot.z80 )
 353 LOAD ( xcomp core low )
-492 LOAD ( trs80 )
+602 LOAD ( trs80 )
 380 LOAD ( xcomp core high )
 (entry) _
 ( Update LATEST )