Adaptions for fatfs R0.13b

[z180-stamp.git] / avr / Tupfile

diff --git a/avr/Tupfile b/avr/Tupfile
index 9fc073984f627f106b14835a9f7338d15e043d7b..05e7e69db6694c25eec355a668283b3c02ab4ac6 100644 (file)
--- a/avr/Tupfile
+++ b/avr/Tupfile
@@ -2,31 +2,45 @@ include_rules
 
 PROG           = stamp-monitor
 
-FATFS  = $(TOP)/fatfs/src/ff.c
+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_help.c cmd_date.c cmd_mem.c cmd_boot.c cmd_gpio.c cmd_misc.c
-SRC            += cmd_sd.c cmd_fat.c
-SRC            += env.c xmalloc.c con-utils.c print-utils.c getopt-min.c
-SRC            += timer.c serial.c i2c.c pcf8583.c mmc.c
+SRC            += cmd_help.c cmd_run.c cmd_boot.c cmd_misc.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 xmalloc.c con-utils.c print-utils.c
+SRC            += getopt-min.c eval_arg.c
+SRC            += timer.c serial.c i2c.c bcd.c pcf8583.c mmc.c
 SRC            += background.c z180-serv.c z80-if.c gpio.c
-SRC            += $(FATFS) $(TOP)/fatfs/src/option/unicode.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
+SRC_Z          = ../z180/hdrom.c ../z180/cfboot.c
 
 #TARGETS       = $(PROG).elf
 
-MCU_TARGET     = atmega1281
+ifdef MCU
+  MCU_TARGET = @(MCU)
+else
+  MCU_TARGET = atmega1281
+endif
+ifeq ($(MCU_TARGET),atmega1281)
+  DEFS         += -DMCU_STRING=\"ATmega1281\"
+else
+  DEFS         += -DMCU_STRING=\"ATmega2561\"
+endif
+
 F_CPU          = 18432000UL
-DEFS           = -DF_CPU=$(F_CPU)
+DEFS           += -DF_CPU=$(F_CPU)
 
 INCLUDES += -I$(TOP)/include
 
@@ -69,7 +83,7 @@ CFLAGS        += -fno-split-wide-types
 CFLAGS += -fshort-enums
 
 #CFLAGS        +=  -fdiagnostics-color=always
-#CFLAGS        += -save-temps
+#CFLAGS        += -save-temps -fverbose-asm
 
 CFLAGS_$(FATFS)        = -fno-strict-aliasing
 
@@ -91,14 +105,15 @@ LDFLAGS    += -Wl,--cref
 
 !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 |> !cc |>  {objs}
-: $(SRC_Z) |> !cc -D'const=const __flash' |> {objs}
+: foreach $(SRC) | ../z180/hdrom.h ../z180/cfboot.h |> !cc |>  {objs}
+: foreach $(SRC_Z) |> !cc -D'const=const __flash' |> {objs}
 
 : {objs} |> !LINK |> $(PROG).elf
 : $(PROG).elf |> !OBJCOPY |> %B.hex