[nrf fromtree] samples: boards: nordic: coresight_stm: Add flpr and p…

…pr support Add flpr and ppr core to the sample. Since there are only 2 UARTs available on DK, local UART configuration is using only cpuapp and cpurad. Signed-off-by: Krzysztof Chruściński <[email protected]> (cherry picked from commit d11997d)
nrfconnect · Sep 30, 2024 · ce408aa · ce408aa
1 parent 0684fbd
commit ce408aa
Show file tree

Hide file tree

Showing 6 changed files with 57 additions and 15 deletions.
diff --git a/samples/boards/nrf/coresight_stm/Kconfig.sysbuild b/samples/boards/nrf/coresight_stm/Kconfig.sysbuild
@@ -4,6 +4,8 @@
 
 source "share/sysbuild/Kconfig"
 
-config RAD_CORE_BOARD
-string
-	default "nrf54h20dk/nrf54h20/cpurad" if $(BOARD) = "nrf54h20dk"
+config APP_CPUPPR_RUN
+	bool "Use PPR"
+
+config APP_CPUFLPR_RUN
+	bool "Use FLPR"
diff --git a/samples/boards/nrf/coresight_stm/boards/nrf54h20dk_nrf54h20_cpuapp.overlay b/samples/boards/nrf/coresight_stm/boards/nrf54h20dk_nrf54h20_cpuapp.overlay
@@ -0,0 +1,16 @@
+/*
+ * Copyright (c) 2024 Nordic Semiconductor
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+&cpuppr_vpr {
+	status = "okay";
+};
+
+&cpuppr_ram3x_region {
+	status = "okay";
+};
+
+&cpuflpr_vpr {
+	status = "okay";
+};
diff --git a/samples/boards/nrf/coresight_stm/remote/prj.conf b/samples/boards/nrf/coresight_stm/remote/prj.conf
@@ -1 +1,6 @@
 CONFIG_LOG=y
+CONFIG_CONSOLE=n
+CONFIG_UART_CONSOLE=n
+CONFIG_SERIAL=n
+CONFIG_BOOT_BANNER=n
+CONFIG_PRINTK=n
diff --git a/samples/boards/nrf/coresight_stm/sample.yaml b/samples/boards/nrf/coresight_stm/sample.yaml
@@ -11,6 +11,9 @@ tests:
     build_only: true
     required_snippets:
       - nordic-log-stm-dict
+    extra_args:
+      - SB_CONFIG_APP_CPUPPR_RUN=y
+      - SB_CONFIG_APP_CPUFLPR_RUN=y
   sample.boards.nrf.coresight_stm:
     platform_allow:
       - nrf54h20dk/nrf54h20/cpuapp
@@ -26,6 +29,9 @@ tests:
         - "Timing for log message with 2 arguments:"
         - "Timing for log message with 3 arguments:"
         - "Timing for log_message with string:"
+    extra_args:
+      - SB_CONFIG_APP_CPUPPR_RUN=y
+      - SB_CONFIG_APP_CPUFLPR_RUN=y
     required_snippets:
       - nordic-log-stm
   sample.boards.nrf.coresight_stm.local_uart:

diff --git a/samples/boards/nrf/coresight_stm/src/main.c b/samples/boards/nrf/coresight_stm/src/main.c
@@ -5,7 +5,6 @@
  */
 
 #include <zephyr/kernel.h>
-#include <zephyr/sys/printk.h>
 #include <zephyr/logging/log.h>
 
 #ifdef CONFIG_LOG_FRONTEND_STMESP
@@ -37,6 +36,8 @@ static void get_core_name(void)
 		core_name = "rad";
 	} else if (strstr(CONFIG_BOARD_TARGET, "cpuppr")) {
 		core_name = "ppr";
+	} else if (strstr(CONFIG_BOARD_TARGET, "cpuflpr")) {
+		core_name = "flpr";
 	}
 }
 
@@ -49,7 +50,7 @@ static void timing_report(uint32_t t, uint32_t rpt, const char *str)
 {
 	uint32_t ns = t_to_ns(t, rpt, CONFIG_SYS_CLOCK_HW_CYCLES_PER_SEC);
 
-	printk("%s: Timing for %s: %d.%dus\n", core_name, str, ns / 1000, (ns % 1000) / 10);
+	LOG_RAW("%s: Timing for %s: %d.%dus\n", core_name, str, ns / 1000, (ns % 1000) / 10);
 }
 
 int main(void)

diff --git a/samples/boards/nrf/coresight_stm/sysbuild.cmake b/samples/boards/nrf/coresight_stm/sysbuild.cmake
@@ -1,16 +1,28 @@
 # Copyright (c) 2024 Nordic Semiconductor ASA
 # SPDX-License-Identifier: Apache-2.0
 
-if("${SB_CONFIG_RAD_CORE_BOARD}" STREQUAL "")
-	message(FATAL_ERROR
-	"Target ${BOARD} not supported for this sample. "
-	"There is no remote board selected in Kconfig.sysbuild")
-endif()
-
-set(RAD_APP remote)
+set(REMOTE_APP remote)
 
 ExternalZephyrProject_Add(
-	APPLICATION ${RAD_APP}
-	SOURCE_DIR  ${APP_DIR}/${RAD_APP}
-	BOARD       ${SB_CONFIG_RAD_CORE_BOARD}
+	APPLICATION ${REMOTE_APP}_rad
+	SOURCE_DIR  ${APP_DIR}/${REMOTE_APP}
+	BOARD ${SB_CONFIG_BOARD}/${SB_CONFIG_SOC}/cpurad
 )
+
+# There are sample configurations which do not use PPR.
+if(SB_CONFIG_APP_CPUPPR_RUN)
+	ExternalZephyrProject_Add(
+		APPLICATION ${REMOTE_APP}_ppr
+		SOURCE_DIR  ${APP_DIR}/${REMOTE_APP}
+		BOARD ${SB_CONFIG_BOARD}/${SB_CONFIG_SOC}/cpuppr
+	)
+endif()
+
+# There are sample configurations which do not use FLPR.
+if(SB_CONFIG_APP_CPUFLPR_RUN)
+	ExternalZephyrProject_Add(
+		APPLICATION ${REMOTE_APP}_flpr
+		SOURCE_DIR  ${APP_DIR}/${REMOTE_APP}
+		BOARD ${SB_CONFIG_BOARD}/${SB_CONFIG_SOC}/cpuflpr
+	)
+endif()