X-Git-Url: http://cloudbase.mooo.com/gitweb/z180-stamp.git/blobdiff_plain/70da9bec89594932d89d8a8a0815e127f3359365..e4344855b4d5d3edb4a07640a808ba2e0f06914f:/z180/Tupfile

diff --git a/z180/Tupfile b/z180/Tupfile
index c7e1085..50ede98 100644
--- a/z180/Tupfile
+++ b/z180/Tupfile
@@ -2,9 +2,12 @@ include_rules
 
 PROG	= hdrom
 
-SRC 	= r3init.180 
+SRC 	= init.180
 SRC	+= ddtz.180
-SRC	+= fifoio.180 msgbuf.180 ser1-i.180 console.180
+SRC	+= msgbuf-a.180 conbuf-a.180
+#SRC	+= bioscio.180 chario.180
+SRC	+= console.180
+SRC	+= asci-p.180
 SRC	+= romend.180
 
 
@@ -14,8 +17,6 @@ LN_PROG = 0
 LN_DATA = C000
 
 
-DEFS	= -DSTM32F1 -DBAUD=115200
-
 ###############################################################################
 # Executables
 
@@ -27,7 +28,7 @@ AS = $(CPMEMU) slr180.com
 
 ###############################################################################
 
-!AS-plain = |> $(AS) -%B/$(AS_OPT) |> %B.rel | %B.lst 
+!AS-plain = |> $(AS) -%B/$(AS_OPT) |> %B.rel | %B.lst
 
 !AS = |> ^ $(AS) -%B/$(AS_OPT)^ set +e; OUTPUT=\$(mktemp);\
 $(AS) -%B/$(AS_OPT) > ${OUTPUT};\
@@ -35,40 +36,19 @@ grep -q '^ 0 Error(s) Detected' ${OUTPUT}; ERROR=$?;\
 [ "${ERROR}" != "0" ] && cat ${OUTPUT};\
 [ "${ERROR}" != "0" ] && rm -f %B.rel;\
 rm -f ${OUTPUT}; exit ${ERROR} \
-|> %B.rel | %B.lst 
+|> %B.rel | %B.lst
 
-!LINK = |> ld80 -o %o -ms %O.map -P $(LN_PROG) -D $(LN_DATA) %f |> | %O.map
+#!LINK = |> ld80 -o %o -ms %O.map -P $(LN_PROG) -D $(LN_DATA) %f |> | %O.map
+!LINK = |> ld80 -o %o -ms %O.map -P $(LN_PROG) %f |> | %O.map
 
 #ifndef DEBUG
 
-: foreach $(SRC) |> !AS-plain |> {objs}
+: foreach $(SRC) |> !AS |> {objs}
 : {objs} |> !LINK |> $(PROG).hex
 : $(PROG).hex |> srec_cat -o %o -c_array %B -C_COMpressed -include %f -Intel |> $(PROG).c | $(PROG).h
 
 
-
-#$(AS) -%B/$(AS_OPT) > ${OUTPUT};\
-#$(AS) -%B/$(AS_OPT) ; echo "Kein Fehler"; exit 0 \
-
-#cat ${OUTPUT}; sleep 2 ;\
-#grep -q '^ 0 Error(s) Detected' ${OUTPUT}; ERROR=$? ; \
-#if [ "${ERROR}" != "0" ]; then cat ${OUTPUT}; rm -f %B.rel; fi ; \
-#exit 0 \
-
 #COMMAND="$(AS) -%B/$(AS_OPT)"; \
 
 
 #endif
-
-
-!cc = |> ^ CC %f^ $(CC) $(CFLAGS) $(CPPFLAGS) -c %f -o %o |> %B.o
-!LINK = |> ^ LINK %o^ $(LD) $(CFLAGS) $(LDFLAGS) -Wl,-Map=%O.map %f $(LDLIBS) -o %o |> | %O.map
-!OBJCOPY= |> ^ OBJCOPY %o^ $(OBJCOPY) -Oihex %f %o |>
-!OBJDUMP= |> ^ OBJDUMP %o^ $(OBJDUMP) -h -S %f > %o |> %O.lss
-
-#: foreach $(SRC) $(SRC_Z) |> !cc |>  {objs}
-#
-#: {objs} |> !LINK |> $(PROG).elf
-#: $(PROG).elf |> !OBJCOPY |> %B.hex
-#: $(PROG).elf |> !OBJDUMP |> %B.lss
-