recipes/ti84: move recipe blocks into local overlay

.gitignore

@@ -1 +1,3 @@
 *.o
+*.core
+memdump

blk/001

@@ -8,7 +8,7 @@ MASTER INDEX
 280 Z80 boot code             350 Core words
 410 PS/2 keyboard subsystem   420 SD Card subsystem
 440-519 unused                520 Fonts
-550 TI-84+ Recipe             580-649 unused
+550-649 unused
 650 AVR assembler             690 AVR SPI programmer
 700-729 unused                730 8086 assembler
 800 8086 boot code            830 PC/AT recipe

recipes/.gitignore

@@ -5,3 +5,4 @@
 *.rom
 *.8xu
 *.sms
+blkfs

recipes/ti84/Makefile

@@ -1,14 +1,21 @@
 TARGET = os.bin
-BASEDIR = ../..
+BASE = ../..
-CDIR = $(BASEDIR)/cvm
+CDIR = $(BASE)/cvm
 STAGE = $(CDIR)/stage
-EMUL = $(BASEDIR)/emul/hw/ti/ti84
+BLKPACK = $(BASE)/tools/blkpack
+EMUL = $(BASE)/emul/hw/ti/ti84
 MKTIUPGRADE = mktiupgrade
 
 .PHONY: all
 all: $(TARGET) 
-$(TARGET): xcomp.fs $(STAGE)
+$(TARGET): xcomp.fs $(STAGE) blkfs
-	cat xcomp.fs | $(STAGE) > $@
+	$(STAGE) blkfs < xcomp.fs > $@
+
+$(BLKPACK):
+	$(MAKE) -C ../tools
+
+blkfs: $(BLKPACK)
+	$(BLKPACK) $(BASE)/blk blk > $@
 
 $(STAGE):
 	$(MAKE) -C $(CDIR) stage

recipes/ti84/xcomp.fs

@@ -64,8 +64,8 @@ CURRENT @ XCURRENT !
 283 335 LOADR ( boot.z80 )
 353 LOAD  ( xcomp core low )
 CREATE ~FNT CPFNT3x5
-555 560 LOADR ( LCD low )
+605 610 LOADR ( LCD low )
-566 570 LOADR ( KBD low )
+616 620 LOADR ( KBD low )
 380 LOAD  ( xcomp core high )
 (entry) _
 ( Update LATEST )