X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=blobdiff_plain;f=src%2Fstm%2FMakefile.defs;h=ede75f80e4745eef929d70923203d631a3a52628;hp=c799231a909e5e9093c85cc35fdad1e2366855c5;hb=488a527267decece48e6682e0e0c7fc29cbed329;hpb=87ca5c9c5f9cea1b9e14468e4694ce6acc21955a

diff --git a/src/stm/Makefile.defs b/src/stm/Makefile.defs
index c799231a..ede75f80 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,18 +7,30 @@ vpath load_csv.5c ../kalman
 vpath matrix.5c ../kalman
 vpath ao-make-product.5c ../util
 
-CC=arm-none-eabi-gcc
-SAT=$(HOME)/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
 
-AO_CFLAGS=-I. -I../stm -I../core -I..
+CC=$(ARM_CC)
+SAT=/opt/cortex
+SAT_CLIB=$(SAT)/lib/pdclib-cortex-m3.a
+SAT_CFLAGS=-I$(SAT)/include
+
+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)
 
+LDFLAGS=-L../stm -Wl,-Taltos.ld
+
 NICKLE=nickle
 
 V=0