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

diff --git a/src/stm/Makefile.defs b/src/stm/Makefile.defs
index 76962a3e..ee1cb658 100644
--- a/src/stm/Makefile.defs
+++ b/src/stm/Makefile.defs
@@ -1,4 +1,4 @@
-vpath % ../stm:../product:../drivers:../core:../util:../kalman:..
+vpath % ../stm:../product:../drivers:../core:../util:../kalman:../aes:..
 vpath make-altitude ../util
 vpath make-kalman ../util
 vpath kalman.5c ../kalman
@@ -7,17 +7,25 @@ vpath load_csv.5c ../kalman
 vpath matrix.5c ../kalman
 vpath ao-make-product.5c ../util
 
-CC=arm-none-eabi-gcc
-SAT=/home/keithp/sat
-SAT_CLIB=$(SAT)/lib/pdclib.a
-SAT_CFLAGS=-I$(SAT)/include
+.SUFFIXES: .elf .ihx
+
+.elf.ihx:
+	objcopy -O ihex $*.elf $@
+
+ifndef TOPDIR
+TOPDIR=..
+endif
 
 ifndef VERSION
-include ../Version
+include $(TOPDIR)/Version
 endif
+include $(TOPDIR)/Makedefs
+
+CC=$(ARM_CC)
+LIBS=-lpdclib-cortex-m3 -lgcc
 
-AO_CFLAGS=-I. -I../stm -I../core -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..
+STM_CFLAGS=-std=gnu99 -mlittle-endian -mcpu=cortex-m3 -mthumb -ffreestanding -nostdlib $(AO_CFLAGS)
 
 LDFLAGS=-L../stm -Wl,-Taltos.ld