sys64738
/
blackmagic
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Cleaned up CFLAGS and LDFLAGS as well as targets to use the correct flags. Now blackmagic will compile also on a multilib compiler.

This commit is contained in:
Piotr Esden-Tempski 2011-02-16 20:24:26 -08:00
parent 8b65e8e259
commit c8d1b8d0cc
2 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/Makefile
View File

@ -32,7 +32,7 @@ include $(HOST)/Makefile.inc
OBJ = $(SRC:.c=.o)
blackmagic: $(OBJ)
$(CC) $(CFLAGS) -o $@ $^ $(LDFLAGS)
$(CC) -o $@ $^ $(LDFLAGS)
.PHONY: clean host_clean

11
src/stm32/Makefile.inc
View File

@ -2,10 +2,11 @@ CROSS_COMPILE ?= arm-cortexm3-eabi-
CC = $(CROSS_COMPILE)gcc
OBJCOPY = $(CROSS_COMPILE)objcopy
CFLAGS += -Istm32/include
CFLAGS += -Istm32/include -mcpu=cortex-m3 -mthumb -msoft-float
LDFLAGS_BOOT = -lopencm3_stm32 -Wl,--defsym,_stack=0x20005000 \
-Wl,-T,stm32/blackmagic.ld -nostartfiles -lc -lnosys -Wl,-Map=mapfile
LDFLAGS = $(LDFLAGS_BOOT) -Wl,-Ttext=0x8002000
-Wl,-T,stm32/blackmagic.ld -nostartfiles -lc -lnosys -Wl,-Map=mapfile \
-mthumb -march=armv7 -mfix-cortex-m3-ldrd -msoft-float
LDFLAGS = $(LDFLAGS_BOOT) -Wl,-Ttext=0x8002000 -mthumb -march=armv7 -mfix-cortex-m3-ldrd -msoft-float
SRC += cdcacm.c \
platform.c \
@ -15,8 +16,8 @@ all: blackmagic.bin blackmagic_dfu.bin
blackmagic.bin: blackmagic
$(OBJCOPY) -O binary $^ $@
blackmagic_dfu: usbdfu.c
$(CC) $(CFLAGS) $^ -o $@ $(LDFLAGS_BOOT)
blackmagic_dfu: usbdfu.o
$(CC) $^ -o $@ $(LDFLAGS_BOOT)
blackmagic_dfu.bin: blackmagic_dfu
$(OBJCOPY) -O binary $^ $@