From 9edbdaf1cc6b20e1a070b9ce20bde88a30f5c35c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Tue, 3 Dec 2024 18:02:10 +0100
Subject: [PATCH] [nrf fromlist] samples: code_relocation_nocopy: Add
 configuration for nRF54H20 DK
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Add nRF54H20 DK specific entries to allow using the sample on this
board.

Upstream PR #: 80042

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 .../boards/nrf54h20dk_nrf54h20_cpuapp.conf      |  1 +
 .../boards/nrf54h20dk_nrf54h20_cpuapp.overlay   | 17 +++++++++++++++++
 .../code_relocation_nocopy/linker_arm_nocopy.ld |  7 +++++++
 3 files changed, 25 insertions(+)
 create mode 100644 samples/application_development/code_relocation_nocopy/boards/nrf54h20dk_nrf54h20_cpuapp.conf
 create mode 100644 samples/application_development/code_relocation_nocopy/boards/nrf54h20dk_nrf54h20_cpuapp.overlay

diff --git a/samples/application_development/code_relocation_nocopy/boards/nrf54h20dk_nrf54h20_cpuapp.conf b/samples/application_development/code_relocation_nocopy/boards/nrf54h20dk_nrf54h20_cpuapp.conf
new file mode 100644
index 00000000000..83035081389
--- /dev/null
+++ b/samples/application_development/code_relocation_nocopy/boards/nrf54h20dk_nrf54h20_cpuapp.conf
@@ -0,0 +1 @@
+CONFIG_FLASH=y
diff --git a/samples/application_development/code_relocation_nocopy/boards/nrf54h20dk_nrf54h20_cpuapp.overlay b/samples/application_development/code_relocation_nocopy/boards/nrf54h20dk_nrf54h20_cpuapp.overlay
new file mode 100644
index 00000000000..ab53f12725d
--- /dev/null
+++ b/samples/application_development/code_relocation_nocopy/boards/nrf54h20dk_nrf54h20_cpuapp.overlay
@@ -0,0 +1,17 @@
+&cpuapp_ram0x_region {
+	nordic,access = <NRF_OWNER_ID_APPLICATION NRF_PERM_RWXS>;
+};
+
+&xip_region {
+	status = "okay";
+	nordic,access = <NRF_OWNER_ID_APPLICATION NRF_PERM_RX>;
+};
+
+&mx25uw63 {
+	read-command = <0xEC13>;
+	command-length = "INSTR_2_BYTE";
+	address-length = "ADDR_4_BYTE";
+	rx-dummy = <20>;
+
+	xip-config = <1 0 0x20000000 0>;
+};
diff --git a/samples/application_development/code_relocation_nocopy/linker_arm_nocopy.ld b/samples/application_development/code_relocation_nocopy/linker_arm_nocopy.ld
index a1467f8e264..0a11783cca2 100644
--- a/samples/application_development/code_relocation_nocopy/linker_arm_nocopy.ld
+++ b/samples/application_development/code_relocation_nocopy/linker_arm_nocopy.ld
@@ -47,6 +47,13 @@
 #define EXTFLASH_ADDR	DT_REG_ADDR(DT_INST(0, st_stm32_xspi_nor))
 #define EXTFLASH_SIZE	DT_REG_ADDR_BY_IDX(DT_INST(0, st_stm32_xspi_nor), 1)
 
+#elif defined(CONFIG_FLASH_MSPI_NOR) && defined(CONFIG_SOC_NRF54H20_CPUAPP)
+
+#define EXTFLASH_NODE	DT_INST(0, jedec_mspi_nor)
+#define EXTFLASH_ADDR	0x60000000
+#define EXTFLASH_SIZE	DT_PROP_OR(EXTFLASH_NODE, size_in_bytes, \
+				   DT_PROP(EXTFLASH_NODE, size) / 8)
+
 #else
 
 /*