altos/lpc,altos/stmf0: Use -n flag to work around link editor issue

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

diff --git a/src/lpc/Makefile.defs b/src/lpc/Makefile.defs
index b63bdd1205ba37bc6bf166b011c7267a8e0eb041..5bb8133d5579cb82955356b0bb77557ba31c1e72 100644 (file)
--- a/src/lpc/Makefile.defs
+++ b/src/lpc/Makefile.defs
@@ -1,41 +1,14 @@
-vpath % ../lpc:../product:../drivers:../core:../util:../kalman:../aes:..
-vpath make-altitude ../util
-vpath make-kalman ../util
-vpath kalman.5c ../kalman
-vpath kalman_filter.5c ../kalman
-vpath load_csv.5c ../kalman
-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
-
-ifndef VERSION
-include ../Version
+ifndef TOPDIR
+TOPDIR=..
 endif
 
-AO_CFLAGS=-I. -I../lpc -I../core -I../drivers -I..
-LPC_CFLAGS=-std=gnu99 -mlittle-endian -mcpu=cortex-m0 -mthumb -ffreestanding -nostdlib $(AO_CFLAGS) $(SAT_CFLAGS)
-
-LDFLAGS=-L../stm -Wl,-Taltos.ld
-
-NICKLE=nickle
-
-V=0
-# The user has explicitly enabled quiet compilation.
-ifeq ($(V),0)
-quiet = @printf "  $1 $2 $@\n"; $($1)
-endif
-# Otherwise, print the full command line.
-quiet ?= $($1)
+include $(TOPDIR)/lpc/Makefile-lpc.defs
+include $(TOPDIR)/Makedefs
 
-.c.o:
-       $(call quiet,CC) -c $(CFLAGS) -o $@ $<
+LDFLAGS=$(CFLAGS) -L$(TOPDIR)/lpc -Wl,-Taltos.ld -n
 
-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