Merge remote-tracking branch 'mjb/altosdroid'

[fw/altos] / src / stm-bringup / Makefile

diff --git a/src/stm-bringup/Makefile b/src/stm-bringup/Makefile
index 1ba480ba9d401c19b9f2eace0fae53f311106122..5cc94bd969f64a3a147461bbe7489ef2416115a3 100644 (file)
--- a/src/stm-bringup/Makefile
+++ b/src/stm-bringup/Makefile
@@ -12,11 +12,11 @@ PDCLIB=/home/keithp/sat
 C_LIB=$(PDCLIB)/lib/pdclib.a
 C_INC=-I$(PDCLIB)/include
 
-DEF_CFLAGS=-g -std=gnu99 -Os -mlittle-endian -mthumb -ffreestanding -nostdlib -I../../src/stm $(C_INC)
+DEF_CFLAGS=-g -std=gnu99 -Os -mlittle-endian -mthumb -ffreestanding -nostdlib -I. -I../../src/stm $(C_INC)
 
 # to run from SRAM
 LD_FLAGS_RAM=-L../stm -Wl,-Taltos-ram.ld
-LD_FLAGS=-L../stm -Wl,-Taltos.ld
+LD_FLAGS=-L../stm -Wl,-Tbringup.ld
 
 CFLAGS=$(DEF_CFLAGS) -mcpu=cortex-m3 -DCONFIG_STM32L_DISCOVERY
 
@@ -28,7 +28,7 @@ all: bringup-ram.elf bringup.elf
 %.bin: %.elf
        $(OBJCOPY) -O binary $^ $@
 
-bringup.elf: $(OBJ) $(C_LIB) altos.ld
+bringup.elf: $(OBJ) $(C_LIB) bringup.ld
        $(CC) $(CFLAGS) $(LD_FLAGS) -o $@ $(OBJ) $(C_LIB) -lgcc
 
 bringup-ram.elf: $(OBJ) $(C_LIB) altos-ram.ld
@@ -40,3 +40,7 @@ clean:
        rm -rf *.bin
 
 .PHONY: all clean
+
+install:
+
+uninstall: