From 81c26ecf5dd117d8f006a662e499a01fe5797970 Mon Sep 17 00:00:00 2001
From: hyhkjiy <2632790902@qq.com>
Date: Sun, 31 Jan 2021 10:01:10 +0800
Subject: [PATCH] [UPD]nrf52832 compatible with gcc compilation

---
 bsp/nrf5x/nrf52832/board/board.h                 |  7 ++++---
 bsp/nrf5x/nrf52832/board/linker_scripts/link.lds | 16 ++++++++++++++++
 bsp/nrf5x/nrf52832/rtconfig.py                   |  2 +-
 3 files changed, 21 insertions(+), 4 deletions(-)
 create mode 100644 bsp/nrf5x/nrf52832/board/linker_scripts/link.lds

diff --git a/bsp/nrf5x/nrf52832/board/board.h b/bsp/nrf5x/nrf52832/board/board.h
index f808960780..5357cca291 100644
--- a/bsp/nrf5x/nrf52832/board/board.h
+++ b/bsp/nrf5x/nrf52832/board/board.h
@@ -17,11 +17,12 @@ extern int Image$$RW_IRAM1$$ZI$$Limit;
 #pragma section="CSTACK"
 #define HEAP_BEGIN      (__segment_end("CSTACK"))
 #else
-extern int __bss_end;
-#define HEAP_BEGIN      ((void *)&__bss_end)
+extern int __bss_end__;
+#define HEAP_BEGIN      ((void *)&__bss_end__)
 #endif
 
-#define HEAP_END       (0x20000000 + 64*1024)
+#define HEAP_SIZE      16*1024
+#define HEAP_END       (HEAP_BEGIN + HEAP_SIZE)
 
 void rt_hw_board_init(void);
 
diff --git a/bsp/nrf5x/nrf52832/board/linker_scripts/link.lds b/bsp/nrf5x/nrf52832/board/linker_scripts/link.lds
new file mode 100644
index 0000000000..b1d21b531b
--- /dev/null
+++ b/bsp/nrf5x/nrf52832/board/linker_scripts/link.lds
@@ -0,0 +1,16 @@
+/* Linker script to configure memory regions. */
+
+SEARCH_DIR(.)
+GROUP(-lgcc -lc -lnosys)
+
+MEMORY
+{
+  FLASH (rx) : ORIGIN = 0x00000000, LENGTH = 0x80000
+  RAM (rwx) : ORIGIN = 0x20000000, LENGTH = 0x10000
+  CODE_RAM (rwx) : ORIGIN = 0x800000, LENGTH = 0x10000
+}
+
+INCLUDE "packages/nrfx-v2.1.0/mdk/nrf_common.ld"
+
+
+
diff --git a/bsp/nrf5x/nrf52832/rtconfig.py b/bsp/nrf5x/nrf52832/rtconfig.py
index c1c6022558..219d20d303 100644
--- a/bsp/nrf5x/nrf52832/rtconfig.py
+++ b/bsp/nrf5x/nrf52832/rtconfig.py
@@ -43,7 +43,7 @@ if PLATFORM == 'gcc':
     DEVICE = ' -mcpu=cortex-m4 -mthumb -ffunction-sections -fdata-sections'
     CFLAGS = DEVICE
     AFLAGS = ' -c' + DEVICE + ' -x assembler-with-cpp'
-    LFLAGS = DEVICE + ' -Wl,--gc-sections,-Map=rtthread-nrf52832.map,-cref,-u,Reset_Handler -T board/linker_scripts/link.lds'
+    LFLAGS = DEVICE + ' -Wl,--gc-sections,-Map=rtthread.map,-cref,-u,Reset_Handler -T board/linker_scripts/link.lds'
 
     CPATH = ''
     LPATH = ''
-- 
GitLab