From f19aed9130187fff116ca43ded34625551059062 Mon Sep 17 00:00:00 2001
From: Andrei Gansari <andrei.gansari@nxp.com>
Date: Mon, 28 Oct 2019 12:07:52 +0200
Subject: [PATCH] boards: lpcxpresso55s69_cpu1 definitions

LPC55S69 CPU1 definition added.
Dual Core is not enabled!
Definitions related to dual core split of SoC's CPUs.

Signed-off-by: Andrei Gansari <andrei.gansari@nxp.com>
---
 .../lpcxpresso55s69/lpcxpresso55s69_cpu0.dts  |  4 ---
 .../lpcxpresso55s69_cpu0_defconfig            |  5 +++
 .../lpcxpresso55s69/lpcxpresso55s69_cpu1.dts  | 36 +++++++++++++++++++
 .../lpcxpresso55s69/lpcxpresso55s69_cpu1.yaml | 18 ++++++++++
 .../lpcxpresso55s69_cpu1_defconfig            | 18 ++++++++++
 dts/arm/nxp/nxp_lpc55S6x_ns.dtsi              | 11 ++++++
 6 files changed, 88 insertions(+), 4 deletions(-)
 create mode 100644 boards/arm/lpcxpresso55s69/lpcxpresso55s69_cpu1.dts
 create mode 100644 boards/arm/lpcxpresso55s69/lpcxpresso55s69_cpu1.yaml
 create mode 100644 boards/arm/lpcxpresso55s69/lpcxpresso55s69_cpu1_defconfig

diff --git a/boards/arm/lpcxpresso55s69/lpcxpresso55s69_cpu0.dts b/boards/arm/lpcxpresso55s69/lpcxpresso55s69_cpu0.dts
index c3b0654e69b..3eea6c51fd1 100644
--- a/boards/arm/lpcxpresso55s69/lpcxpresso55s69_cpu0.dts
+++ b/boards/arm/lpcxpresso55s69/lpcxpresso55s69_cpu0.dts
@@ -64,10 +64,6 @@
 	status = "okay";
 };
 
-&blue_led {
-	status = "okay";
-};
-
 &red_led {
 	status = "okay";
 };
diff --git a/boards/arm/lpcxpresso55s69/lpcxpresso55s69_cpu0_defconfig b/boards/arm/lpcxpresso55s69/lpcxpresso55s69_cpu0_defconfig
index 2ecae5445a9..6a940699f37 100644
--- a/boards/arm/lpcxpresso55s69/lpcxpresso55s69_cpu0_defconfig
+++ b/boards/arm/lpcxpresso55s69/lpcxpresso55s69_cpu0_defconfig
@@ -14,3 +14,8 @@ CONFIG_CORTEX_M_SYSTICK=y
 CONFIG_GPIO=y
 CONFIG_PINMUX=y
 CONFIG_SYS_CLOCK_HW_CYCLES_PER_SEC=96000000
+
+# Enable TrustZone-M
+CONFIG_TRUSTED_EXECUTION_SECURE=y
+
+CONFIG_RUNTIME_NMI=y
diff --git a/boards/arm/lpcxpresso55s69/lpcxpresso55s69_cpu1.dts b/boards/arm/lpcxpresso55s69/lpcxpresso55s69_cpu1.dts
new file mode 100644
index 00000000000..80a44525afd
--- /dev/null
+++ b/boards/arm/lpcxpresso55s69/lpcxpresso55s69_cpu1.dts
@@ -0,0 +1,36 @@
+/*
+ * Copyright (c) 2019, NXP
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+/dts-v1/;
+
+#include <nxp/nxp_lpc55S6x_ns.dtsi>
+#include "lpcxpresso55s69.dtsi"
+
+/ {
+	model = "NXP LPCXpresso55S69 board";
+	compatible = "nxp,lpc55xxx", "nxp,lpc";
+
+	cpus {
+		/delete-node/ cpu@0;
+	};
+
+	chosen {
+		zephyr,sram = &sram1;
+		zephyr,flash = &flash0;
+	};
+};
+
+&gpio0 {
+	status = "okay";
+};
+
+&gpio1 {
+	status = "okay";
+};
+
+&blue_led {
+	status = "okay";
+};
diff --git a/boards/arm/lpcxpresso55s69/lpcxpresso55s69_cpu1.yaml b/boards/arm/lpcxpresso55s69/lpcxpresso55s69_cpu1.yaml
new file mode 100644
index 00000000000..10d6b49ec59
--- /dev/null
+++ b/boards/arm/lpcxpresso55s69/lpcxpresso55s69_cpu1.yaml
@@ -0,0 +1,18 @@
+#
+# Copyright (c) 2019, NXP
+#
+# SPDX-License-Identifier: Apache-2.0
+#
+
+identifier: lpcxpresso55s69_cpu0
+name: NXP LPCXpresso55S69
+type: mcu
+arch: arm
+ram: 64
+flash: 256
+toolchain:
+  - zephyr
+  - gnuarmemb
+  - xtools
+supported:
+  - gpio
diff --git a/boards/arm/lpcxpresso55s69/lpcxpresso55s69_cpu1_defconfig b/boards/arm/lpcxpresso55s69/lpcxpresso55s69_cpu1_defconfig
new file mode 100644
index 00000000000..6342a135132
--- /dev/null
+++ b/boards/arm/lpcxpresso55s69/lpcxpresso55s69_cpu1_defconfig
@@ -0,0 +1,18 @@
+#
+# Copyright (c) 2019, NXP
+#
+# SPDX-License-Identifier: Apache-2.0
+#
+
+CONFIG_ARM=y
+CONFIG_SOC_SERIES_LPC55XXX=y
+CONFIG_BOARD_LPCXPRESSO55S69_CPU1=y
+CONFIG_CORTEX_M_SYSTICK=y
+CONFIG_GPIO=y
+CONFIG_PINMUX=y
+CONFIG_SYS_CLOCK_HW_CYCLES_PER_SEC=96000000
+
+# Enable TrustZone-M
+CONFIG_TRUSTED_EXECUTION_NONSECURE=y
+
+CONFIG_RUNTIME_NMI=y
diff --git a/dts/arm/nxp/nxp_lpc55S6x_ns.dtsi b/dts/arm/nxp/nxp_lpc55S6x_ns.dtsi
index f5a0bc4dfe9..96c4538319f 100644
--- a/dts/arm/nxp/nxp_lpc55S6x_ns.dtsi
+++ b/dts/arm/nxp/nxp_lpc55S6x_ns.dtsi
@@ -89,6 +89,17 @@
 			};
 		};
 
+		flash_reserved: flash@0009d800 {
+			compatible = "soc-nv-flash";
+			reg = <0x0009d800 DT_SIZE_K(10)>;
+			status = "disabled";
+		};
+
+		boot_rom: flash@3000000 {
+			compatible = "soc-nv-flash";
+			reg = <0x3000000 DT_SIZE_K(128)>;
+		};
+
 		usart0: usart@40086000 {
 			compatible = "nxp,lpc-usart";
 			reg = <0x40086000 0xe44>;