From d7ccab94012d71213f0ec0bbab3359ad051ed68d Mon Sep 17 00:00:00 2001
From: MiloradCvjetkovic <milorad.cvjetkovic@arm.com>
Date: Wed, 29 Nov 2023 12:57:56 +0100
Subject: [PATCH] Fixed typo in __NO_INIT__FAULT, BSP reverted to fixed for
 B-U585I-IOT02A example

---
 Examples/Fault/B-U585I-IOT02A/Fault.csolution.yml        | 2 +-
 Examples/Fault/B-U585I-IOT02A/NonSecure/Fault_NS.uvprojx | 2 +-
 Examples/Fault/B-U585I-IOT02A/Secure/Fault_S.uvprojx     | 2 +-
 Fault/Source/ARM_FaultStorage.c                          | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/Examples/Fault/B-U585I-IOT02A/Fault.csolution.yml b/Examples/Fault/B-U585I-IOT02A/Fault.csolution.yml
index e7e3318..2452271 100644
--- a/Examples/Fault/B-U585I-IOT02A/Fault.csolution.yml
+++ b/Examples/Fault/B-U585I-IOT02A/Fault.csolution.yml
@@ -5,7 +5,7 @@ solution:
 
   packs:
     - pack: Keil::STM32U5xx_DFP@2.1.0
-    - pack: Keil::B-U585I-IOT02A_BSP
+    - pack: Keil::B-U585I-IOT02A_BSP@1.0.0
 
   target-types:
     - type: HW
diff --git a/Examples/Fault/B-U585I-IOT02A/NonSecure/Fault_NS.uvprojx b/Examples/Fault/B-U585I-IOT02A/NonSecure/Fault_NS.uvprojx
index 6a67d44..40b9a17 100644
--- a/Examples/Fault/B-U585I-IOT02A/NonSecure/Fault_NS.uvprojx
+++ b/Examples/Fault/B-U585I-IOT02A/NonSecure/Fault_NS.uvprojx
@@ -712,7 +712,7 @@
       </package>
       <package name="B-U585I-IOT02A_BSP" schemaVersion="1.7.2" url="https://github.com/MDK-Packs/Pack/raw/master/B-U585I-IOT02A_BSP/" vendor="Keil" version="1.0.0">
         <targetInfos>
-          <targetInfo name="B-U585I-IOT02A"/>
+          <targetInfo name="B-U585I-IOT02A" versionMatchMode="fixed"/>
         </targetInfos>
       </package>
       <package name="STM32U5xx_DFP" schemaVersion="1.7.15" url="https://www.keil.com/pack/" vendor="Keil" version="2.1.0">
diff --git a/Examples/Fault/B-U585I-IOT02A/Secure/Fault_S.uvprojx b/Examples/Fault/B-U585I-IOT02A/Secure/Fault_S.uvprojx
index 7965950..d197ac4 100644
--- a/Examples/Fault/B-U585I-IOT02A/Secure/Fault_S.uvprojx
+++ b/Examples/Fault/B-U585I-IOT02A/Secure/Fault_S.uvprojx
@@ -687,7 +687,7 @@
       </package>
       <package name="B-U585I-IOT02A_BSP" schemaVersion="1.7.2" url="https://github.com/MDK-Packs/Pack/raw/master/B-U585I-IOT02A_BSP/" vendor="Keil" version="1.0.0">
         <targetInfos>
-          <targetInfo name="B-U585I-IOT02A"/>
+          <targetInfo name="B-U585I-IOT02A" versionMatchMode="fixed"/>
         </targetInfos>
       </package>
       <package name="STM32U5xx_DFP" schemaVersion="1.7.15" url="https://www.keil.com/pack/" vendor="Keil" version="2.1.0">
diff --git a/Fault/Source/ARM_FaultStorage.c b/Fault/Source/ARM_FaultStorage.c
index b39dc2d..9eeb3b7 100644
--- a/Fault/Source/ARM_FaultStorage.c
+++ b/Fault/Source/ARM_FaultStorage.c
@@ -31,7 +31,7 @@
   //lint -esym(9071, __NAKED) "Suppress: defined macro is reserved to the compiler"
   #define __NAKED __attribute__((naked))
 #endif
-#if !defined(__NO_INIT__FAULT)
+#if !defined(__NO_INIT_FAULT)
   //lint -esym(9071, __NO_INIT_FAULT) "Suppress: defined macro is reserved to the compiler"
   #if defined (__ARMCC_VERSION) && (__ARMCC_VERSION >= 6010050)         /* ARM Compiler 6 */
     #define __NO_INIT_FAULT __attribute__ ((section (".bss.noinit.fault")))