Tup: F_CPU per config

[z180-stamp.git] / avr / Tupfile

diff --git a/avr/Tupfile b/avr/Tupfile
index c5a265d75701a884858c1ebb24c146bf67865044..2e9cae8884a424f36650aaf422834cfb4d5a0c9a 100644 (file)
--- a/avr/Tupfile
+++ b/avr/Tupfile
@@ -7,12 +7,11 @@ 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
-SRC            += getopt-min.c eval_arg.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)
 
@@ -24,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
 
@@ -39,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
 
@@ -97,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:
@@ -112,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