X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=src%2Fstm%2FMakefile.defs;h=b1998f93661bd541455fc304d7eb9d327a2a6e13;hb=54f7888dc65ffc27c6ee5ef93953bd9b8fc029ed;hp=ee1cb6583afd886ac10464f5cdb9e1badea843d6;hpb=d8d3835fedf9b7c4d203f321e72c2b086ebb3b97;p=fw%2Faltos

diff --git a/src/stm/Makefile.defs b/src/stm/Makefile.defs
index ee1cb658..b1998f93 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=..
@@ -24,12 +24,13 @@ include $(TOPDIR)/Makedefs
 CC=$(ARM_CC)
 LIBS=-lpdclib-cortex-m3 -lgcc
 
-AO_CFLAGS=-I. -I../stm -I../core -I../drivers -I..
+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)
 
 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.