From 76f079e76b11f63d0b48317dd3450ddbfab784d9 Mon Sep 17 00:00:00 2001 From: Leo C Date: Thu, 30 May 2019 20:52:13 +0200 Subject: [PATCH] Remove Tup --- Tupfile.ini | 0 Tuprules.tup | 3 - avr/Tupfile | 120 ------------------------------------- configs/default.config | 0 configs/gcc.tup | 40 ------------- configs/m1281-debug.config | 4 -- configs/m2561-debug.config | 4 -- z180/Tupfile | 62 ------------------- 8 files changed, 233 deletions(-) delete mode 100644 Tupfile.ini delete mode 100644 Tuprules.tup delete mode 100644 avr/Tupfile delete mode 100644 configs/default.config delete mode 100644 configs/gcc.tup delete mode 100644 configs/m1281-debug.config delete mode 100644 configs/m2561-debug.config delete mode 100644 z180/Tupfile diff --git a/Tupfile.ini b/Tupfile.ini deleted file mode 100644 index e69de29..0000000 diff --git a/Tuprules.tup b/Tuprules.tup deleted file mode 100644 index 185c6bf..0000000 --- a/Tuprules.tup +++ /dev/null @@ -1,3 +0,0 @@ -.gitignore -TOP = $(TUP_CWD) - diff --git a/avr/Tupfile b/avr/Tupfile deleted file mode 100644 index 2e9cae8..0000000 --- a/avr/Tupfile +++ /dev/null @@ -1,120 +0,0 @@ -include_rules - -PROG = stamp-monitor - -FATFSD = $(TOP)/fatfs/source -FATFS = $(FATFSD)/ff.c $(FATFSD)/ffunicode.c - -SRC = main.c -SRC += cli.c cli_readline.c command.c command_tbl.c -SRC += cmd_run.c cmd_boot.c cmd_misc.c cmd_cpu.c -SRC += cmd_date.c cmd_mem.c cmd_gpio.c cmd_attach.c -SRC += cmd_loadihex.c cmd_loadcpm3.c cmd_sd.c cmd_fat.c -SRC += env.c con-utils.c print-utils.c getopt-min.c eval_arg.c -SRC += timer.c serial.c i2c.c bcd.c pcf8583.c mmc.c strerror.c -SRC += background.c z180-serv.c z80-if.c gpio.c -SRC += $(FATFS) - -#TODO: time lib -SRC += ../time/asctime_r.c ../time/gmtime_r.c ../time/mk_gmtime.c -SRC += ../time/print_lz.c ../time/isLeap.c -SRC += ../time/time.c ../time/fatfs_time.c -SRC += ../time/system_time.c ../time/set_system_time.c - -ASRC += ../time/system_tick.S - -SRC_Z = ../z180/hdrom.c ../z180/cfboot.c ../z180/cpuinfo.c - -#TARGETS = $(PROG).elf - -ifdef MCU - MCU_TARGET = @(MCU) -else - MCU_TARGET = atmega1281 -endif -ifeq ($(MCU_TARGET),atmega1281) - DEFS += -DMCU_STRING=\"ATmega1281\" -else - DEFS += -DMCU_STRING=\"ATmega2561\" -endif - -DEFS += -DF_CPU=@(F_CPU) - -INCLUDES += -I$(TOP)/include - -#INCLUDES += -I../z180 - -############################################################################### - -TOOLCHAINDIR = -TOOLCHAIN = avr - -CC = $(TOOLCHAIN)-gcc -LD = $(TOOLCHAIN)-gcc -AR = $(TOOLCHAIN)-ar -AS = $(TOOLCHAIN)-as -OBJCOPY = $(TOOLCHAIN)-objcopy -OBJDUMP = $(TOOLCHAIN)-objdump -SIZE = $(TOOLCHAIN)-size -GDB = $(TOOLCHAIN)-gdb - -############################################################################### - -ifdef DEBUG -SRC += debug.c -DEFS += -DDEBUG=2 -endif - -CFLAGS = -g -Os -CFLAGS += -mmcu=$(MCU_TARGET) -CFLAGS += -std=gnu11 -CFLAGS += -Wall -Wextra -CFLAGS += -Wredundant-decls -CFLAGS += -mrelax -CFLAGS += -fno-common -CFLAGS += -ffunction-sections -CFLAGS += -fdata-sections -CFLAGS += -fno-tree-loop-optimize -CFLAGS += -fno-move-loop-invariants -CFLAGS += -fno-split-wide-types -#CFLAGS += -flto -CFLAGS += -fshort-enums - -#CFLAGS += -fdiagnostics-color=always -#CFLAGS += -save-temps -fverbose-asm - -CFLAGS_$(FATFS) = -fno-strict-aliasing - -CFLAGS += $(INCLUDES) - -CPPFLAGS += $(DEFS) - -#ASFLAGS += -Wa,-adhlns=$(<:.S=.lst),-gstabs -ASFLAGS += -mmcu=$(MCU_TARGET) -x assembler-with-cpp $(ASFLAGS) - -# Linker flags -LDFLAGS += -Wl,--gc-sections -LDFLAGS += -Wl,--cref -#LDFLAGS += -flto -Os - -# Assemble: create object files from assembler source files. -#.S.o: -# $(CC) -c $(ALL_ASFLAGS) $< -o $@ - - -!as = |> ^ AS %f^ $(CC) $(ASFLAGS) -c %f -o %o |> %B.o -!cc = |> ^ CC %f^ $(CC) $(CFLAGS) $(CPPFLAGS) $(CFLAGS_%f) -c %f -o %o |> %B.o -#!cc = |> ^ CC %f^ $(CC) $(CFLAGS) $(CPPFLAGS) $(CFLAGS_%f) -c %f -o %o |> %B.o | %B.s %B.i -!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 -!SIZE = |> ^ SIZE^ $(SIZE) %f |> - -: foreach $(ASRC) |> !as |> {objs} -: foreach $(SRC) | ../z180/hdrom.h ../z180/cfboot.h ../z180/cpuinfo.h |> !cc |> {objs} -: foreach $(SRC_Z) |> !cc -D'const=const __flash' |> {objs} - -: {objs} |> !LINK |> $(PROG).elf -: $(PROG).elf |> !OBJCOPY |> %B.hex -: $(PROG).elf |> !OBJDUMP |> %B.lss -: $(PROG).elf |> !SIZE |> diff --git a/configs/default.config b/configs/default.config deleted file mode 100644 index e69de29..0000000 diff --git a/configs/gcc.tup b/configs/gcc.tup deleted file mode 100644 index ad2d788..0000000 --- a/configs/gcc.tup +++ /dev/null @@ -1,40 +0,0 @@ -CC = $(TOOLCHAIN)-gcc -LD = $(TOOLCHAIN)-gcc -AR = $(TOOLCHAIN)-ar -AS = $(TOOLCHAIN)-as -OBJCOPY = $(TOOLCHAIN)-objcopy -OBJDUMP = $(TOOLCHAIN)-objdump -SIZE = $(TOOLCHAIN)-size -GDB = $(TOOLCHAIN)-gdb - - -CFLAGS += -g -Os -CFLAGS += -std=gnu99 -CFLAGS += -Wall -Wextra -CFLAGS += -Wredundant-decls -#CFLAGS += -fno-common -ffunction-sections -fdata-sections - - -LDFLAGS += -Wl,--gc-sections -LDFLAGS += -Wl,--cref - -ifneq ($(LDSCRIPT),) -LDFLAGS += -T$(LDSCRIPT) -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 -!SIZE = |> ^ SIZE %f^ $(SIZE) %f |> - - -: foreach $(SRC) | $(PREDEP) |> !cc |> {objs} -: $(SRC_Z) |> !cc $(CPPFLAGS_Z) |> {objs} - -: {objs} |> !LINK |> $(PROG).elf {elf} -: {elf} |> !OBJCOPY |> %B.hex {aux} -: {elf} |> !OBJDUMP |> %B.lss {aux} -: {elf} | {aux} |> !SIZE |> - diff --git a/configs/m1281-debug.config b/configs/m1281-debug.config deleted file mode 100644 index fd0bdf3..0000000 --- a/configs/m1281-debug.config +++ /dev/null @@ -1,4 +0,0 @@ -CONFIG_DEBUG=0 -CONFIG_MCU=atmega1281 -CONFIG_F_CPU=18432000UL - diff --git a/configs/m2561-debug.config b/configs/m2561-debug.config deleted file mode 100644 index 8a48e19..0000000 --- a/configs/m2561-debug.config +++ /dev/null @@ -1,4 +0,0 @@ -CONFIG_DEBUG=0 -CONFIG_MCU=atmega2561 -CONFIG_F_CPU=9216000UL - diff --git a/z180/Tupfile b/z180/Tupfile deleted file mode 100644 index 0c3f95e..0000000 --- a/z180/Tupfile +++ /dev/null @@ -1,62 +0,0 @@ -include_rules - -PROG = hdrom -CFBOOT = cfboot -CPUINFO = cpuinfo - -SRC = init.180 -SRC += ddtz.180 -SRC += msgbuf-a.180 conbuf-a.180 -#SRC += bioscio.180 chario.180 -SRC += console.180 -SRC += asci-p.180 -SRC += romend.180 - - -AS_OPT = MFS - -LN_PROG = 0 -LN_DATA = C000 - - -############################################################################### -# Executables - -CPMEMU = zxcc - -#AS = $(CPMEMU) ccpline.com -AS = $(CPMEMU) slr180.com - - -############################################################################### - -!AS-plain = |> $(AS) -%B/$(AS_OPT) |> %B.rel | %B.lst - -!AS = |> ^ $(AS) -%B/$(AS_OPT)^ set +e; OUTPUT=\$(mktemp);\ -$(AS) -%B/$(AS_OPT) > ${OUTPUT};\ -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 - -#!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 |> {objs} -: {objs} |> !LINK |> $(PROG).hex -: $(PROG).hex |> srec_cat -o %o -c_array %B -C_COMpressed -include %f -Intel |> $(PROG).c | $(PROG).h - - -: $(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 - -: $(CPUINFO).180 |> $(AS) -%B/HFS |> %B.hex | %B.lst -: $(CPUINFO).hex |> srec_cat -o %o -c_array %B -C_COMpressed -include %f -Intel |> $(CPUINFO).c | $(CPUINFO).h - -#COMMAND="$(AS) -%B/$(AS_OPT)"; \ - - -#endif -- 2.39.2