projects
/
fw
/
altos
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
altos: Messed up the ifeq syntax a bit so ARM bits weren't getting built
[fw/altos]
/
src
/
lpc
/
Makefile.defs
diff --git
a/src/lpc/Makefile.defs
b/src/lpc/Makefile.defs
index 9e87cee1c8e207ed5a2912d08dd9dcabaa85118f..d541230ac354c41dc520c34693baa8a5f7714e10 100644
(file)
--- a/
src/lpc/Makefile.defs
+++ b/
src/lpc/Makefile.defs
@@
-7,21
+7,24
@@
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=/usr/bin/arm-none-eabi-gcc
-SAT=/opt/cortex
-SAT_CLIB=$(SAT)/lib/pdclib-cortex-m0.a
-SAT_CFLAGS=-I$(SAT)/include
-
-#CC=/opt/arm-gcc-bits/bin/arm-none-eabi-gcc
+ifndef TOPDIR
+TOPDIR=..
+endif
ifndef VERSION
ifndef VERSION
-include
..
/Version
+include
$(TOPDIR)
/Version
endif
endif
+include $(TOPDIR)/Makedefs
+
+CC=$(ARM_CC)
+SAT=/opt/cortex
+SAT_CLIB=$(SAT)/lib/pdclib-cortex-m0.a
+SAT_CFLAGS=-I$(SAT)/include
-AO_CFLAGS=-I. -I
../lpc -I../core -I../drivers -I..
+AO_CFLAGS=-I. -I
$(TOPDIR)/lpc -I$(TOPDIR)/core -I$(TOPDIR)/drivers -I$(TOPDIR)
LPC_CFLAGS=-std=gnu99 -mlittle-endian -mcpu=cortex-m0 -mthumb -ffreestanding -nostdlib $(AO_CFLAGS) $(SAT_CFLAGS)
LPC_CFLAGS=-std=gnu99 -mlittle-endian -mcpu=cortex-m0 -mthumb -ffreestanding -nostdlib $(AO_CFLAGS) $(SAT_CFLAGS)
-LDFLAGS=
-L..
/stm -Wl,-Taltos.ld
+LDFLAGS=
$(LPC_CFLAGS) -L$(TOPDIR)
/stm -Wl,-Taltos.ld
NICKLE=nickle
NICKLE=nickle
@@
-34,10
+37,10
@@
endif
quiet ?= $($1)
.c.o:
quiet ?= $($1)
.c.o:
- $(call quiet,CC) -c $(CFLAGS)
-o $@
$<
+ $(call quiet,CC) -c $(CFLAGS) $<
-ao_serial_lpc.h:
..
/lpc/baud_rate ao_pins.h
- nickle
..
/lpc/baud_rate `awk '/AO_LPC_CLKOUT/{print $$3}' ao_pins.h` > $@
+ao_serial_lpc.h:
$(TOPDIR)
/lpc/baud_rate ao_pins.h
+ nickle
$(TOPDIR)
/lpc/baud_rate `awk '/AO_LPC_CLKOUT/{print $$3}' ao_pins.h` > $@
ao_serial_lpc.o: ao_serial_lpc.h
ao_serial_lpc.o: ao_serial_lpc.h