From 99da364eaf3d3c39289c4dd5e4386f8c224e9b16 Mon Sep 17 00:00:00 2001
From: Raphael Coeffic <raphaelcoeffic@users.noreply.github.com>
Date: Tue, 2 May 2023 01:20:43 +0200
Subject: [PATCH] fix: explicitly locate .data segment in FLASH (#3556)

Rather than using `_sidata` marker.
---
 radio/src/targets/horus/stm32f4_flash.ld   | 4 ++--
 radio/src/targets/taranis/stm32f2_flash.ld | 4 ++--
 radio/src/targets/taranis/stm32f4_flash.ld | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/radio/src/targets/horus/stm32f4_flash.ld b/radio/src/targets/horus/stm32f4_flash.ld
index 40b089e5a..a1561cef4 100644
--- a/radio/src/targets/horus/stm32f4_flash.ld
+++ b/radio/src/targets/horus/stm32f4_flash.ld
@@ -106,7 +106,7 @@ SECTIONS
   _sidata = .;
 
   /* Initialized data sections goes into RAM, load LMA copy after code */
-  .data : AT ( _sidata )
+  .data :
   {
     . = ALIGN(4);
     _sdata = .;        /* create a global symbol at data start */
@@ -114,7 +114,7 @@ SECTIONS
     *(.data*)          /* .data* sections */
     . = ALIGN(4);
     _edata = .;        /* define a global symbol at data end */
-  } >CCM
+  } >CCM AT> FLASH
 
   /* Uninitialized data section */
   . = ALIGN(4);
diff --git a/radio/src/targets/taranis/stm32f2_flash.ld b/radio/src/targets/taranis/stm32f2_flash.ld
index be9c5dda3..04fb20683 100644
--- a/radio/src/targets/taranis/stm32f2_flash.ld
+++ b/radio/src/targets/taranis/stm32f2_flash.ld
@@ -107,7 +107,7 @@ SECTIONS
   _sidata = .;
 
   /* Initialized data sections goes into RAM, load LMA copy after code */
-  .data : AT ( _sidata )
+  .data :
   {
     . = ALIGN(4);
     _sdata = .;        /* create a global symbol at data start */
@@ -116,7 +116,7 @@ SECTIONS
 
     . = ALIGN(4);
     _edata = .;        /* define a global symbol at data end */
-  } >RAM
+  } >RAM AT> FLASH
 
   /* Uninitialized data section */
   . = ALIGN(4);
diff --git a/radio/src/targets/taranis/stm32f4_flash.ld b/radio/src/targets/taranis/stm32f4_flash.ld
index ab1ce7b76..de9ca1e73 100644
--- a/radio/src/targets/taranis/stm32f4_flash.ld
+++ b/radio/src/targets/taranis/stm32f4_flash.ld
@@ -107,7 +107,7 @@ SECTIONS
   _sidata = .;
 
   /* Initialized data sections goes into RAM, load LMA copy after code */
-  .data : AT ( _sidata )
+  .data :
   {
     . = ALIGN(4);
     _sdata = .;        /* create a global symbol at data start */
@@ -116,7 +116,7 @@ SECTIONS
 
     . = ALIGN(4);
     _edata = .;        /* define a global symbol at data end */
-  } >CCM
+  } >CCM AT> FLASH
 
   /* Uninitialized data section */
   . = ALIGN(4);