altos/stm: New compiler doesn't correctly build flash bits yet

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

diff --git a/src/stm/Makefile.defs b/src/stm/Makefile.defs
index 76962a3efd55d98fd0cd7dd9fb474472b699e405..8ef30521ee4645e63a60afc531ea5841d0abeaf8 100644 (file)
--- 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,16 +7,21 @@ 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
+.SUFFIXES: .elf .ihx
+
+.elf.ihx:
+       objcopy -O ihex $*.elf $@
+
+SAT=/opt/cortex
+CC=$(SAT)/bin/arm-none-eabi-gcc
+SAT_CLIB=$(SAT)/lib/pdclib-cortex-m3.a
 SAT_CFLAGS=-I$(SAT)/include
 
 ifndef VERSION
 include ../Version
 endif
 
-AO_CFLAGS=-I. -I../stm -I../core -I..
+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