altos: Rename easymini-v0.1 to easymini-v1.0

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

diff --git a/src/lpc/Makefile.defs b/src/lpc/Makefile.defs
index 9e87cee1c8e207ed5a2912d08dd9dcabaa85118f..2873d5e86ef60c2c6899e8e0c8803ed9be7f9b62 100644 (file)
--- a/src/lpc/Makefile.defs
+++ b/src/lpc/Makefile.defs
@@ -7,13 +7,11 @@ 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
+CC=arm-none-eabi-gcc

 SAT=/opt/cortex
 SAT_CLIB=$(SAT)/lib/pdclib-cortex-m0.a
 SAT_CFLAGS=-I$(SAT)/include
 
 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 VERSION
 include ../Version
 endif
 ifndef VERSION
 include ../Version
 endif


@@ -21,7 +19,7 @@ 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)
 
 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
+LDFLAGS=$(LPC_CFLAGS) -L../stm -Wl,-Taltos.ld

 
 NICKLE=nickle
 
 
 NICKLE=nickle
 


@@ -34,7 +32,7 @@ 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: ../lpc/baud_rate ao_pins.h
        nickle ../lpc/baud_rate `awk '/AO_LPC_CLKOUT/{print $$3}' ao_pins.h` > $@