From 9d07e2cc6b50e07933f38e18a042a64f6515aa4c Mon Sep 17 00:00:00 2001
From: Giovanni Di Sirio <gdisirio@gmail.com>
Date: Sun, 5 Apr 2020 12:44:48 +0000
Subject: [PATCH] git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@13514
 27425a3e-05d8-49a3-a47f-9c15f0e5edd8

---
 ...E-NUCLEO144 (ST-Link GDB Server, Flash and Run).launch | 2 +-
 ...tency (Select ELF file)(OpenOCD, Flash and Run).launch | 2 +-
 os/common/startup/ARMCMx/compilers/GCC/ld/STM32L552xE.ld  | 8 ++++----
 .../startup/ARMCMx/compilers/GCC/ld/STM32L552xE_TZ.ld     | 8 ++++----
 4 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/demos/STM32/RT-STM32L552ZE-NUCLEO144/debug/RT-STM32L552ZE-NUCLEO144 (ST-Link GDB Server, Flash and Run).launch b/demos/STM32/RT-STM32L552ZE-NUCLEO144/debug/RT-STM32L552ZE-NUCLEO144 (ST-Link GDB Server, Flash and Run).launch
index 30754e98c..ed9b9ef3c 100644
--- a/demos/STM32/RT-STM32L552ZE-NUCLEO144/debug/RT-STM32L552ZE-NUCLEO144 (ST-Link GDB Server, Flash and Run).launch	
+++ b/demos/STM32/RT-STM32L552ZE-NUCLEO144/debug/RT-STM32L552ZE-NUCLEO144 (ST-Link GDB Server, Flash and Run).launch	
@@ -33,7 +33,7 @@
 <intAttribute key="org.eclipse.cdt.launch.ATTR_BUILD_BEFORE_LAUNCH_ATTR" value="2"/>
 <stringAttribute key="org.eclipse.cdt.launch.COREFILE_PATH" value=""/>
 <stringAttribute key="org.eclipse.cdt.launch.DEBUGGER_REGISTER_GROUPS" value=""/>
-<stringAttribute key="org.eclipse.cdt.launch.FORMAT" value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&lt;contentList&gt;&lt;content id=&quot;lr-sp-ctx-tp-chThdCreateStatic-(format)&quot; val=&quot;4&quot;/&gt;&lt;content id=&quot;brr-usart_init-(format)&quot; val=&quot;4&quot;/&gt;&lt;/contentList&gt;"/>
+<stringAttribute key="org.eclipse.cdt.launch.FORMAT" value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&lt;contentList&gt;&lt;content id=&quot;brr-usart_init-(format)&quot; val=&quot;4&quot;/&gt;&lt;content id=&quot;lr-sp-ctx-tp-chThdCreateStatic-(format)&quot; val=&quot;4&quot;/&gt;&lt;/contentList&gt;"/>
 <stringAttribute key="org.eclipse.cdt.launch.GLOBAL_VARIABLES" value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#10;&lt;globalVariableList/&gt;&#10;"/>
 <stringAttribute key="org.eclipse.cdt.launch.MEMORY_BLOCKS" value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#10;&lt;memoryBlockExpressionList&gt;&#10;&lt;memoryBlockExpressionItem&gt;&#10;&lt;expression text=&quot;0xe000a40&quot;/&gt;&#10;&lt;/memoryBlockExpressionItem&gt;&#10;&lt;/memoryBlockExpressionList&gt;&#10;"/>
 <stringAttribute key="org.eclipse.cdt.launch.PROGRAM_NAME" value="./build/ch.elf"/>
diff --git a/demos/various/RT-TEST-Latency/debug/RT-TEST-Latency (Select ELF file)(OpenOCD, Flash and Run).launch b/demos/various/RT-TEST-Latency/debug/RT-TEST-Latency (Select ELF file)(OpenOCD, Flash and Run).launch
index c2591243b..79ecb7768 100644
--- a/demos/various/RT-TEST-Latency/debug/RT-TEST-Latency (Select ELF file)(OpenOCD, Flash and Run).launch	
+++ b/demos/various/RT-TEST-Latency/debug/RT-TEST-Latency (Select ELF file)(OpenOCD, Flash and Run).launch	
@@ -33,7 +33,7 @@
 <intAttribute key="org.eclipse.cdt.launch.ATTR_BUILD_BEFORE_LAUNCH_ATTR" value="2"/>
 <stringAttribute key="org.eclipse.cdt.launch.COREFILE_PATH" value=""/>
 <stringAttribute key="org.eclipse.cdt.launch.DEBUGGER_REGISTER_GROUPS" value=""/>
-<stringAttribute key="org.eclipse.cdt.launch.FORMAT" value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&lt;contentList&gt;&lt;content id=&quot;CMAR-channel-dma-null-dac_lld_serve_tx_interrupt-(format)&quot; val=&quot;4&quot;/&gt;&lt;content id=&quot;CPAR-channel-dma-null-dac_lld_serve_tx_interrupt-(format)&quot; val=&quot;4&quot;/&gt;&lt;content id=&quot;CCR-channel-dma-null-dac_lld_serve_tx_interrupt-(format)&quot; val=&quot;4&quot;/&gt;&lt;content id=&quot;rand[31]-rand-main-(format)&quot; val=&quot;4&quot;/&gt;&lt;content id=&quot;rand[30]-rand-main-(format)&quot; val=&quot;4&quot;/&gt;&lt;content id=&quot;rand[29]-rand-main-(format)&quot; val=&quot;4&quot;/&gt;&lt;content id=&quot;rand[28]-rand-main-(format)&quot; val=&quot;4&quot;/&gt;&lt;content id=&quot;rand[27]-rand-main-(format)&quot; val=&quot;4&quot;/&gt;&lt;content id=&quot;rand[26]-rand-main-(format)&quot; val=&quot;4&quot;/&gt;&lt;content id=&quot;rand[25]-rand-main-(format)&quot; val=&quot;4&quot;/&gt;&lt;content id=&quot;rand[24]-rand-main-(format)&quot; val=&quot;4&quot;/&gt;&lt;content id=&quot;rand[23]-rand-main-(format)&quot; val=&quot;4&quot;/&gt;&lt;content id=&quot;rand[22]-rand-main-(format)&quot; val=&quot;4&quot;/&gt;&lt;content id=&quot;rand[21]-rand-main-(format)&quot; val=&quot;4&quot;/&gt;&lt;content id=&quot;rand[20]-rand-main-(format)&quot; val=&quot;4&quot;/&gt;&lt;content id=&quot;rand[19]-rand-main-(format)&quot; val=&quot;4&quot;/&gt;&lt;content id=&quot;rand[18]-rand-main-(format)&quot; val=&quot;4&quot;/&gt;&lt;content id=&quot;rand[17]-rand-main-(format)&quot; val=&quot;4&quot;/&gt;&lt;content id=&quot;rand[16]-rand-main-(format)&quot; val=&quot;4&quot;/&gt;&lt;content id=&quot;rand[15]-rand-main-(format)&quot; val=&quot;4&quot;/&gt;&lt;content id=&quot;rand[14]-rand-main-(format)&quot; val=&quot;4&quot;/&gt;&lt;content id=&quot;rand[13]-rand-main-(format)&quot; val=&quot;4&quot;/&gt;&lt;content id=&quot;rand[12]-rand-main-(format)&quot; val=&quot;4&quot;/&gt;&lt;content id=&quot;rand[11]-rand-main-(format)&quot; val=&quot;4&quot;/&gt;&lt;content id=&quot;rand[10]-rand-main-(format)&quot; val=&quot;4&quot;/&gt;&lt;content id=&quot;rand[9]-rand-main-(format)&quot; val=&quot;4&quot;/&gt;&lt;content id=&quot;rand[8]-rand-main-(format)&quot; val=&quot;4&quot;/&gt;&lt;content id=&quot;rand[7]-rand-main-(format)&quot; val=&quot;4&quot;/&gt;&lt;content id=&quot;rand[6]-rand-main-(format)&quot; val=&quot;4&quot;/&gt;&lt;content id=&quot;rand[5]-rand-main-(format)&quot; val=&quot;4&quot;/&gt;&lt;content id=&quot;rand[4]-rand-main-(format)&quot; val=&quot;4&quot;/&gt;&lt;content id=&quot;rand[3]-rand-main-(format)&quot; val=&quot;4&quot;/&gt;&lt;content id=&quot;rand[2]-rand-main-(format)&quot; val=&quot;4&quot;/&gt;&lt;content id=&quot;rand[1]-rand-main-(format)&quot; val=&quot;4&quot;/&gt;&lt;content id=&quot;rand[0]-rand-main-(format)&quot; val=&quot;4&quot;/&gt;&lt;content id=&quot;xPSR-(format)&quot; val=&quot;4&quot;/&gt;&lt;content id=&quot;mfs_buffer[447]-null-mfs_test_001_005_execute-(format)&quot; val=&quot;0&quot;/&gt;&lt;content id=&quot;mfs_buffer[507]-null-mfs_test_001_005_execute-(format)&quot; val=&quot;0&quot;/&gt;&lt;content id=&quot;rp[506]-rp-mfs_flash_read-(format)&quot; val=&quot;0&quot;/&gt;&lt;content id=&quot;rp[507]-rp-mfs_flash_read-(format)&quot; val=&quot;0&quot;/&gt;&lt;content id=&quot;rp-mfs_flash_read-(cast_to_array)&quot; val=&quot;0:511&quot;/&gt;&lt;content id=&quot;rand-main-(format)&quot; val=&quot;4&quot;/&gt;&lt;content id=&quot;CCR-channel-dma-dacp-dac_lld_start_conversion-(format)&quot; val=&quot;4&quot;/&gt;&lt;content id=&quot;CPAR-channel-dma-dacp-dac_lld_start_conversion-(format)&quot; val=&quot;4&quot;/&gt;&lt;content id=&quot;CMAR-channel-dma-dacp-dac_lld_start_conversion-(format)&quot; val=&quot;4&quot;/&gt;&lt;content id=&quot;CR-dac-params-null-main-(format)&quot; val=&quot;4&quot;/&gt;&lt;content id=&quot;CCR-channel-dma-dacp-dac_lld_serve_tx_interrupt-(format)&quot; val=&quot;4&quot;/&gt;&lt;content id=&quot;CPAR-channel-dma-dacp-dac_lld_serve_tx_interrupt-(format)&quot; val=&quot;4&quot;/&gt;&lt;content id=&quot;CMAR-channel-dma-dacp-dac_lld_serve_tx_interrupt-(format)&quot; val=&quot;4&quot;/&gt;&lt;content id=&quot;CPAR-channel-dma-null-error_cb1-(format)&quot; val=&quot;4&quot;/&gt;&lt;content id=&quot;channel-dma-null-main-(format)&quot; val=&quot;4&quot;/&gt;&lt;content id=&quot;CCR-channel-dma-null-main-(format)&quot; val=&quot;4&quot;/&gt;&lt;content id=&quot;CNDTR-channel-dma-null-main-(format)&quot; val=&quot;4&quot;/&gt;&lt;content id=&quot;CPAR-channel-dma-null-main-(format)&quot; val=&quot;4&quot;/&gt;&lt;content id=&quot;CMAR-channel-dma-null-main-(format)&quot; val=&quot;4&quot;/&gt;&lt;content id=&quot;CPAR-channel-dma-null-_idle_thread-(format)&quot; val=&quot;4&quot;/&gt;&lt;/contentList&gt;"/>
+<stringAttribute key="org.eclipse.cdt.launch.FORMAT" value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&lt;contentList&gt;&lt;content id=&quot;CPAR-channel-dma-null-_idle_thread-(format)&quot; val=&quot;4&quot;/&gt;&lt;content id=&quot;CMAR-channel-dma-null-main-(format)&quot; val=&quot;4&quot;/&gt;&lt;content id=&quot;CPAR-channel-dma-null-main-(format)&quot; val=&quot;4&quot;/&gt;&lt;content id=&quot;CNDTR-channel-dma-null-main-(format)&quot; val=&quot;4&quot;/&gt;&lt;content id=&quot;CCR-channel-dma-null-main-(format)&quot; val=&quot;4&quot;/&gt;&lt;content id=&quot;channel-dma-null-main-(format)&quot; val=&quot;4&quot;/&gt;&lt;content id=&quot;CPAR-channel-dma-null-error_cb1-(format)&quot; val=&quot;4&quot;/&gt;&lt;content id=&quot;CMAR-channel-dma-dacp-dac_lld_serve_tx_interrupt-(format)&quot; val=&quot;4&quot;/&gt;&lt;content id=&quot;CPAR-channel-dma-dacp-dac_lld_serve_tx_interrupt-(format)&quot; val=&quot;4&quot;/&gt;&lt;content id=&quot;CCR-channel-dma-dacp-dac_lld_serve_tx_interrupt-(format)&quot; val=&quot;4&quot;/&gt;&lt;content id=&quot;CR-dac-params-null-main-(format)&quot; val=&quot;4&quot;/&gt;&lt;content id=&quot;CMAR-channel-dma-dacp-dac_lld_start_conversion-(format)&quot; val=&quot;4&quot;/&gt;&lt;content id=&quot;CPAR-channel-dma-dacp-dac_lld_start_conversion-(format)&quot; val=&quot;4&quot;/&gt;&lt;content id=&quot;CCR-channel-dma-dacp-dac_lld_start_conversion-(format)&quot; val=&quot;4&quot;/&gt;&lt;content id=&quot;rand-main-(format)&quot; val=&quot;4&quot;/&gt;&lt;content id=&quot;rp-mfs_flash_read-(cast_to_array)&quot; val=&quot;0:511&quot;/&gt;&lt;content id=&quot;rp[507]-rp-mfs_flash_read-(format)&quot; val=&quot;0&quot;/&gt;&lt;content id=&quot;rp[506]-rp-mfs_flash_read-(format)&quot; val=&quot;0&quot;/&gt;&lt;content id=&quot;mfs_buffer[507]-null-mfs_test_001_005_execute-(format)&quot; val=&quot;0&quot;/&gt;&lt;content id=&quot;mfs_buffer[447]-null-mfs_test_001_005_execute-(format)&quot; val=&quot;0&quot;/&gt;&lt;content id=&quot;xPSR-(format)&quot; val=&quot;4&quot;/&gt;&lt;content id=&quot;rand[0]-rand-main-(format)&quot; val=&quot;4&quot;/&gt;&lt;content id=&quot;rand[1]-rand-main-(format)&quot; val=&quot;4&quot;/&gt;&lt;content id=&quot;rand[2]-rand-main-(format)&quot; val=&quot;4&quot;/&gt;&lt;content id=&quot;rand[3]-rand-main-(format)&quot; val=&quot;4&quot;/&gt;&lt;content id=&quot;rand[4]-rand-main-(format)&quot; val=&quot;4&quot;/&gt;&lt;content id=&quot;rand[5]-rand-main-(format)&quot; val=&quot;4&quot;/&gt;&lt;content id=&quot;rand[6]-rand-main-(format)&quot; val=&quot;4&quot;/&gt;&lt;content id=&quot;rand[7]-rand-main-(format)&quot; val=&quot;4&quot;/&gt;&lt;content id=&quot;rand[8]-rand-main-(format)&quot; val=&quot;4&quot;/&gt;&lt;content id=&quot;rand[9]-rand-main-(format)&quot; val=&quot;4&quot;/&gt;&lt;content id=&quot;rand[10]-rand-main-(format)&quot; val=&quot;4&quot;/&gt;&lt;content id=&quot;rand[11]-rand-main-(format)&quot; val=&quot;4&quot;/&gt;&lt;content id=&quot;rand[12]-rand-main-(format)&quot; val=&quot;4&quot;/&gt;&lt;content id=&quot;rand[13]-rand-main-(format)&quot; val=&quot;4&quot;/&gt;&lt;content id=&quot;rand[14]-rand-main-(format)&quot; val=&quot;4&quot;/&gt;&lt;content id=&quot;rand[15]-rand-main-(format)&quot; val=&quot;4&quot;/&gt;&lt;content id=&quot;rand[16]-rand-main-(format)&quot; val=&quot;4&quot;/&gt;&lt;content id=&quot;rand[17]-rand-main-(format)&quot; val=&quot;4&quot;/&gt;&lt;content id=&quot;rand[18]-rand-main-(format)&quot; val=&quot;4&quot;/&gt;&lt;content id=&quot;rand[19]-rand-main-(format)&quot; val=&quot;4&quot;/&gt;&lt;content id=&quot;rand[20]-rand-main-(format)&quot; val=&quot;4&quot;/&gt;&lt;content id=&quot;rand[21]-rand-main-(format)&quot; val=&quot;4&quot;/&gt;&lt;content id=&quot;rand[22]-rand-main-(format)&quot; val=&quot;4&quot;/&gt;&lt;content id=&quot;rand[23]-rand-main-(format)&quot; val=&quot;4&quot;/&gt;&lt;content id=&quot;rand[24]-rand-main-(format)&quot; val=&quot;4&quot;/&gt;&lt;content id=&quot;rand[25]-rand-main-(format)&quot; val=&quot;4&quot;/&gt;&lt;content id=&quot;rand[26]-rand-main-(format)&quot; val=&quot;4&quot;/&gt;&lt;content id=&quot;rand[27]-rand-main-(format)&quot; val=&quot;4&quot;/&gt;&lt;content id=&quot;rand[28]-rand-main-(format)&quot; val=&quot;4&quot;/&gt;&lt;content id=&quot;rand[29]-rand-main-(format)&quot; val=&quot;4&quot;/&gt;&lt;content id=&quot;rand[30]-rand-main-(format)&quot; val=&quot;4&quot;/&gt;&lt;content id=&quot;rand[31]-rand-main-(format)&quot; val=&quot;4&quot;/&gt;&lt;content id=&quot;CCR-channel-dma-null-dac_lld_serve_tx_interrupt-(format)&quot; val=&quot;4&quot;/&gt;&lt;content id=&quot;CPAR-channel-dma-null-dac_lld_serve_tx_interrupt-(format)&quot; val=&quot;4&quot;/&gt;&lt;content id=&quot;CMAR-channel-dma-null-dac_lld_serve_tx_interrupt-(format)&quot; val=&quot;4&quot;/&gt;&lt;/contentList&gt;"/>
 <stringAttribute key="org.eclipse.cdt.launch.GLOBAL_VARIABLES" value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#10;&lt;globalVariableList/&gt;&#10;"/>
 <stringAttribute key="org.eclipse.cdt.launch.MEMORY_BLOCKS" value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#10;&lt;memoryBlockExpressionList/&gt;&#10;"/>
 <stringAttribute key="org.eclipse.cdt.launch.PROGRAM_NAME" value="${selected_resource_loc}"/>
diff --git a/os/common/startup/ARMCMx/compilers/GCC/ld/STM32L552xE.ld b/os/common/startup/ARMCMx/compilers/GCC/ld/STM32L552xE.ld
index 8ac753ecc..76f9605d2 100644
--- a/os/common/startup/ARMCMx/compilers/GCC/ld/STM32L552xE.ld
+++ b/os/common/startup/ARMCMx/compilers/GCC/ld/STM32L552xE.ld
@@ -29,10 +29,10 @@ MEMORY
     flash7 (rx) : org = 0x00000000, len = 0
     ram0   (wx) : org = 0x20000000, len = 256k  /* SRAM1+SRAM2 NS */
     ram1   (wx) : org = 0x20000000, len = 192k  /* SRAM1 NS */
-    ram2   (wx) : org = 0x00000000, len = 64k   /* SRAM2 NS */
-    ram3   (wx) : org = 0x0E000000, len = 256k  /* SRAM1+SRAM2 NSC */
-    ram4   (wx) : org = 0x0E000000, len = 192k  /* SRAM1 NSC */
-    ram5   (wx) : org = 0x0E030000, len = 64k   /* SRAM2 NSC */
+    ram2   (wx) : org = 0x20030000, len = 64k   /* SRAM2 NS */
+    ram3   (wx) : org = 0x30000000, len = 256k  /* SRAM1+SRAM2 NSC */
+    ram4   (wx) : org = 0x30000000, len = 192k  /* SRAM1 NSC */
+    ram5   (wx) : org = 0x30030000, len = 64k   /* SRAM2 NSC */
     ram6   (wx) : org = 0x00000000, len = 0
     ram7   (wx) : org = 0x00000000, len = 0
 }
diff --git a/os/common/startup/ARMCMx/compilers/GCC/ld/STM32L552xE_TZ.ld b/os/common/startup/ARMCMx/compilers/GCC/ld/STM32L552xE_TZ.ld
index dea6fca41..8266ea3b6 100644
--- a/os/common/startup/ARMCMx/compilers/GCC/ld/STM32L552xE_TZ.ld
+++ b/os/common/startup/ARMCMx/compilers/GCC/ld/STM32L552xE_TZ.ld
@@ -29,10 +29,10 @@ MEMORY
     flash7 (rx) : org = 0x00000000, len = 0
     ram0   (wx) : org = 0x20000000, len = 256k  /* SRAM1+SRAM2 NS */
     ram1   (wx) : org = 0x20000000, len = 192k  /* SRAM1 NS */
-    ram2   (wx) : org = 0x00000000, len = 64k   /* SRAM2 NS */
-    ram3   (wx) : org = 0x0E000000, len = 256k  /* SRAM1+SRAM2 NSC */
-    ram4   (wx) : org = 0x0E000000, len = 192k  /* SRAM1 NSC */
-    ram5   (wx) : org = 0x0E030000, len = 64k   /* SRAM2 NSC */
+    ram2   (wx) : org = 0x20030000, len = 64k   /* SRAM2 NS */
+    ram3   (wx) : org = 0x30000000, len = 256k  /* SRAM1+SRAM2 NSC */
+    ram4   (wx) : org = 0x30000000, len = 192k  /* SRAM1 NSC */
+    ram5   (wx) : org = 0x30030000, len = 64k   /* SRAM2 NSC */
     ram6   (wx) : org = 0x00000000, len = 0
     ram7   (wx) : org = 0x00000000, len = 0
 }