From 2efd34bda32febd07d9618ebb0683a445d3abb62 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 31 Jan 2024 18:34:10 +0100
Subject: [PATCH] modules: hal_nordic: nrfx_glue: Include
 cmsis_core_m_defaults.h
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

... to cover missing __ICACHE_PRESENT and __DCACHE_PRESENT symbols that
should be defined in MDK files.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 modules/hal_nordic/nrfx/nrfx_glue.h | 7 +++++++
 soc/arm/nordic_nrf/nrf54l/soc.h     | 2 --
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/modules/hal_nordic/nrfx/nrfx_glue.h b/modules/hal_nordic/nrfx/nrfx_glue.h
index 2257ea879a3..851cb8a9614 100644
--- a/modules/hal_nordic/nrfx/nrfx_glue.h
+++ b/modules/hal_nordic/nrfx/nrfx_glue.h
@@ -7,6 +7,13 @@
 #ifndef NRFX_GLUE_H__
 #define NRFX_GLUE_H__
 
+#if defined(CONFIG_CPU_CORTEX_M)
+/* Workaround for missing __ICACHE_PRESENT and __DCACHE_PRESENT symbols in MDK
+ * SoC definitions. To be removed when this is fixed.
+ */
+#include <cmsis_core_m_defaults.h>
+#endif
+
 #include <zephyr/sys/__assert.h>
 #include <zephyr/sys/atomic.h>
 #include <zephyr/irq.h>
diff --git a/soc/arm/nordic_nrf/nrf54l/soc.h b/soc/arm/nordic_nrf/nrf54l/soc.h
index 721e9336989..b775fa9d0f3 100644
--- a/soc/arm/nordic_nrf/nrf54l/soc.h
+++ b/soc/arm/nordic_nrf/nrf54l/soc.h
@@ -11,8 +11,6 @@
 #ifndef _NORDICSEMI_NRF54L_SOC_H_
 #define _NORDICSEMI_NRF54L_SOC_H_
 
-#define __ICACHE_PRESENT    1
-
 #include <soc_nrf_common.h>
 
 #define FLASH_PAGE_ERASE_MAX_TIME_US 8000UL