From 8b5f35b3fec6e564f0192fd8f7635e414f75d63a Mon Sep 17 00:00:00 2001
From: Peter van der Perk <peter.vanderperk@nxp.com>
Date: Mon, 9 Jan 2023 16:09:47 +0100
Subject: [PATCH] Add S32K3 vscode support add Jlink rtos vscode support

---
 .vscode/cmake-variants.yaml          | 10 ++++++++++
 platforms/nuttx/CMakeLists.txt       | 10 ++++++++++
 platforms/nuttx/Debug/launch.json.in |  1 +
 3 files changed, 21 insertions(+)

diff --git a/.vscode/cmake-variants.yaml b/.vscode/cmake-variants.yaml
index 1f93a5ce3e..08235cc335 100644
--- a/.vscode/cmake-variants.yaml
+++ b/.vscode/cmake-variants.yaml
@@ -266,6 +266,16 @@ CONFIG:
       buildType: MinSizeRel
       settings:
         CONFIG: nxp_fmuk66-v3_default
+    nxp_mr-canhubk3_default:
+      short: nxp_mr-canhubk3_default
+      buildType: MinSizeRel
+      settings:
+        CONFIG: nxp_mr-canhubk3_default
+    nxp_mr-canhubk3_fmu:
+      short: nxp_mr-canhubk3_fmu
+      buildType: MinSizeRel
+      settings:
+        CONFIG: nxp_mr-canhubk3_fmu
     raspberrypi_pico_default:
       short: raspberrypi_pico
       buildType: MinSizeRel
diff --git a/platforms/nuttx/CMakeLists.txt b/platforms/nuttx/CMakeLists.txt
index 391ed2ca60..b559ef96ee 100644
--- a/platforms/nuttx/CMakeLists.txt
+++ b/platforms/nuttx/CMakeLists.txt
@@ -386,6 +386,9 @@ if(NOT NUTTX_DIR MATCHES "external")
 	elseif(CONFIG_ARCH_CHIP_MK66FN2M0VMD18)
 		set(DEBUG_DEVICE "MK66FN2M0xxx18")
 		set(DEBUG_SVD_FILE "MK66F18.svd")
+	elseif(CONFIG_ARCH_CHIP_S32K344)
+		set(DEBUG_DEVICE "S32K344")
+		set(DEBUG_SVD_FILE "S32K344_M7.svd")
 	elseif(CONFIG_ARCH_CHIP_STM32F100C8)
 		set(DEBUG_DEVICE "STM32F100C8")
 		set(DEBUG_SVD_FILE "STM32F100xx.svd")
@@ -451,7 +454,14 @@ if(NOT NUTTX_DIR MATCHES "external")
 	file(GLOB_RECURSE DEBUG_SVD_FILE_PATH
 		LIST_DIRECTORIES false
 		${CMAKE_SOURCE_DIR}/../cmsis-svd/data/*/${DEBUG_SVD_FILE}
+		${CMAKE_SOURCE_DIR}/../svd/${DEBUG_SVD_FILE}
 	)
+
+	file(GLOB_RECURSE JLINK_RTOS_PATH
+		LIST_DIRECTORIES false
+		${CMAKE_SOURCE_DIR}/Tools/jlink-nuttx.so
+	)
+
 	if(DEBUG_SVD_FILE_PATH)
 		message(STATUS "Found SVD: ${DEBUG_SVD_FILE_PATH}")
 	endif()
diff --git a/platforms/nuttx/Debug/launch.json.in b/platforms/nuttx/Debug/launch.json.in
index eff3e90744..7548cabca2 100644
--- a/platforms/nuttx/Debug/launch.json.in
+++ b/platforms/nuttx/Debug/launch.json.in
@@ -5,6 +5,7 @@
             "name": "jlink (@PX4_BOARD@)",
             "device": "@DEBUG_DEVICE@",
             "svdFile": "@DEBUG_SVD_FILE_PATH@",
+            "rtos": "@JLINK_RTOS_PATH@",
             "executable": "${command:cmake.launchTargetPath}",
             "request": "launch",
             "type": "cortex-debug",