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

diff --git a/avr/Tupfile b/avr/Tupfile
index b74b305..2e9cae8 100644
--- a/avr/Tupfile
+++ b/avr/Tupfile
@@ -7,7 +7,7 @@ FATFS	= $(FATFSD)/ff.c $(FATFSD)/ffunicode.c
 
 SRC		= main.c
 SRC		+= cli.c cli_readline.c command.c command_tbl.c
-SRC		+= 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 con-utils.c print-utils.c getopt-min.c eval_arg.c
@@ -23,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
 
@@ -38,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
 
@@ -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