X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=blobdiff_plain;f=src%2Fstm%2FMakefile.defs;h=9adcfeb3c2bb76fc3969986a6ce3bf33171c8640;hp=ede75f80e4745eef929d70923203d631a3a52628;hb=90386115204bd3bfa55deb5ebe1972bacdba725a;hpb=6a1e398e590121458176758858bb4210f3eb5a55

diff --git a/src/stm/Makefile.defs b/src/stm/Makefile.defs
index ede75f80..9adcfeb3 100644
--- a/src/stm/Makefile.defs
+++ b/src/stm/Makefile.defs
@@ -1,4 +1,4 @@
-vpath % ../stm:../product:../drivers:../core:../util:../kalman:../aes:..
+vpath % ../stm:../product:../drivers:../core:../util:../kalman:../aes:../math:..
 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,16 +22,15 @@ endif
 include $(TOPDIR)/Makedefs
 
 CC=$(ARM_CC)
-SAT=/opt/cortex
-SAT_CLIB=$(SAT)/lib/pdclib-cortex-m3.a
-SAT_CFLAGS=-I$(SAT)/include
+LIBS=$(PDCLIB_LIBS_M3) -lgcc
 
-AO_CFLAGS=-I. -I../stm -I../core -I../drivers -I..
-STM_CFLAGS=-std=gnu99 -mlittle-endian -mcpu=cortex-m3 -mthumb -ffreestanding -nostdlib $(AO_CFLAGS) $(SAT_CFLAGS)
+AO_CFLAGS=-I. -I../stm -I../core -I../drivers -I../math -I.. $(PDCLIB_INCLUDES)
+STM_CFLAGS=-std=gnu99 -mlittle-endian -mcpu=cortex-m3 -mthumb -ffreestanding -nostdlib $(AO_CFLAGS)
 
 LDFLAGS=-L../stm -Wl,-Taltos.ld
 
 NICKLE=nickle
+ELFTOHEX=$(TOPDIR)/../ao-tools/ao-elftohex/ao-elftohex
 
 V=0
 # The user has explicitly enabled quiet compilation.