From d7c95cb2a28e125f757c197c4fda79e445e961e0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20Mu=C4=87ko?= <piotr.mucko@qt.io>
Date: Fri, 23 Sep 2022 16:30:36 +0200
Subject: [PATCH] Remove e2 project package from jsons

Change-Id: Id91add0a0eb77748db5877e2915ca0b2dbdf6d28
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Yasser Grimes <yasser.grimes@qt.io>
---
 .../test/armgcc_ek_ra6m3g_baremetal_json.h    |  9 -----
 .../test/iar_ek_ra6m3g_baremetal_json.h       | 35 +++++++++++--------
 2 files changed, 20 insertions(+), 24 deletions(-)

diff --git a/src/plugins/mcusupport/test/armgcc_ek_ra6m3g_baremetal_json.h b/src/plugins/mcusupport/test/armgcc_ek_ra6m3g_baremetal_json.h
index 356e7b3e4d3..c4da86afb40 100644
--- a/src/plugins/mcusupport/test/armgcc_ek_ra6m3g_baremetal_json.h
+++ b/src/plugins/mcusupport/test/armgcc_ek_ra6m3g_baremetal_json.h
@@ -25,15 +25,6 @@ constexpr auto armgcc_ek_ra6m3g_baremetal_json = R"(
                     "unix": "/opt/SEGGER/JLink"
                 },
                 "optional": true
-            },
-            {
-                "cmakeVar": "EK_RA6M3G_E2_PROJECT_PATH",
-                "defaultValue": "%{Env:HOME}/e2_studio/workspace/",
-                "id": "EK_RA6M3G_E2_PROJECT_PATH",
-                "label": "Path to project for Renesas e2 Studio",
-                "optional": true,
-                "setting": "RenesasE2ProjectPath",
-                "type": "path"
             }
         ]
     },
diff --git a/src/plugins/mcusupport/test/iar_ek_ra6m3g_baremetal_json.h b/src/plugins/mcusupport/test/iar_ek_ra6m3g_baremetal_json.h
index 03b9626dd50..311cdc5dcb4 100644
--- a/src/plugins/mcusupport/test/iar_ek_ra6m3g_baremetal_json.h
+++ b/src/plugins/mcusupport/test/iar_ek_ra6m3g_baremetal_json.h
@@ -8,25 +8,30 @@ constexpr auto iar_ek_ra6m3g_baremetal_json = R"(
     "qulVersion": "2.3.0",
     "compatVersion": "1",
     "platform": {
-        "id": "TVIIC2D6M-BAREMETAL",
-        "vendor": "CYPRESS",
+        "id": "EK-RA6M3G-BAREMETAL",
+        "vendor": "RENESAS",
         "colorDepths": [
-            32
+            16
         ],
         "cmakeEntries": [
             {
-                "id": "INFINEON_AUTO_FLASH_UTILITY_DIR",
-                "label": "Cypress Auto Flash Utility",
+                "cmakeVar": "JLINK_PATH",
+                "setting": "JLinkPath",
+                "envVar": "JLINK_PATH",
+                "label": "Path to SEGGER J-Link",
                 "type": "path",
-                "cmakeVar": "INFINEON_AUTO_FLASH_UTILITY_DIR",
-                "optional": false
+                "defaultValue": {
+                    "windows": "%{Env:PROGRAMSANDFILES}/SEGGER/JLink",
+                    "unix": "/opt/SEGGER/JLink"
+                },
+                "optional": true
             }
         ]
     },
     "toolchain": {
         "id": "iar",
         "versions": [
-            "8.22.3"
+            "9.20.4"
         ],
         "compiler": {
             "id": "IARToolchain",
@@ -51,15 +56,15 @@ constexpr auto iar_ek_ra6m3g_baremetal_json = R"(
         }
     },
     "boardSdk": {
-        "envVar": "TVII_GRAPHICS_DRIVER_DIR",
-        "versions": [
-            "V1e.1.0"
-        ],
-        "id": "TVII_GRAPHICS_DRIVER_DIR",
-        "label": "Graphics Driver for Traveo II Cluster Series",
         "cmakeVar": "QUL_BOARD_SDK_DIR",
+        "envVar": "EK_RA6M3G_FSP_PATH",
+        "id": "EK_RA6M3G_FSP_PATH",
+        "label": "Flexible Software Package for Renesas RA MCU Family",
+        "optional": false,
         "type": "path",
-        "optional": false
+        "versions": [
+            "3.8.0"
+        ]
     }
 }
 )";