r2k: fix build rules and compiler properties

diff --git a/Kernel/cpu-r2k/cpu.h b/Kernel/cpu-r2k/cpu.h
index 88c0204..51063cf 100644 (file)
--- a/Kernel/cpu-r2k/cpu.h
+++ b/Kernel/cpu-r2k/cpu.h
@@ -23,7 +23,7 @@ typedef uint16_t uptr_t;              /* Userspace pointer equivalent */
 typedef uint16_t irqflags_t;
 
 extern void out(uint8_t addr, uint8_t val);
-extern uint8_t in(uint8_t addr);
+extern uint8_t in(uint8_t addr) __z88dk_fastcall;
 
 /* Rabbit binaries start with a JP FIXME: sort this in new binfmt */
 #define EMAGIC    0xc3    /* Header of executable */

diff --git a/Kernel/cpu-r2k/image.mk b/Kernel/cpu-r2k/image.mk
index 8f61660..0faa8a3 100644 (file)
--- a/Kernel/cpu-r2k/image.mk
+++ b/Kernel/cpu-r2k/image.mk
@@ -1,7 +1,5 @@
 tools/analysemap: tools/analysemap.c
 
-tools/bihx: tools/bihx.c
-
 tools/binmunge: tools/binmunge.c
 
 tools/memhogs: tools/analysemap
@@ -12,11 +10,14 @@ tools/binman: tools/binman.c
 fuzix.ihx: target $(OBJS) platform-$(TARGET)/fuzix.lnk
        $(CROSS_LD) -n -k $(LIBZ80) -f platform-$(TARGET)/fuzix.lnk
 
-fuzix.bin: fuzix.ihx tools/bihx tools/analysemap tools/memhogs tools/binman tools/bintomdv tools/binmunge tools/bin2sna tools/bin2z80 cpm-loader/cpmload.bin tools/flat2z80
+fuzix.bin: fuzix.ihx tools/bihx tools/analysemap tools/memhogs tools/binman tools/binmunge
        -cp hogs.txt hogs.txt.old
        tools/memhogs <fuzix.map |sort -nr >hogs.txt
        head -5 hogs.txt
-       tools/bihx fuzix.ihx
-       tools/binprep
-       +$(MAKE) -C platform-$(TARGET) image
 
+       tools/analysemap <fuzix.map
+       makebin -s 65536 -p fuzix.ihx >fuzix.tmp
+       tools/binman fuzix.tmp fuzix.map fuzix.bin
+
+       +$(MAKE) -C platform-$(TARGET) image
+       tools/visualize < fuzix.map