X-Git-Url: http://cloudbase.mooo.com/gitweb/z180-stamp.git/blobdiff_plain/8f23e84c6a08a384d25582f9cf79c4f5549bc852..d20e9438cec2ce6d495ff4168da6852cf58c6964:/avr/Tupfile

diff --git a/avr/Tupfile b/avr/Tupfile
index 91562b4..05e7e69 100644
--- a/avr/Tupfile
+++ b/avr/Tupfile
@@ -1,20 +1,46 @@
 include_rules
 
 PROG		= stamp-monitor
+
+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_echo.c cmd_date.c cmd_mem.c cmd_boot.c cmd_pin.c
-SRC		+= env.c xmalloc.c date.c con-utils.c print-utils.c getopt-min.c
-SRC		+= timer.c serial.c i2c.c pcf8583.c
-SRC		+= background.c z180-serv.c z80-if.c pin.c
+SRC		+= cmd_help.c 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
+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)
+
+#TODO: time lib
+SRC		+= ../time/asctime_r.c ../time/gmtime_r.c ../time/mk_gmtime.c
+SRC		+= ../time/print_lz.c ../time/isLeap.c
+SRC		+= ../time/time.c ../time/fatfs_time.c
+SRC		+= ../time/system_time.c ../time/set_system_time.c
 
-SRC_Z		= ../z180/hdrom.c
+ASRC	+= ../time/system_tick.S
+
+SRC_Z		= ../z180/hdrom.c ../z180/cfboot.c
 
 #TARGETS	= $(PROG).elf
 
-MCU_TARGET	= atmega1281
+ifdef MCU
+  MCU_TARGET = @(MCU)
+else
+  MCU_TARGET = atmega1281
+endif
+ifeq ($(MCU_TARGET),atmega1281)
+  DEFS		+= -DMCU_STRING=\"ATmega1281\"
+else
+  DEFS		+= -DMCU_STRING=\"ATmega2561\"
+endif
+
 F_CPU		= 18432000UL
-DEFS		= -DF_CPU=$(F_CPU)
+DEFS		+= -DF_CPU=$(F_CPU)
 
 INCLUDES += -I$(TOP)/include
 
@@ -22,7 +48,7 @@ INCLUDES += -I$(TOP)/include
 
 ###############################################################################
 
-TOOLCHAINDIR	= 
+TOOLCHAINDIR	=
 TOOLCHAIN	= avr
 
 CC	= $(TOOLCHAIN)-gcc
@@ -45,8 +71,8 @@ CFLAGS	= -g -Os
 CFLAGS	+= -mmcu=$(MCU_TARGET)
 CFLAGS	+= -std=gnu99
 CFLAGS	+= -Wall -Wextra
-CFLAGS	+= -Wredundant-decls 
-CFLAGS	+= -mrelax 
+CFLAGS	+= -Wredundant-decls
+CFLAGS	+= -mrelax
 CFLAGS	+= -fno-common
 CFLAGS	+= -ffunction-sections
 CFLAGS	+= -fdata-sections
@@ -57,30 +83,39 @@ CFLAGS	+= -fno-split-wide-types
 CFLAGS	+= -fshort-enums
 
 #CFLAGS	+=  -fdiagnostics-color=always
+#CFLAGS	+= -save-temps -fverbose-asm
 
-#CFLAGS	+= -save-temps
-
+CFLAGS_$(FATFS)	= -fno-strict-aliasing
 
 CFLAGS	+= $(INCLUDES)
 
 CPPFLAGS += $(DEFS)
 
+#ASFLAGS += -Wa,-adhlns=$(<:.S=.lst),-gstabs
+ASFLAGS += -mmcu=$(MCU_TARGET) -x assembler-with-cpp $(ASFLAGS)
+
 # Linker flags
 LDFLAGS	+= -Wl,--gc-sections
 LDFLAGS	+= -Wl,--cref
 
+# Assemble: create object files from assembler source files.
+#.S.o:
+#	$(CC) -c $(ALL_ASFLAGS) $< -o $@
 
-!cc = |> ^ CC %f^ $(CC) $(CFLAGS) $(CPPFLAGS) -c %f -o %o |> %B.o
+
+!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 |> 
+!SIZE = |> ^ SIZE^ $(SIZE) %f |>
 
-: foreach $(SRC) | ../z180/hdrom.h |> !cc |>  {objs}
-: $(SRC_Z) |> !cc -D'const=const __flash' |> {objs}
+: foreach $(ASRC) |> !as |>  {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
 : $(PROG).elf |> !OBJDUMP |> %B.lss
 : $(PROG).elf |> !SIZE |>
-