command printenv: new option -s: Print env variables in setenv commands.

[z180-stamp.git] / z180 / Tupfile

diff --git a/z180/Tupfile b/z180/Tupfile
index c7e10855ceecd86508837934590a05b48677f666..c7d79fbea81cfee4c8aef548fc4ebffd1d9fe6ca 100644 (file)
--- a/z180/Tupfile
+++ b/z180/Tupfile
@@ -1,10 +1,14 @@
 include_rules
 
 PROG   = hdrom
+CFBOOT = cfboot
 
-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 +18,6 @@ LN_PROG = 0
 LN_DATA = C000
 
 
-DEFS   = -DSTM32F1 -DBAUD=115200
-
 ###############################################################################
 # Executables
 
@@ -27,7 +29,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 +37,22 @@ 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 \
+: $(CFBOOT).180 |> $(AS) -%B/HFS |> %B.hex | %B.lst
+: $(CFBOOT).hex |> srec_cat -o %o -c_array %B -C_COMpressed -include %f -Intel |> $(CFBOOT).c | $(CFBOOT).h
 
 #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
-