Update Zephyr MSDK Hal based on MSDK PR: analogdevicesinc/msdk#1288

analogdevicesinc · Dec 10, 2024 · da85864 · da85864
1 parent 2154110
commit da85864
Show file tree

Hide file tree

Showing 2 changed files with 32 additions and 3 deletions.
diff --git a/MAX/Libraries/PeriphDrivers/Source/FLC/flc_me30.c b/MAX/Libraries/PeriphDrivers/Source/FLC/flc_me30.c
@@ -183,15 +183,44 @@ int MXC_FLC_MassErase(void)
 }
 
 //******************************************************************************
-__weak int MXC_FLC_UnlockInfoBlock(uint32_t address)
+int MXC_FLC_UnlockInfoBlock(uint32_t address)
 {
+    /* Flash Controller only accessible in secure world. */
+#if defined(CONFIG_TRUSTED_EXECUTION_SECURE) || (CONFIG_TRUSTED_EXECUTION_SECURE != 0)
+    if ((address < MXC_INFO_MEM_BASE) ||
+        (address >= (MXC_INFO_MEM_BASE + (MXC_INFO_MEM_SIZE * 2)))) {
+        return E_BAD_PARAM;
+    }
+#else
     return E_NOT_SUPPORTED;
+#endif
+
+    /* Make sure the info block is locked */
+    MXC_FLC->actrl = 0x1234;
+
+    /* Write the unlock sequence */
+    MXC_FLC->actrl = 0x55bcbe69;
+    MXC_FLC->actrl = 0x7688c189;
+    MXC_FLC->actrl = 0x82306612;
+
+    return E_NO_ERROR;
 }
 
 //******************************************************************************
 int MXC_FLC_LockInfoBlock(uint32_t address)
 {
-    return MXC_FLC_RevA_LockInfoBlock((mxc_flc_reva_regs_t *)MXC_FLC, address);
+    /* Flash Controller only accessible in secure world. */
+#if defined(CONFIG_TRUSTED_EXECUTION_SECURE) || (CONFIG_TRUSTED_EXECUTION_SECURE != 0)
+    if ((address < MXC_INFO_MEM_BASE) ||
+        (address >= (MXC_INFO_MEM_BASE + (MXC_INFO_MEM_SIZE * 2)))) {
+        return E_BAD_PARAM;
+    }
+#else
+    return E_NOT_SUPPORTED;
+#endif
+
+    MXC_FLC->actrl = 0xDEADBEEF;
+    return E_NO_ERROR;
 }
 
 //******************************************************************************

diff --git a/MAX/msdk_sha b/MAX/msdk_sha
@@ -1 +1 @@
-ae0b07b345d1ad7e14bc3f17cfa723a85bd9290c
+eeb59b53912d2831e115f18a2a0dad9b5e3f21af
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		ae0b07b345d1ad7e14bc3f17cfa723a85bd9290c
		eeb59b53912d2831e115f18a2a0dad9b5e3f21af