X-Git-Url: http://cloudbase.mooo.com/gitweb/z180-stamp.git/blobdiff_plain/a2907f2e2b2725679d6b3b8d3231f3d94c325014..df728b3578bfba42632b2a3bd7250fba70776b22:/avr/Tupfile

diff --git a/avr/Tupfile b/avr/Tupfile
index 0eb910a..2e9cae8 100644
--- a/avr/Tupfile
+++ b/avr/Tupfile
@@ -2,17 +2,18 @@ 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_run.c cmd_boot.c cmd_misc.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 xmalloc.c con-utils.c print-utils.c getopt-min.c
-SRC		+= timer.c serial.c i2c.c bcd.c pcf8583.c mmc.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) $(TOP)/fatfs/src/option/unicode.c
+SRC		+= $(FATFS)
 
 #TODO: time lib
 SRC		+= ../time/asctime_r.c ../time/gmtime_r.c ../time/mk_gmtime.c
@@ -22,7 +23,7 @@ SRC		+= ../time/system_time.c ../time/set_system_time.c
 
 ASRC	+= ../time/system_tick.S
 
-SRC_Z		= ../z180/hdrom.c ../z180/cfboot.c
+SRC_Z		= ../z180/hdrom.c ../z180/cfboot.c ../z180/cpuinfo.c
 
 #TARGETS	= $(PROG).elf
 
@@ -37,8 +38,7 @@ else
   DEFS		+= -DMCU_STRING=\"ATmega2561\"
 endif
 
-F_CPU		= 18432000UL
-DEFS		+= -DF_CPU=$(F_CPU)
+DEFS		+= -DF_CPU=@(F_CPU)
 
 INCLUDES += -I$(TOP)/include
 
@@ -67,7 +67,7 @@ endif
 
 CFLAGS	= -g -Os
 CFLAGS	+= -mmcu=$(MCU_TARGET)
-CFLAGS	+= -std=gnu99
+CFLAGS	+= -std=gnu11
 CFLAGS	+= -Wall -Wextra
 CFLAGS	+= -Wredundant-decls
 CFLAGS	+= -mrelax
@@ -95,6 +95,7 @@ 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:
@@ -110,7 +111,7 @@ LDFLAGS	+= -Wl,--cref
 !SIZE = |> ^ SIZE^ $(SIZE) %f |>
 
 : foreach $(ASRC) |> !as |>  {objs}
-: foreach $(SRC) | ../z180/hdrom.h ../z180/cfboot.h |> !cc |>  {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