giomba/nes-proj
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #763 from lafka/lafka-ldscript-override

Browse Source 
Allow configurable linker script
This commit is contained in:
George Oikonomou 2018-11-14 17:59:21 +00:00 committed by GitHub
commit f5657ec9e2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
arch/cpu/cc26x0-cc13x0/Makefile.cc26x0-cc13x0
View File

@ -24,7 +24,7 @@ CFLAGS += -I$(TI_XXWARE) -I$(CONTIKI)/$(TI_XXWARE_SRC)
CFLAGS += -I$(TI_XXWARE)/inc CFLAGS += -I$(TI_XXWARE)/inc
MODULES += $(TI_XXWARE_SRC) MODULES += $(TI_XXWARE_SRC)
LDSCRIPT = $(CONTIKI_CPU)/cc26xx.ld LDSCRIPT ?= $(CONTIKI_CPU)/cc26xx.ld
### If the user-specified a Node ID, pass a define ### If the user-specified a Node ID, pass a define
ifdef NODEID ifdef NODEID

4
arch/cpu/nrf52832/Makefile.nrf52832
View File

@ -25,9 +25,9 @@ ifneq ($(NRF52_WITHOUT_SOFTDEVICE),1)
NRF52_SOFTDEVICE := $(shell find $(NRF52_SDK_ROOT) -name *iot*_softdevice.hex | head -n 1) NRF52_SOFTDEVICE := $(shell find $(NRF52_SDK_ROOT) -name *iot*_softdevice.hex | head -n 1)
endif endif
$(info SoftDevice: $(NRF52_SOFTDEVICE)) $(info SoftDevice: $(NRF52_SOFTDEVICE))
LDSCRIPT := $(CONTIKI_CPU)/ld/nrf52-$(NRF52_DK_REVISION)-sd.ld LDSCRIPT ?= $(CONTIKI_CPU)/ld/nrf52-$(NRF52_DK_REVISION)-sd.ld
else else
LDSCRIPT := $(CONTIKI_CPU)/ld/nrf52.ld LDSCRIPT ?= $(CONTIKI_CPU)/ld/nrf52.ld
endif endif
OUTPUT_FILENAME := $(CONTIKI_PROJECT) OUTPUT_FILENAME := $(CONTIKI_PROJECT)

2
arch/cpu/simplelink-cc13xx-cc26xx/Makefile.cc13xx-cc26xx
View File

@ -120,7 +120,7 @@ LDFLAGS += -nostartfiles
LDFLAGS += -static LDFLAGS += -static
# Linker script # Linker script
LDSCRIPT := $(CONTIKI_CPU)/$(SUBFAMILY)/$(SUBFAMILY).lds LDSCRIPT ?= $(CONTIKI_CPU)/$(SUBFAMILY)/$(SUBFAMILY).lds
# Globally linked libraries # Globally linked libraries
TARGET_LIBFILES += -lc -lgcc -lnosys -lm TARGET_LIBFILES += -lc -lgcc -lnosys -lm