changed gcc linker map names to reflect new ram length

NordicPlayground · Oct 15, 2015 · e6adc7f · e6adc7f
1 parent 480f3cb
commit e6adc7f
Show file tree

Hide file tree

Showing 8 changed files with 16 additions and 16 deletions.
diff --git a/...caling_example/gcc/gcc_nrf51_s110_xxaa.ld → ...es/BLE_Gateway/gcc/gcc_nrf51_s110_xxac.ld b/...caling_example/gcc/gcc_nrf51_s110_xxaa.ld → ...es/BLE_Gateway/gcc/gcc_nrf51_s110_xxac.ld
diff --git a/nRF51/examples/BLE_Gateway/gcc/makefile b/nRF51/examples/BLE_Gateway/gcc/makefile
@@ -20,7 +20,7 @@ SDK_BASE      := ../../../../../..
 COMPONENTS    := $(SDK_BASE)/components
 TEMPLATE_PATH := $(COMPONENTS)/toolchain/gcc
 
-LINKER_SCRIPT := ./gcc_nrf51_s110_xxaa.ld
+LINKER_SCRIPT := ./gcc_nrf51_s110_xxac.ld
 
 ifeq ($(USE_BUTTONS), "yes")
 	BUTTON_STRING="_buttons"

diff --git a/...mplate project/gcc/gcc_nrf51_s110_xxaa.ld → ...caling_example/gcc/gcc_nrf51_s110_xxac.ld b/...mplate project/gcc/gcc_nrf51_s110_xxaa.ld → ...caling_example/gcc/gcc_nrf51_s110_xxac.ld
diff --git a/nRF51/examples/Scaling_example/gcc/makefile b/nRF51/examples/Scaling_example/gcc/makefile
@@ -20,7 +20,7 @@ SDK_BASE      := ../../../../../..
 COMPONENTS    := $(SDK_BASE)/components
 TEMPLATE_PATH := $(COMPONENTS)/toolchain/gcc
 
-LINKER_SCRIPT := ./gcc_nrf51_s110_xxaa.ld
+LINKER_SCRIPT := ./gcc_nrf51_s110_xxac.ld
 OUTPUT_NAME   := rbc_scaling_$(TARGET_BOARD)
 
 #------------------------------------------------------------------------------

diff --git a/...ples/ping_pong/gcc/gcc_nrf51_s110_xxaa.ld → ...mplate project/gcc/gcc_nrf51_s110_xxac.ld b/...ples/ping_pong/gcc/gcc_nrf51_s110_xxaa.ld → ...mplate project/gcc/gcc_nrf51_s110_xxac.ld
diff --git a/nRF51/examples/Template project/gcc/makefile b/nRF51/examples/Template project/gcc/makefile
@@ -19,7 +19,7 @@ SDK_BASE      := ../../../../../..
 COMPONENTS    := $(SDK_BASE)/components
 TEMPLATE_PATH := $(COMPONENTS)/toolchain/gcc
 
-LINKER_SCRIPT := ./gcc_nrf51_s110_xxaa.ld
+LINKER_SCRIPT := ./gcc_nrf51_s110_xxac.ld
 
 ifeq ($(USE_RBC_MESH_SERIAL), "yes")
 	SERIAL_STRING := "_serial"

diff --git a/...es/BLE_Gateway/gcc/gcc_nrf51_s110_xxaa.ld → ...ples/ping_pong/gcc/gcc_nrf51_s110_xxac.ld b/...es/BLE_Gateway/gcc/gcc_nrf51_s110_xxaa.ld → ...ples/ping_pong/gcc/gcc_nrf51_s110_xxac.ld
@@ -1,12 +1,12 @@
-/* Linker script to configure memory regions. */
-
-SEARCH_DIR(.)
-GROUP(-lgcc -lc -lnosys)
-
-MEMORY
-{
-  FLASH (rx) : ORIGIN = 0x00018000, LENGTH = 160K 
-  RAM (rwx) :  ORIGIN = 0x20002000, LENGTH = 24K
-}
-
-INCLUDE "gcc_nrf51_common.ld"
+/* Linker script to configure memory regions. */
+
+SEARCH_DIR(.)
+GROUP(-lgcc -lc -lnosys)
+
+MEMORY
+{
+  FLASH (rx) : ORIGIN = 0x00018000, LENGTH = 160K 
+  RAM (rwx) :  ORIGIN = 0x20002000, LENGTH = 24K
+}
+
+INCLUDE "gcc_nrf51_common.ld"
diff --git a/nRF51/examples/ping_pong/gcc/makefile b/nRF51/examples/ping_pong/gcc/makefile
@@ -20,7 +20,7 @@ SDK_BASE      := ../../../../../..
 COMPONENTS    := $(SDK_BASE)/components
 TEMPLATE_PATH := $(COMPONENTS)/toolchain/gcc
 
-LINKER_SCRIPT := ./gcc_nrf51_s110_xxaa.ld
+LINKER_SCRIPT := ./gcc_nrf51_s110_xxac.ld
 OUTPUT_NAME   := ping_pong
 
 #------------------------------------------------------------------------------