X-Git-Url: http://cloudbase.mooo.com/gitweb/z180-stamp.git/blobdiff_plain/04b3ea0e67e1f1fe8e9af71f6d532af5471da0e3..2d23b44169ebf0e91e2262bc33a6ed62e62ae137:/avr/Tupfile

diff --git a/avr/Tupfile b/avr/Tupfile
index 9bb0d11..e3ab922 100644
--- a/avr/Tupfile
+++ b/avr/Tupfile
@@ -6,10 +6,10 @@ FATFS	= $(TOP)/fatfs/src/ff.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_date.c cmd_mem.c cmd_gpio.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 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
 SRC		+= background.c z180-serv.c z80-if.c gpio.c
 SRC		+= $(FATFS) $(TOP)/fatfs/src/option/unicode.c
@@ -22,7 +22,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 +67,7 @@ endif
 
 CFLAGS	= -g -Os
 CFLAGS	+= -mmcu=$(MCU_TARGET)
-CFLAGS	+= -std=gnu99
+CFLAGS	+= -std=gnu11
 CFLAGS	+= -Wall -Wextra
 CFLAGS	+= -Wredundant-decls
 CFLAGS	+= -mrelax
@@ -81,7 +81,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
 
@@ -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:
@@ -103,14 +104,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