• State Verified Answer
  • Replies 1 reply
  • Subscribers 67 subscribers
  • Views 902 views
  • Users 0 members are here
Attachments (0)
Nordic Case Info
  • Case ID: 104057
Options
This post is older than 2 years and might not be relevant anymore
More Info: Consider searching for newer posts

[PATCH] SDK 6.1.0 gcc + S120 - solved

Alexey Zaytsev

Hi.

It appears that the common gcc makefile in the current SDK does not work for S120, or S310. Please see the patch that fixes the problem.

Tested with S120 and blinky.

Also, is there a better way to send patches for both developers and users to see?

diff --git a/nrf51822/Source/templates/gcc/Makefile.common b/nrf51822/Source/templates/gcc/Makefile.common
index 6f97914..b0947dc 100644
--- a/nrf51822/Source/templates/gcc/Makefile.common
+++ b/nrf51822/Source/templates/gcc/Makefile.common
@@ -13,17 +13,28 @@ include $(TEMPLATE_PATH)Makefile.posix
 endif^M
 ^M
 ifeq ($(LINKER_SCRIPT),)^M
+   # Default variant, no SD^M
+   LINKER_SCRIPT = gcc_$(DEVICESERIES)_blank_$(DEVICE_VARIANT).ld^M
+   OUTPUT_FILENAME := $(OUTPUT_FILENAME)_$(DEVICE_VARIANT)^M
+^M
    ifeq ($(USE_SOFTDEVICE), S110)^M
            LINKER_SCRIPT = gcc_$(DEVICESERIES)_s110_$(DEVICE_VARIANT).ld^M
            OUTPUT_FILENAME := $(OUTPUT_FILENAME)_s110_$(DEVICE_VARIANT)^M
-   else^M
-           ifeq ($(USE_SOFTDEVICE), S210)^M
-                   LINKER_SCRIPT = gcc_$(DEVICESERIES)_s210_$(DEVICE_VARIANT).ld^M
-                   OUTPUT_FILENAME := $(OUTPUT_FILENAME)_s210_$(DEVICE_VARIANT)^M
-           else^M
-                   LINKER_SCRIPT = gcc_$(DEVICESERIES)_blank_$(DEVICE_VARIANT).ld^M
-                   OUTPUT_FILENAME := $(OUTPUT_FILENAME)_$(DEVICE_VARIANT)^M
-           endif^M
+   endif^M
+^M
+   ifeq ($(USE_SOFTDEVICE), S120)^M
+           LINKER_SCRIPT = gcc_$(DEVICESERIES)_s120_$(DEVICE_VARIANT).ld^M
+           OUTPUT_FILENAME := $(OUTPUT_FILENAME)_s120_$(DEVICE_VARIANT)^M
+   endif^M
+^M
+   ifeq ($(USE_SOFTDEVICE), S210)^M
+           LINKER_SCRIPT = gcc_$(DEVICESERIES)_s210_$(DEVICE_VARIANT).ld^M
+           OUTPUT_FILENAME := $(OUTPUT_FILENAME)_s210_$(DEVICE_VARIANT)^M
+   endif^M
+^M
+   ifeq ($(USE_SOFTDEVICE), S310)^M
+           LINKER_SCRIPT = gcc_$(DEVICESERIES)_s310_$(DEVICE_VARIANT).ld^M
+           OUTPUT_FILENAME := $(OUTPUT_FILENAME)_s310_$(DEVICE_VARIANT)^M
    endif^M
 else^M
 # Use externally defined settings^M
Related