From: Leo C <erbl259-lmu@yahoo.de>
Date: Wed, 2 Jul 2014 22:04:41 +0000 (+0200)
Subject: Tupfile
X-Git-Tag: hexrel-1~9
X-Git-Url: http://cloudbase.mooo.com/gitweb/z180-stamp.git/commitdiff_plain/e7895944926367a5c98313f7a52aef1c65dde254

Tupfile
---

diff --git a/avr/Tupfile b/avr/Tupfile
index 54b976f..b43a822 100644
--- a/avr/Tupfile
+++ b/avr/Tupfile
@@ -11,6 +11,22 @@ DEFS		= -DF_CPU=$(F_CPU) -DBAUD=115200
 
 INCLUDES += ../z180
 
+###############################################################################
+
+TOOLCHAINDIR	= 
+TOOLCHAIN	= avr
+
+CC	= $(TOOLCHAIN)-gcc
+LD	= $(TOOLCHAIN)-gcc
+AR	= $(TOOLCHAIN)-ar
+AS	= $(TOOLCHAIN)-as
+OBJCOPY	= $(TOOLCHAIN)-objcopy
+OBJDUMP	= $(TOOLCHAIN)-objdump
+SIZE	= $(TOOLCHAIN)-size
+GDB	= $(TOOLCHAIN)-gdb
+
+###############################################################################
+
 ifdef DEBUG
 DEFS	+= -DDEBUG=2
 endif
@@ -30,10 +46,11 @@ LDFLAGS	+= -Wl,--gc-sections
 LDFLAGS	+= -Wl,--cref
 
 
-!cc = |> ^ CC %f^ avr-gcc $(CFLAGS) $(CPPFLAGS) -c %f -o %o |> %B.o
-!LINK = |> ^ LINK %o^ avr-gcc $(CFLAGS) $(LDFLAGS) -Wl,-Map=%O.map %f $(LDLIBS) -o %o |> | %O.map
-!OBJCOPY= |> ^ OBJCOPY %o^ avr-objcopy -Oihex %f %o |>
-!OBJDUMP= |> ^ OBJDUMP %o^ avr-objdump -h -S %f > %o |> %O.lss
+!cc = |> ^ CC %f^ $(CC) $(CFLAGS) $(CPPFLAGS) -c %f -o %o |> %B.o
+!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 $(SRC) | ../z180/hdrom.h |> !cc |>  {objs}
 : $(SRC_Z) |> !cc -D'const=const __flash' |> {objs}
@@ -41,5 +58,5 @@ LDFLAGS	+= -Wl,--cref
 : {objs} |> !LINK |> $(PROG).elf
 : $(PROG).elf |> !OBJCOPY |> %B.hex
 : $(PROG).elf |> !OBJDUMP |> %B.lss
-
+: $(PROG).elf |> !SIZE |>
 
diff --git a/avr/debug.h b/avr/debug.h
index 39ae55c..c341301 100644
--- a/avr/debug.h
+++ b/avr/debug.h
@@ -2,8 +2,11 @@
 #ifndef DEBUG_H_
 #define DEBUG_H_
 
+#include <avr/pgmspace.h>
+
 #ifdef DEBUG
-#define DBG_P(lvl, ...) if (DEBUG>=lvl) fprintf_P( stderr,  __VA_ARGS__ )
+#define DBG_P(lvl, format, ...) if (DEBUG>=lvl) \
+				fprintf_P( stderr, PSTR(format), ##__VA_ARGS__ )
 #else
 #define DBG_P(lvl, ...)
 #endif
diff --git a/stm32/Tupfile b/stm32/Tupfile
index e942bff..1778623 100644
--- a/stm32/Tupfile
+++ b/stm32/Tupfile
@@ -24,6 +24,7 @@ AR	= $(TOOLCHAIN)-ar
 AS	= $(TOOLCHAIN)-as
 OBJCOPY	= $(TOOLCHAIN)-objcopy
 OBJDUMP	= $(TOOLCHAIN)-objdump
+SIZE	= $(TOOLCHAIN)-size
 GDB	= $(TOOLCHAIN)-gdb
 
 ###############################################################################
@@ -62,10 +63,12 @@ LDLIBS		+= -Wl,--start-group -lc -lgcc -lnosys -Wl,--end-group
 !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 $(SRC) $(SRC_Z) | ../z180/hdrom.h |> !cc |>  {objs}
 
 : {objs} |> !LINK |> $(PROG).elf
 : $(PROG).elf |> !OBJCOPY |> %B.hex
 : $(PROG).elf |> !OBJDUMP |> %B.lss
+: $(PROG).elf |> !SIZE |>