From cb75014f092da19fdcb9977bc0698412b2c2cfbf Mon Sep 17 00:00:00 2001 From: Yihui Xiong Date: Thu, 28 Aug 2014 16:54:06 +0800 Subject: [PATCH] [nrf51822][gcc_arm]: fix softdevice path and srec_cat params of makefile templates --- workspace_tools/export/gcc_arm_arch_ble.tmpl | 8 ++++---- workspace_tools/export/gcc_arm_nrf51822.tmpl | 6 +++--- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/workspace_tools/export/gcc_arm_arch_ble.tmpl b/workspace_tools/export/gcc_arm_arch_ble.tmpl index 9cf2053382..8487d82632 100644 --- a/workspace_tools/export/gcc_arm_arch_ble.tmpl +++ b/workspace_tools/export/gcc_arm_arch_ble.tmpl @@ -9,7 +9,7 @@ INCLUDE_PATHS = {% for p in include_paths %}-I{{p}} {% endfor %} LIBRARY_PATHS = {% for p in library_paths %}-L{{p}} {% endfor %} LIBRARIES = {% for lib in libraries %}-l{{lib}} {% endfor %} LINKER_SCRIPT = {{linker_script}} -SOFTDEVICE = mbed/TARGET_NRF51822/TARGET_NORDIC/TARGET_NRF51822/Lib/s110_nrf51822_6_0_0/s110_nrf51822_6.0.0_softdevice.hex +SOFTDEVICE = mbed/TARGET_ARCH_BLE/TARGET_NORDIC/TARGET_MCU_NRF51822/Lib/s110_nrf51822_7_0_0/s110_nrf51822_7.0.0_softdevice.hex ############################################################################### AS = $(GCC_BIN)arm-none-eabi-as @@ -23,7 +23,7 @@ CPU = -mcpu=cortex-m0 -mthumb CC_FLAGS = $(CPU) -c -g -fno-common -fmessage-length=0 -Wall -fno-exceptions -ffunction-sections -fdata-sections CC_SYMBOLS = {% for s in symbols %}-D{{s}} {% endfor %} -LD_FLAGS = -mcpu=cortex-m0 -mthumb -Wl,--gc-sections --specs=nano.specs -u _printf_float -u _scanf_float +LD_FLAGS = -mcpu=cortex-m0 -mthumb -Wl,--gc-sections -Wl,--wrap=main --specs=nano.specs -u _printf_float -u _scanf_float LD_SYS_LIBS = -lstdc++ -lsupc++ -lm -lc -lgcc -lnosys ifeq ($(DEBUG), 1) @@ -32,7 +32,7 @@ else CC_FLAGS += -DNDEBUG -Os endif -all: $(PROJECT).hex merge +all: $(PROJECT).hex clean: rm -f $(PROJECT).hex $(PROJECT).elf $(OBJECTS) @@ -54,4 +54,4 @@ $(PROJECT).hex: $(PROJECT).elf $(OBJCOPY) -O ihex $< $@ merge: - $(SREC_CAT) $(SOFTDEVICE) -intel $(PROJECT).hex -binary --offset 0x14000 -o combined.hex -intel --line-length=46 + $(SREC_CAT) $(SOFTDEVICE) -intel $(PROJECT).hex -intel -o combined.hex -intel --line-length=44 diff --git a/workspace_tools/export/gcc_arm_nrf51822.tmpl b/workspace_tools/export/gcc_arm_nrf51822.tmpl index 823298e9d1..ca491c401c 100644 --- a/workspace_tools/export/gcc_arm_nrf51822.tmpl +++ b/workspace_tools/export/gcc_arm_nrf51822.tmpl @@ -9,7 +9,7 @@ INCLUDE_PATHS = {% for p in include_paths %}-I{{p}} {% endfor %} LIBRARY_PATHS = {% for p in library_paths %}-L{{p}} {% endfor %} LIBRARIES = {% for lib in libraries %}-l{{lib}} {% endfor %} LINKER_SCRIPT = {{linker_script}} -SOFTDEVICE = mbed/TARGET_NRF51822/TARGET_NORDIC/TARGET_NRF51822/Lib/s110_nrf51822_7_0_0/s110_nrf51822_7.0.0_softdevice.hex +SOFTDEVICE = mbed/TARGET_NRF51822/TARGET_NORDIC/TARGET_MCU_NRF51822/Lib/s110_nrf51822_7_0_0/s110_nrf51822_7.0.0_softdevice.hex ############################################################################### AS = $(GCC_BIN)arm-none-eabi-as @@ -32,7 +32,7 @@ else CC_FLAGS += -DNDEBUG -Os endif -all: $(PROJECT).hex merge +all: $(PROJECT).hex clean: rm -f $(PROJECT).hex $(PROJECT).elf $(OBJECTS) @@ -54,4 +54,4 @@ $(PROJECT).hex: $(PROJECT).elf $(OBJCOPY) -O ihex $< $@ merge: - $(SREC_CAT) $(SOFTDEVICE) -intel $(PROJECT).hex -intel --offset 0x16000 -o combined.hex -intel --line-length=46 + $(SREC_CAT) $(SOFTDEVICE) -intel $(PROJECT).hex -intel -o combined.hex -intel --line-length=44