Merge branch 'master' of ssh://git.gag.com/scm/git/fw/altos

[fw/altos] / src / stm / Makefile.defs

diff --git a/src/stm/Makefile.defs b/src/stm/Makefile.defs
index 0710d74774ec4e18c4e8fba3df9db52ba342a14e..8173b349c33446f6ba14e7bc644e400746c7c001 100644 (file)
--- a/src/stm/Makefile.defs
+++ b/src/stm/Makefile.defs
@@ -1,4 +1,4 @@
-vpath % ../stm:../product:../drivers:../core:../util:../kalman:../aes:../math:..
+vpath % ../stm:../product:../drivers:../kernel:../util:../kalman:../aes:../math:../draw:../scheme:..
 vpath make-altitude ../util
 vpath make-kalman ../util
 vpath kalman.5c ../kalman
@@ -10,7 +10,7 @@ vpath ao-make-product.5c ../util
 .SUFFIXES: .elf .ihx
 
 .elf.ihx:
-       objcopy -O ihex $*.elf $@
+       $(ELFTOHEX) --output=$@ $*.elf
 
 ifndef TOPDIR
 TOPDIR=..
@@ -22,14 +22,21 @@ endif
 include $(TOPDIR)/Makedefs
 
 CC=$(ARM_CC)
-LIBS=-lpdclib-cortex-m3 -lgcc
+LIBS=-L$(NEWLIB_NANO)/arm-none-eabi/lib/thumb/v7-m -lm -lc -lgcc
 
-AO_CFLAGS=-I. -I../stm -I../core -I../drivers -I../math -I..
-STM_CFLAGS=-std=gnu99 -mlittle-endian -mcpu=cortex-m3 -mthumb -ffreestanding -nostdlib $(AO_CFLAGS)
+WARN_FLAGS=-Wall -Wextra -Werror
 
-LDFLAGS=-L../stm -Wl,-Taltos.ld
+AO_CFLAGS=-I. -I../stm -I../kernel -I../drivers -I../math -I../draw \
+       -DNEWLIB_INTEGER_PRINTF_SCANF \
+       -I../lisp -I.. -isystem $(NEWLIB_NANO)/arm-none-eabi/include
+
+STM_CFLAGS=-std=gnu99 -mlittle-endian -mcpu=cortex-m3 -mthumb -Wcast-align \
+       -ffreestanding -nostdlib $(AO_CFLAGS) $(WARN_FLAGS)
+
+LDFLAGS=-L../stm -Wl,-Taltos.ld -nostartfiles -Wl,-Map=$(PROGNAME).map
 
 NICKLE=nickle
+ELFTOHEX=$(TOPDIR)/../ao-tools/ao-elftohex/ao-elftohex
 
 V=0
 # The user has explicitly enabled quiet compilation.