Update section names for non-initialized variables

- synchronize with latest CMSIS core
ARM-software · Nov 27, 2023 · 3ca717a · 3ca717a
1 parent aec0406
commit 3ca717a
Show file tree

Hide file tree

Showing 11 changed files with 29 additions and 22 deletions.
diff --git a/Documentation/Doxygen/src/event_recorder.md b/Documentation/Doxygen/src/event_recorder.md
@@ -260,7 +260,8 @@ For the **Arm Compiler** toolchain add the following code snippet to the linker
 
 ```
   RW_NOINIT <start_address> UNINIT 0x800 {
-    * (.bss.noinit*)
+    *(.noinit)
+    *(.noinit.*)
   }
 ```
 
@@ -276,10 +277,11 @@ For the **GCC** toolchain add the following code snippet to the linker script (.
   .noinit (NOLOAD) :
   {
     . = ALIGN(4);
-    PROVIDE (__noinit_start = .);
-    *(.noinit*)
+    __noinit_start = .;
+    *(.noinit)
+    *(.noinit.*)
     . = ALIGN(4);
-    PROVIDE (__noinit_end = .);
+    __noinit_end = .;
   } > RAM
 ```
 

diff --git a/Documentation/Doxygen/src/fault.md b/Documentation/Doxygen/src/fault.md
@@ -133,7 +133,8 @@ For the Arm Compiler toolchain add the following code snippet to the linker scri
 
 ```
   RW_NOINIT <start_address> UNINIT 0x800 {
-    * (.bss.noinit*)
+    *(.noinit)
+    *(.noinit.*)
   }
 ```
 
@@ -150,10 +151,11 @@ For the GCC toolchain add the following code snippet to the linker script (.ld f
   .noinit (NOLOAD) :
   {
     . = ALIGN(4);
-    PROVIDE (__noinit_start = .);
-    *(.noinit*)
+    __noinit_start = .;
+    *(.noinit)
+    *(.noinit.*)
     . = ALIGN(4);
-    PROVIDE (__noinit_end = .);
+    __noinit_end = .;
   } > RAM
 ```
 

diff --git a/EventRecorder/Source/EventRecorder.c b/EventRecorder/Source/EventRecorder.c
@@ -42,7 +42,7 @@
 
 #if !defined(__NO_INIT)
 //lint -esym(9071, __NO_INIT) "defined macro is reserved to the compiler"
-#define __NO_INIT __attribute__ ((section (".bss.noinit")))
+#define __NO_INIT __attribute__ ((section (".noinit")))
 #endif
 
 //lint -e(9026) "Function-like macro"

diff --git a/Examples/EventStatistic/RTE/Device/SSE-300-MPS3/fvp_sse300_mps3_s.sct b/Examples/EventStatistic/RTE/Device/SSE-300-MPS3/fvp_sse300_mps3_s.sct
@@ -59,7 +59,8 @@ LR_CODE S_CODE_START {
     }
 
     ER_DATA_NOINIT +0 ALIGN 64 UNINIT 0x00002000 {
-        *(.bss.noinit)
+        *(.noinit)
+        *(.noinit.*)
     }
 
     #if HEAP_SIZE > 0

diff --git a/Examples/Fault/B-U585I-IOT02A/NonSecure/RTE/Device/STM32U585AIIx/stm32u585xx_flash_ns.ld b/Examples/Fault/B-U585I-IOT02A/NonSecure/RTE/Device/STM32U585AIIx/stm32u585xx_flash_ns.ld
@@ -277,7 +277,7 @@ SECTIONS
   /* Uninitialized memory for Fault information (ARM_FaultInfo) */
   .noinit.fault 0x200B0000 (NOLOAD) :
   {
-    *(.bss.noinit.fault)
+    *(.noinit.fault)
   } > RAM
 
   /* This section contains data that is not initialised
@@ -287,7 +287,7 @@ SECTIONS
   {
     . = ALIGN(4);
     PROVIDE (__noinit_start = .);
-    *(.bss.noinit)
+    *(.noinit)
     . = ALIGN(4);
     PROVIDE (__noinit_end = .);
   } > RAM

diff --git a/Examples/Fault/B-U585I-IOT02A/NonSecure/RTE/Device/STM32U585AIIx/stm32u585xx_flash_ns.sct b/Examples/Fault/B-U585I-IOT02A/NonSecure/RTE/Device/STM32U585AIIx/stm32u585xx_flash_ns.sct
@@ -99,12 +99,12 @@ LR_APP __LR_BASE __LR_SIZE  {                                        /* load reg
   }
 
   RW_NOINIT_FAULT 0x200B0000 UNINIT 0x100 {                          /* Uninitialized memory for Fault information (ARM_FaultInfo) */
-    *(.bss.noinit.fault)
+    *(.noinit.fault)
   }
 
 #if __NOINIT_SIZE > 0
   RW_NOINIT __RW_NOINIT_BASE UNINIT __NOINIT_SIZE {                  /* no init data */
-    *(.bss.noinit)
+    *(.noinit)
   }
 #endif
 

diff --git a/Examples/Fault/B-U585I-IOT02A/Secure/RTE/Device/STM32U585AIIx/stm32u585xx_flash_s.ld b/Examples/Fault/B-U585I-IOT02A/Secure/RTE/Device/STM32U585AIIx/stm32u585xx_flash_s.ld
@@ -303,7 +303,7 @@ SECTIONS
   {
     . = ALIGN(4);
     PROVIDE (__noinit_start = .);
-    *(.bss.noinit)
+    *(.noinit)
     . = ALIGN(4);
     PROVIDE (__noinit_end = .);
   } > RAM
@@ -345,6 +345,6 @@ SECTIONS
   /* Uninitialized memory for Fault information (ARM_FaultInfo) */
   .noinit.fault 0x200B0000 (NOLOAD) :
   {
-    *(.bss.noinit.fault)
+    *(.noinit.fault)
   } > RAM_NS
 }
diff --git a/Examples/Fault/B-U585I-IOT02A/Secure/RTE/Device/STM32U585AIIx/stm32u585xx_flash_s.sct b/Examples/Fault/B-U585I-IOT02A/Secure/RTE/Device/STM32U585AIIx/stm32u585xx_flash_s.sct
@@ -109,7 +109,7 @@ LR_APP __LR_BASE __LR_SIZE  {                                        /* load reg
 
 #if __NOINIT_SIZE > 0
   RW_NOINIT __RW_NOINIT_BASE UNINIT __NOINIT_SIZE {                  /* no init data */
-    *(.bss.noinit)
+    *(.noinit)
   }
 #endif
 
@@ -125,7 +125,7 @@ LR_APP __LR_BASE __LR_SIZE  {                                        /* load reg
   }
 
   RW_NS_NOINIT_FAULT 0x200B0000 UNINIT 0x100 {                       /* Uninitialized memory for Fault information (ARM_FaultInfo) */
-    *(.bss.noinit.fault)
+    *(.noinit.fault)
   }
 }
 

diff --git a/Examples/Fault/VHT_MPS2_Cortex-M7/RTE/Device/CMSDK_CM7_SP_VHT/ac6_arm.sct b/Examples/Fault/VHT_MPS2_Cortex-M7/RTE/Device/CMSDK_CM7_SP_VHT/ac6_arm.sct
@@ -79,7 +79,8 @@ LR_ROM __RO_BASE __RO_SIZE  {                       ; load region size_region
 
 #if __NOINIT_SIZE > 0
   RW_NOINIT __RW_NOINIT_BASE UNINIT __NOINIT_SIZE { ; no init data
-    *(.bss.noinit*)
+    *(.noinit)
+    *(.noinit.*)
   }
 #endif
 

diff --git a/Examples/Fault/VHT_MPS2_Cortex-M7/RTE/Device/CMSDK_CM7_SP_VHT/gcc_arm.ld b/Examples/Fault/VHT_MPS2_Cortex-M7/RTE/Device/CMSDK_CM7_SP_VHT/gcc_arm.ld
@@ -117,7 +117,7 @@ SECTIONS
   /*
    * SG veneers:
    * All SG veneers are placed in the special output section .gnu.sgstubs. Its start address
-   * must be set, either with the command line option �--section-start� or in a linker script,
+   * must be set, either with the command line option '--section-start' or in a linker script,
    * to indicate where to place these veneers in memory.
    */
 /*
@@ -269,7 +269,8 @@ SECTIONS
   {
     . = ALIGN(4);
     PROVIDE (__noinit_start = .);
-    *(.bss.noinit*)
+    *(.noinit)
+    *(.noinit.*)
     . = ALIGN(4);
     PROVIDE (__noinit_end = .);
   } > RAM

diff --git a/Fault/Source/ARM_FaultStorage.c b/Fault/Source/ARM_FaultStorage.c
@@ -33,7 +33,7 @@
 #endif
 #if !defined(__NO_INIT_FAULT)
 //lint -esym(9071, __NO_INIT_FAULT) "Suppress: defined macro is reserved to the compiler"
-#define __NO_INIT_FAULT __attribute__ ((section (".bss.noinit.fault")))
+#define __NO_INIT_FAULT __attribute__ ((section (".noinit.fault")))
 #endif
 
 #if    (ARM_FAULT_FAULT_REGS_EXIST != 0)