modules: openthread: Fix compile warnings introduced by OT stack upmerge

Changes done to accomodate -Wundef introduced flag when compiling OT
2918437bb8

Signed-off-by: Cristian Bulacu <cristian.bulacu@nxp.com>

modules/openthread/CMakeLists.txt

@@ -207,6 +207,13 @@ target_compile_options(ot-config INTERFACE
     -imacros ${AUTOCONF_H}
 )
 
+# FIXME Temporary suppress -Wundef option to avoid warning about
+# MBEDTLS_SSL_DTLS_CONNECTION_ID_COMPAT undefined option. To be removed
+# when the issue is resolved in mbed TLS (the faulty option is already removed
+# on the development branch or there is a pending bugfix for the 3.6 branch
+# https://github.com/Mbed-TLS/mbedtls/pull/10112).
+target_compile_options(ot-config INTERFACE -Wno-undef)
+
 # Openthread depends on errno.h, which includes errno_private.h in minimal libc.
 # errno_private.h is generated as part of ${SYSCALL_LIST_H_TARGET} target.
 add_dependencies(ot-config ${SYSCALL_LIST_H_TARGET})

modules/openthread/platform/openthread-core-zephyr-config.h

@@ -211,10 +211,16 @@
  * in platform.
  *
  */
-#define OPENTHREAD_CONFIG_PLATFORM_USEC_TIMER_ENABLE                                               \
-	((CONFIG_OPENTHREAD_CSL_RECEIVER &&                                                        \
-	  (OPENTHREAD_CONFIG_THREAD_VERSION >= OT_THREAD_VERSION_1_2)) ||                          \
-	 CONFIG_OPENTHREAD_WAKEUP_END_DEVICE)
+#if defined(CONFIG_OPENTHREAD_CSL_RECEIVER) || defined(CONFIG_OPENTHREAD_WAKEUP_END_DEVICE)
+#if defined(CONFIG_OPENTHREAD_CSL_RECEIVER) &&                                              \
+	(OPENTHREAD_CONFIG_THREAD_VERSION >= OT_THREAD_VERSION_1_2)
+#define OPENTHREAD_CONFIG_PLATFORM_USEC_TIMER_ENABLE 1
+#elif defined(CONFIG_OPENTHREAD_WAKEUP_END_DEVICE)
+#define OPENTHREAD_CONFIG_PLATFORM_USEC_TIMER_ENABLE 1
+#else
+#define OPENTHREAD_CONFIG_PLATFORM_USEC_TIMER_ENABLE 0
+#endif
+#endif /* CONFIG_OPENTHREAD_CSL_RECEIVER || CONFIG_OPENTHREAD_WAKEUP_END_DEVICE */
 
 /* Zephyr does not use OpenThread's heap. mbedTLS will use heap memory allocated
  * by Zephyr. Here, we use some dummy values to prevent OpenThread warnings.

west.yml

@@ -340,7 +340,7 @@ manifest:
       revision: c30a6d8b92fcebdb797fc1a7698e8729e250f637
       path: modules/lib/open-amp
     - name: openthread
-      revision: 3ae741f95e7dfb391dec35c48742862049eb62e8
+      revision: 2bc7712f57af22058770d1ef131ad3da79a0c764
       path: modules/lib/openthread
     - name: percepio
       path: modules/debug/percepio