From 0348988ad6af6bcca9900520d38120234dd15c98 Mon Sep 17 00:00:00 2001
From: Daniel DeGrasse <daniel.degrasse@nxp.com>
Date: Tue, 13 Jun 2023 23:11:49 +0000
Subject: [PATCH] samples: ipc: enable openamp sample for RT1170 EVKB

Enable openamp sample for RT1170 EVKB.

Signed-off-by: Daniel DeGrasse <daniel.degrasse@nxp.com>
---
 samples/subsys/ipc/openamp/Kconfig.sysbuild   |  3 +-
 .../openamp/boards/mimxrt1170_evkb_cm7.conf   |  7 +++
 .../boards/mimxrt1170_evkb_cm7.overlay        | 22 +++++++++
 .../remote/boards/mimxrt1170_evkb_cm4.conf    |  8 +++
 .../remote/boards/mimxrt1170_evkb_cm4.overlay | 49 +++++++++++++++++++
 5 files changed, 88 insertions(+), 1 deletion(-)
 create mode 100644 samples/subsys/ipc/openamp/boards/mimxrt1170_evkb_cm7.conf
 create mode 100644 samples/subsys/ipc/openamp/boards/mimxrt1170_evkb_cm7.overlay
 create mode 100644 samples/subsys/ipc/openamp/remote/boards/mimxrt1170_evkb_cm4.conf
 create mode 100644 samples/subsys/ipc/openamp/remote/boards/mimxrt1170_evkb_cm4.overlay

diff --git a/samples/subsys/ipc/openamp/Kconfig.sysbuild b/samples/subsys/ipc/openamp/Kconfig.sysbuild
index 0247dcb45b8dff..7a7963ad16f19d 100644
--- a/samples/subsys/ipc/openamp/Kconfig.sysbuild
+++ b/samples/subsys/ipc/openamp/Kconfig.sysbuild
@@ -1,4 +1,4 @@
-# Copyright 2022 NXP
+# Copyright 2022-2023 NXP
 #
 # SPDX-License-Identifier: Apache-2.0
 
@@ -12,3 +12,4 @@ string
 	default "v2m_musca_b1_ns" if $(BOARD) = "v2m_musca_b1"
 	default "mimxrt1170_evk_cm4" if $(BOARD) = "mimxrt1170_evk_cm7"
 	default "mimxrt1160_evk_cm4" if $(BOARD) = "mimxrt1160_evk_cm7"
+	default "mimxrt1170_evkb_cm4" if $(BOARD) = "mimxrt1170_evkb_cm7"
diff --git a/samples/subsys/ipc/openamp/boards/mimxrt1170_evkb_cm7.conf b/samples/subsys/ipc/openamp/boards/mimxrt1170_evkb_cm7.conf
new file mode 100644
index 00000000000000..ae8dba8cc217f1
--- /dev/null
+++ b/samples/subsys/ipc/openamp/boards/mimxrt1170_evkb_cm7.conf
@@ -0,0 +1,7 @@
+#
+# Copyright 2023, NXP
+#
+# SPDX-License-Identifier: Apache-2.0
+#
+CONFIG_INCLUDE_REMOTE_DIR=y
+CONFIG_SECOND_CORE_MCUX=y
diff --git a/samples/subsys/ipc/openamp/boards/mimxrt1170_evkb_cm7.overlay b/samples/subsys/ipc/openamp/boards/mimxrt1170_evkb_cm7.overlay
new file mode 100644
index 00000000000000..39e6c6896e7f72
--- /dev/null
+++ b/samples/subsys/ipc/openamp/boards/mimxrt1170_evkb_cm7.overlay
@@ -0,0 +1,22 @@
+/*
+ * Copyright 2023 NXP
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+/ {
+	chosen {
+		zephyr,ipc_shm = &ocram2_overlay;
+	};
+
+	/* OpenAMP fails with full 512K OCRAM2 memory region as shared memory.
+	 * Define a subset of the OCRAM2 region for demo to use
+	 * Note that shared memory must have specific MPU attributes set.
+	 */
+	ocram2_overlay: memory@202c0000{
+		compatible = "zephyr,memory-region", "mmio-sram";
+		reg = <0x202c0000 DT_SIZE_K(16)>;
+		zephyr,memory-region="OCRAM2_OVERLAY";
+		zephyr,memory-region-mpu = "IO";
+	};
+};
diff --git a/samples/subsys/ipc/openamp/remote/boards/mimxrt1170_evkb_cm4.conf b/samples/subsys/ipc/openamp/remote/boards/mimxrt1170_evkb_cm4.conf
new file mode 100644
index 00000000000000..7b43b448c72c27
--- /dev/null
+++ b/samples/subsys/ipc/openamp/remote/boards/mimxrt1170_evkb_cm4.conf
@@ -0,0 +1,8 @@
+#
+# Copyright 2023, NXP
+#
+# SPDX-License-Identifier: Apache-2.0
+#
+CONFIG_BUILD_OUTPUT_INFO_HEADER=y
+CONFIG_BUILD_OUTPUT_HEX=y
+CONFIG_SECOND_CORE_MCUX=y
diff --git a/samples/subsys/ipc/openamp/remote/boards/mimxrt1170_evkb_cm4.overlay b/samples/subsys/ipc/openamp/remote/boards/mimxrt1170_evkb_cm4.overlay
new file mode 100644
index 00000000000000..9cdfe651f05556
--- /dev/null
+++ b/samples/subsys/ipc/openamp/remote/boards/mimxrt1170_evkb_cm4.overlay
@@ -0,0 +1,49 @@
+/*
+ * Copyright 2023 NXP
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+/ {
+	/* Switch to lpuart2, since primary core uses lpuart1 */
+	chosen {
+		zephyr,flash = &ocram;
+		zephyr,console = &lpuart2;
+		zephyr,shell-uart = &lpuart2;
+		zephyr,ipc_shm = &ocram2_overlay;
+	};
+
+	soc {
+		/delete-node/ gpt@400f0000;
+
+		/* Replace GPT2 with another GPT kernel timer */
+		gpt2_hw_timer:gpt@400f0000 {
+			compatible = "nxp,gpt-hw-timer";
+			reg = <0x400f0000 0x4000>;
+			interrupts = <120 0>;
+			status = "okay";
+		};
+	};
+
+	/* OpenAMP fails with full 512K OCRAM2 memory region as shared memory.
+	 * Define a subset of the OCRAM2 region for demo to use
+	 * Note that shared memory must have specific MPU attributes set
+	 */
+	ocram2_overlay: memory@202c0000 {
+		compatible = "zephyr,memory-region", "mmio-sram";
+		reg = <0x202c0000 DT_SIZE_K(16)>;
+		zephyr,memory-region="OCRAM2_OVERLAY";
+		zephyr,memory-region-mpu = "IO";
+	};
+};
+
+/* Enable secondary LPUART */
+&lpuart2 {
+	status = "okay";
+	current-speed = <115200>;
+};
+
+/* Disable primary GPT timer */
+&gpt_hw_timer {
+	status = "disabled";
+};