jackcartersmith/blackmagic
1
0
Fork 0
Code Issues Pull Requests Releases Activity

Some more LD paths fixes.

Browse Source
This commit is contained in:
Uwe Hermann 2010-12-30 14:12:32 +01:00
parent d37a786c63
commit 8c946de4d4
3 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Makefile
View File

@ -49,13 +49,13 @@ examples: lib
install: build install: build
@printf " INSTALL headers\n" @printf " INSTALL headers\n"
$(Q)$(INSTALL) -d $(INCDIR)/libopencm3/ $(Q)$(INSTALL) -d $(INCDIR)/libopencm3
$(Q)$(INSTALL) -d $(LIBDIR) $(Q)$(INSTALL) -d $(LIBDIR)/libopencm3
$(Q)cp -r include/* $(INCDIR)/libopencm3 $(Q)cp -r include/* $(INCDIR)/libopencm3
@printf " INSTALL libs\n" @printf " INSTALL libs\n"
$(Q)$(INSTALL) -m 0644 lib/*/*.a $(LIBDIR) $(Q)$(INSTALL) -m 0644 lib/*/*.a $(LIBDIR)/libopencm3
@printf " INSTALL ldscripts\n" @printf " INSTALL ldscripts\n"
$(Q)$(INSTALL) -m 0644 lib/*/*.ld $(LIBDIR) $(Q)$(INSTALL) -m 0644 lib/*/*.ld $(LIBDIR)/libopencm3
clean: clean:
$(Q)$(MAKE) -C examples/stm32 clean $(Q)$(MAKE) -C examples/stm32 clean

5
examples/lpc13xx/Makefile.include
View File

@ -30,8 +30,9 @@ TOOLCHAIN_DIR = ../../../..
CFLAGS += -Os -g -Wall -Wextra -I$(TOOLCHAIN_DIR)/include -fno-common \ CFLAGS += -Os -g -Wall -Wextra -I$(TOOLCHAIN_DIR)/include -fno-common \
-mcpu=cortex-m3 -mthumb -mcpu=cortex-m3 -mthumb
LDSCRIPT = $(BINARY).ld LDSCRIPT = $(BINARY).ld
LDFLAGS += -L$(TOOLCHAIN_DIR)/lib/lpc13xx -T$(LDSCRIPT) -nostartfiles \ LDFLAGS += -L$(TOOLCHAIN_DIR)/lib -L$(TOOLCHAIN_DIR)/lib/libopencm3 \
-Wl,--gc-sections -L$(TOOLCHAIN_DIR)/lib/lpc13xx \
-T$(LDSCRIPT) -nostartfiles -Wl,--gc-sections
OBJS += $(BINARY).o OBJS += $(BINARY).o
OOCD ?= openocd OOCD ?= openocd

8
examples/stm32/Makefile.include
View File

@ -27,11 +27,13 @@ OBJDUMP = $(PREFIX)-objdump
# Uncomment this line if you want to use the installed (not local) library. # Uncomment this line if you want to use the installed (not local) library.
# TOOLCHAIN_DIR = `dirname \`which $(CC)\``/../$(PREFIX) # TOOLCHAIN_DIR = `dirname \`which $(CC)\``/../$(PREFIX)
TOOLCHAIN_DIR = ../../../.. TOOLCHAIN_DIR = ../../../..
CFLAGS += -Os -g -Wall -Wextra -I$(TOOLCHAIN_DIR)/include -fno-common \ CFLAGS += -Os -g -Wall -Wextra -I$(TOOLCHAIN_DIR)/include \
-I$(TOOLCHAIN_DIR)/include/libopencm3 -fno-common \
-mcpu=cortex-m3 -mthumb -mcpu=cortex-m3 -mthumb
LDSCRIPT = $(BINARY).ld LDSCRIPT = $(BINARY).ld
LDFLAGS += -L$(TOOLCHAIN_DIR)/lib/stm32 -T$(LDSCRIPT) -nostartfiles \ LDFLAGS += -L$(TOOLCHAIN_DIR)/lib -L$(TOOLCHAIN_DIR)/lib/libopencm3 \
-Wl,--gc-sections -L$(TOOLCHAIN_DIR)/lib/stm32 \
-T$(LDSCRIPT) -nostartfiles -Wl,--gc-sections
OBJS += $(BINARY).o OBJS += $(BINARY).o
OOCD ?= openocd OOCD ?= openocd