From dec80da4c0cd8a987d00725ddf5d022ffdfd29a0 Mon Sep 17 00:00:00 2001
From: Mahesh Rao <mahesh.rao@intel.com>
Date: Wed, 13 Sep 2023 11:13:19 +0000
Subject: [PATCH] samples: subsys: shell_module: Add support for
 intel_socfpga_agilex series

Add sip_svc shell support to intel_socfpga_agilex_socdk
and intel_socfpga_agilex5_socdk boards.

Signed-off-by: Mahesh Rao <mahesh.rao@intel.com>
---
 .../boards/intel_socfpga_agilex5_socdk.conf   |  8 +++++++
 .../intel_socfpga_agilex5_socdk.overlay       |  5 ++++
 .../boards/intel_socfpga_agilex_socdk.conf    | 23 +++++++++++++++++++
 .../boards/intel_socfpga_agilex_socdk.overlay | 15 ++++++++++++
 4 files changed, 51 insertions(+)
 create mode 100644 samples/subsys/shell/shell_module/boards/intel_socfpga_agilex_socdk.conf
 create mode 100644 samples/subsys/shell/shell_module/boards/intel_socfpga_agilex_socdk.overlay

diff --git a/samples/subsys/shell/shell_module/boards/intel_socfpga_agilex5_socdk.conf b/samples/subsys/shell/shell_module/boards/intel_socfpga_agilex5_socdk.conf
index ad18b0509ce..489e3f9fe16 100644
--- a/samples/subsys/shell/shell_module/boards/intel_socfpga_agilex5_socdk.conf
+++ b/samples/subsys/shell/shell_module/boards/intel_socfpga_agilex5_socdk.conf
@@ -19,3 +19,11 @@ CONFIG_COUNTER=y
 
 # Enable Timer shell commands
 CONFIG_COUNTER_SHELL=y
+
+#SiP SVC Service
+CONFIG_ARM_SIP_SVC_DRIVER=y
+CONFIG_ARM_SIP_SVC_SUBSYS=y
+CONFIG_ARM_SIP_SVC_SUBSYS_SINGLY_OPEN=y
+
+#SiP SVC Service Shell
+CONFIG_ARM_SIP_SVC_SUBSYS_SHELL=y
diff --git a/samples/subsys/shell/shell_module/boards/intel_socfpga_agilex5_socdk.overlay b/samples/subsys/shell/shell_module/boards/intel_socfpga_agilex5_socdk.overlay
index 86a4fdb4843..a35c307aeca 100644
--- a/samples/subsys/shell/shell_module/boards/intel_socfpga_agilex5_socdk.overlay
+++ b/samples/subsys/shell/shell_module/boards/intel_socfpga_agilex5_socdk.overlay
@@ -26,3 +26,8 @@
 &timer3 {
 	status = "okay";
 };
+
+&sip_smc {
+	status = "okay";
+	zephyr,num-clients = <2>;
+};
diff --git a/samples/subsys/shell/shell_module/boards/intel_socfpga_agilex_socdk.conf b/samples/subsys/shell/shell_module/boards/intel_socfpga_agilex_socdk.conf
new file mode 100644
index 00000000000..22a3788b1b8
--- /dev/null
+++ b/samples/subsys/shell/shell_module/boards/intel_socfpga_agilex_socdk.conf
@@ -0,0 +1,23 @@
+# Copyright (c) 2023, Intel Corporation.
+# SPDX-License-Identifier: Apache-2.0
+
+# Misc
+CONFIG_HEAP_MEM_POOL_SIZE=16384
+CONFIG_SHELL_STACK_SIZE=8192
+
+# Setting the Shell prompt
+CONFIG_SHELL_PROMPT_UART="agilex$ "
+
+# Setting the max argc
+CONFIG_SHELL_ARGC_MAX=12
+
+# Enable the Zephyr boot banner
+CONFIG_BOOT_BANNER=y
+
+#SiP SVC Service
+CONFIG_ARM_SIP_SVC_DRIVER=y
+CONFIG_ARM_SIP_SVC_SUBSYS=y
+CONFIG_ARM_SIP_SVC_SUBSYS_SINGLY_OPEN=y
+
+#SiP SVC Service Shell
+CONFIG_ARM_SIP_SVC_SUBSYS_SHELL=y
diff --git a/samples/subsys/shell/shell_module/boards/intel_socfpga_agilex_socdk.overlay b/samples/subsys/shell/shell_module/boards/intel_socfpga_agilex_socdk.overlay
new file mode 100644
index 00000000000..7b96b8e2b28
--- /dev/null
+++ b/samples/subsys/shell/shell_module/boards/intel_socfpga_agilex_socdk.overlay
@@ -0,0 +1,15 @@
+/*
+ * Copyright (C) 2023 Intel Corporation
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+/*
+ * The overlay file should be used to enable any
+ * dts nodes required by this shell application for this
+ * board.
+ */
+
+&sip_smc {
+	status = "okay";
+	zephyr,num-clients = <2>;
+};