projects
/
fw
/
altos
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
altos: Use installed pdclib
[fw/altos]
/
src
/
stm
/
Makefile.defs
diff --git
a/src/stm/Makefile.defs
b/src/stm/Makefile.defs
index 3edfa41d5a512deca15f0b17d9ea8bafea3f10da..ee1cb6583afd886ac10464f5cdb9e1badea843d6 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
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
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
ifndef VERSION
-include
..
/Version
+include
$(TOPDIR)
/Version
endif
endif
+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..
-STM_CFLAGS=-std=gnu99 -mlittle-endian -mcpu=cortex-m3 -mthumb -ffreestanding -nostdlib $(AO_CFLAGS)
$(SAT_CFLAGS)
+STM_CFLAGS=-std=gnu99 -mlittle-endian -mcpu=cortex-m3 -mthumb -ffreestanding -nostdlib $(AO_CFLAGS)
LDFLAGS=-L../stm -Wl,-Taltos.ld
LDFLAGS=-L../stm -Wl,-Taltos.ld