diff options
| author | Bdale Garbee <bdale@gag.com> | 2013-12-18 11:56:41 -0700 |
|---|---|---|
| committer | Bdale Garbee <bdale@gag.com> | 2013-12-18 11:56:41 -0700 |
| commit | bd316035924bfc5720ff56e0c3bd94f99ca00435 (patch) | |
| tree | 26c220c720dd600916c91303e195f8fde21f5ea5 | |
| parent | 382f1b123991afd7b187532261c05580eedaaa82 (diff) | |
| parent | 8f529633cd4be8a0edb1b067bbf5d7cc055dcc1b (diff) | |
Merge branch 'with-pdclib' of ssh://git.gag.com/scm/git/fw/altos into with-pdclibwith-pdclib
| -rw-r--r-- | src/Makefile | 1 | ||||
| -rw-r--r-- | src/stm-bringup/Makefile | 6 |
2 files changed, 4 insertions, 3 deletions
diff --git a/src/Makefile b/src/Makefile index 2488cbab..0ca101c0 100644 --- a/src/Makefile +++ b/src/Makefile @@ -30,7 +30,6 @@ ARMM3DIRS=\ telemetrum-v2.0 telemetrum-v2.0/flash-loader \ megadongle-v0.1 megadongle-v0.1/flash-loader \ telegps-v0.3 telegps-v0.3/flash-loader \ - stm-bringup stm-demo \ telelco-v0.2 telelco-v0.2/flash-loader \ telescience-v0.2 telescience-v0.2/flash-loader diff --git a/src/stm-bringup/Makefile b/src/stm-bringup/Makefile index 33ecd710..797df2d6 100644 --- a/src/stm-bringup/Makefile +++ b/src/stm-bringup/Makefile @@ -4,13 +4,15 @@ 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 -C_LIB=-lpdclib-cortex-m3 +C_LIB=$(PDCLIB_LIBS_M3) -DEF_CFLAGS=-g -std=gnu99 -Os -mlittle-endian -mthumb -ffreestanding -nostdlib -I. -I../stm +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 |