projects
/
fw
/
altos
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
altos/stm: Update pdclib paths for flash-loader builds
[fw/altos]
/
src
/
stm
/
Makefile.defs
diff --git
a/src/stm/Makefile.defs
b/src/stm/Makefile.defs
index 8ef30521ee4645e63a60afc531ea5841d0abeaf8..9adcfeb3c2bb76fc3969986a6ce3bf33171c8640 100644
(file)
--- 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
vpath make-altitude ../util
vpath make-kalman ../util
vpath kalman.5c ../kalman
@@
-10,23
+10,27
@@
vpath ao-make-product.5c ../util
.SUFFIXES: .elf .ihx
.elf.ihx:
.SUFFIXES: .elf .ihx
.elf.ihx:
- objcopy -O ihex $*.elf $@
+ $(ELFTOHEX) --output=$@ $*.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 TOPDIR
+TOPDIR=..
+endif
ifndef VERSION
ifndef VERSION
-include
..
/Version
+include
$(TOPDIR)
/Version
endif
endif
+include $(TOPDIR)/Makedefs
+
+CC=$(ARM_CC)
+LIBS=$(PDCLIB_LIBS_M3) -lgcc
-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)
+AO_CFLAGS=-I. -I../stm -I../core -I../drivers -I..
/math -I.. $(PDCLIB_INCLUDES)
+STM_CFLAGS=-std=gnu99 -mlittle-endian -mcpu=cortex-m3 -mthumb -ffreestanding -nostdlib $(AO_CFLAGS)
LDFLAGS=-L../stm -Wl,-Taltos.ld
NICKLE=nickle
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.
V=0
# The user has explicitly enabled quiet compilation.