Adaptions for fatfs R0.13b

[z180-stamp.git] / avr / Tupfile

diff --git a/avr/Tupfile b/avr/Tupfile
index 60022d64e0a4accb231f5b0362aa76f1ddf5be87..05e7e69db6694c25eec355a668283b3c02ab4ac6 100644 (file)
--- a/avr/Tupfile
+++ b/avr/Tupfile
@@ -1,20 +1,46 @@
 include_rules
 
-PROG           = stamp-test
+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_help.c cmd_echo.c cmd_mem.c cmd_boot.c
-SRC            += env.c xmalloc.c
-SRC            += timer.c con-utils.c serial.c
-SRC            += background.c z180-serv.c z80-if.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)
+
+#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
 
-SRC_Z          = ../z180/hdrom.c
+ASRC   += ../time/system_tick.S
+
+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) -DBAUD=115200UL
+DEFS           += -DF_CPU=$(F_CPU)
 
 INCLUDES += -I$(TOP)/include
 
@@ -22,7 +48,7 @@ INCLUDES += -I$(TOP)/include
 
 ###############################################################################
 
-TOOLCHAINDIR   = 
+TOOLCHAINDIR   =
 TOOLCHAIN      = avr
 
 CC     = $(TOOLCHAIN)-gcc
@@ -45,39 +71,51 @@ CFLAGS      = -g -Os
 CFLAGS += -mmcu=$(MCU_TARGET)
 CFLAGS += -std=gnu99
 CFLAGS += -Wall -Wextra
-CFLAGS += -Wredundant-decls 
-CFLAGS += -mrelax 
+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        += -save-temps
+#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
 
+# Assemble: create object files from assembler source files.
+#.S.o:
+#      $(CC) -c $(ALL_ASFLAGS) $< -o $@
 
-!cc = |> ^ CC %f^ $(CC) $(CFLAGS) $(CPPFLAGS) -c %f -o %o |> %B.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 |> 
+!SIZE = |> ^ SIZE^ $(SIZE) %f |>
 
-: foreach $(SRC) | ../z180/hdrom.h |> !cc |>  {objs}
-: $(SRC_Z) |> !cc -D'const=const __flash' |> {objs}
+: foreach $(ASRC) |> !as |>  {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
 : $(PROG).elf |> !OBJDUMP |> %B.lss
 : $(PROG).elf |> !SIZE |>
-