projects
/
fw
/
altos
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' of ssh://git.gag.com/scm/git/fw/altos
[fw/altos]
/
src
/
stm-bringup
/
Makefile
diff --git
a/src/stm-bringup/Makefile
b/src/stm-bringup/Makefile
index 01c8061432b6f4d7caf4c8b0d5ec7295922f12f4..b0943e5665fb34f94ee1872755df8d0f040e83a9 100644
(file)
--- a/
src/stm-bringup/Makefile
+++ b/
src/stm-bringup/Makefile
@@
-1,22
+1,22
@@
-vpath % ..:../
core
:../product:../drivers:../stm
+vpath % ..:../
kernel
:../product:../drivers:../stm
vpath ao-make-product.5c ../util
ifndef VERSION
include ../Version
endif
vpath ao-make-product.5c ../util
ifndef VERSION
include ../Version
endif
+TOPDIR=..
+include $(TOPDIR)/Makedefs
CC=arm-none-eabi-gcc
OBJCOPY=arm-none-eabi-objcopy
CC=arm-none-eabi-gcc
OBJCOPY=arm-none-eabi-objcopy
-PDCLIB=/home/keithp/sat
-C_LIB=$(PDCLIB)/lib/pdclib.a
-C_INC=-I$(PDCLIB)/include
+C_LIB=$(PDCLIB_LIBS_M3)
-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../stm $(PDCLIB_INCLUDES
)
# to run from SRAM
LD_FLAGS_RAM=-L../stm -Wl,-Taltos-ram.ld
# to run from SRAM
LD_FLAGS_RAM=-L../stm -Wl,-Taltos-ram.ld
-LD_FLAGS=-L../stm -Wl,-T
altos
.ld
+LD_FLAGS=-L../stm -Wl,-T
bringup
.ld
CFLAGS=$(DEF_CFLAGS) -mcpu=cortex-m3 -DCONFIG_STM32L_DISCOVERY
CFLAGS=$(DEF_CFLAGS) -mcpu=cortex-m3 -DCONFIG_STM32L_DISCOVERY
@@
-28,10
+28,10
@@
all: bringup-ram.elf bringup.elf
%.bin: %.elf
$(OBJCOPY) -O binary $^ $@
%.bin: %.elf
$(OBJCOPY) -O binary $^ $@
-bringup.elf: $(OBJ)
$(C_LIB) altos
.ld
+bringup.elf: $(OBJ)
bringup
.ld
$(CC) $(CFLAGS) $(LD_FLAGS) -o $@ $(OBJ) $(C_LIB) -lgcc
$(CC) $(CFLAGS) $(LD_FLAGS) -o $@ $(OBJ) $(C_LIB) -lgcc
-bringup-ram.elf: $(OBJ)
$(C_LIB)
altos-ram.ld
+bringup-ram.elf: $(OBJ) altos-ram.ld
$(CC) $(CFLAGS) $(LD_FLAGS_RAM) -o $@ $(OBJ) $(C_LIB) -lgcc
clean:
$(CC) $(CFLAGS) $(LD_FLAGS_RAM) -o $@ $(OBJ) $(C_LIB) -lgcc
clean: