From df46f7abb711e1b9041bf268cc44f79f566a76dc Mon Sep 17 00:00:00 2001
From: GitHub Actions <actions@github.com>
Date: Thu, 12 Sep 2024 18:34:11 +0000
Subject: [PATCH] Update Zephyr MSDK Hal based on MSDK PR:
 https://github.com/analogdevicesinc/msdk/pull/1171

---
 MAX/CMakeLists.txt                            |  1 +
 .../PeriphDrivers/Source/SYS/sys_me30.c       |  2 ++
 MAX/Source/MAX32657/partition_max32657.h      | 27 +++++++++++++++++++
 MAX/msdk_sha                                  |  2 +-
 4 files changed, 31 insertions(+), 1 deletion(-)
 create mode 100644 MAX/Source/MAX32657/partition_max32657.h

diff --git a/MAX/CMakeLists.txt b/MAX/CMakeLists.txt
index 69499e2a..717feffc 100644
--- a/MAX/CMakeLists.txt
+++ b/MAX/CMakeLists.txt
@@ -40,6 +40,7 @@ set(MSDK_PERIPH_INC_DIR  ${MSDK_PERIPH_DIR}/Include/${TARGET_UC})
 
 zephyr_include_directories(
     ./Include
+    ./Source/${TARGET_UC}
     ${MSDK_LIBRARY_DIR}/CMSIS/Include
     ${MSDK_CMSIS_DIR}/Include
     ${MSDK_PERIPH_INC_DIR}
diff --git a/MAX/Libraries/PeriphDrivers/Source/SYS/sys_me30.c b/MAX/Libraries/PeriphDrivers/Source/SYS/sys_me30.c
index 726bb9d2..b6b28689 100644
--- a/MAX/Libraries/PeriphDrivers/Source/SYS/sys_me30.c
+++ b/MAX/Libraries/PeriphDrivers/Source/SYS/sys_me30.c
@@ -504,6 +504,7 @@ void MXC_SYS_Reset_Periph(mxc_sys_reset_t reset)
     }
 }
 
+#if CONFIG_TRUSTED_EXECUTION_SECURE
 /* ************************************************************************** */
 int MXC_SYS_LockDAP_Permanent(void)
 {
@@ -542,5 +543,6 @@ int MXC_SYS_LockDAP_Permanent(void)
     return err;
 #endif
 }
+#endif
 
 /**@} end of mxc_sys */
diff --git a/MAX/Source/MAX32657/partition_max32657.h b/MAX/Source/MAX32657/partition_max32657.h
new file mode 100644
index 00000000..1f55ac96
--- /dev/null
+++ b/MAX/Source/MAX32657/partition_max32657.h
@@ -0,0 +1,27 @@
+/******************************************************************************
+ *
+ * Copyright (C) 2024 Analog Devices, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ ******************************************************************************/
+
+#ifndef LIBRARIES_ZEPHYR_MAX_SOURCE_MAX32657_PARTITION_MAX32657_H_
+#define LIBRARIES_ZEPHYR_MAX_SOURCE_MAX32657_PARTITION_MAX32657_H_
+
+void TZ_SAU_Setup(void)
+{
+    /* Added empty function to use MSDK file as it is */
+}
+
+#endif // LIBRARIES_ZEPHYR_MAX_SOURCE_MAX32657_PARTITION_MAX32657_H_
diff --git a/MAX/msdk_sha b/MAX/msdk_sha
index 6a12e94e..3448805d 100644
--- a/MAX/msdk_sha
+++ b/MAX/msdk_sha
@@ -1 +1 @@
-71ad37473f4ec7121e74d06336633d7c6e5ec553
+74a08bdd0ab32b290acb364672a6bf6f75b0bdc4