Fix to linker scripts.

Placement of the data section in ROM was not always exactly at _etext before. The section was just plonked in ROM and sometimes due to strange alignment issues it would not get copied into RAM correctly at startup. Changed so that the section is added to ROM at a well defined address.
fnoble · Apr 19, 2012 · a5f4a98 · a5f4a98
1 parent 92f74a9
commit a5f4a98
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 7 deletions.
diff --git a/lib/stm32/f1/libopencm3_stm32f1.ld b/lib/stm32/f1/libopencm3_stm32f1.ld
@@ -50,12 +50,13 @@ SECTIONS
 
 	_etext = .;
 
-	.data : {
+	_data_flash = .;
+	.data : AT (_data_flash) {
 		_data = .;
 		*(.data*)	/* Read-write initialized data */
 		. = ALIGN(4);
 		_edata = .;
-	} >ram AT >rom
+	} >ram
 
 	.bss : {
 		*(.bss*)	/* Read-write zero initialized data */

diff --git a/lib/stm32/f2/libopencm3_stm32f2.ld b/lib/stm32/f2/libopencm3_stm32f2.ld
@@ -47,15 +47,15 @@ SECTIONS
 	} > rom
 	__exidx_end = .;
 
-
 	_etext = .;
 
-	.data : {
+	_data_flash = .;
+	.data : AT (_data_flash) {
 		_data = .;
 		*(.data*)	/* Read-write initialized data */
 		. = ALIGN(4);
 		_edata = .;
-	} >ram AT >rom
+	} >ram
 
 	.bss : {
 		*(.bss*)	/* Read-write zero initialized data */

diff --git a/lib/stm32/f4/libopencm3_stm32f4.ld b/lib/stm32/f4/libopencm3_stm32f4.ld
@@ -50,12 +50,13 @@ SECTIONS
 
 	_etext = .;
 
-	.data : {
+	_data_flash = .;
+	.data : AT (_data_flash) {
 		_data = .;
 		*(.data*)	/* Read-write initialized data */
 		. = ALIGN(4);
 		_edata = .;
-	} >ram AT >rom
+	} >ram
 
 	.bss : {
 		*(.bss*)	/* Read-write zero initialized data */