X-Git-Url: http://cloudbase.mooo.com/gitweb/z180-stamp.git/blobdiff_plain/2ca8d8c70415549571f3e6759683dd33daf1bc42..5caa8c2b8906f17ca97aad2be3d746c3b5fef8f3:/avr/Tupfile

diff --git a/avr/Tupfile b/avr/Tupfile
index 9f95376..d650514 100644
--- a/avr/Tupfile
+++ b/avr/Tupfile
@@ -2,17 +2,19 @@ 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
 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		+= 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
@@ -22,7 +24,7 @@ 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
 
@@ -67,7 +69,7 @@ endif
 
 CFLAGS	= -g -Os
 CFLAGS	+= -mmcu=$(MCU_TARGET)
-CFLAGS	+= -std=gnu99
+CFLAGS	+= -std=gnu11
 CFLAGS	+= -Wall -Wextra
 CFLAGS	+= -Wredundant-decls
 CFLAGS	+= -mrelax
@@ -110,8 +112,8 @@ LDFLAGS	+= -Wl,--cref
 !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