feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

McuSupport: Bring tvii and rh850 kits up to date with latest QUL

Browse Source 
Bring recently changed kits up to date with QUL repository.

Task-number: QTCREATORBUG-28684
Task-number: QTCREATORBUG-28833
Change-Id: Id70268584891a72659930817a5c8458418a9f3b0
Reviewed-by: Yasser Grimes <yasser.grimes@qt.io>
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
This commit is contained in:
Sivert Krøvel
2023-03-21 14:46:15 +01:00
parent e113a12645
commit 22909726eb
5 changed files with 118 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/plugins/mcusupport/test/ghs_rh850_d1m1a_baremetal_json.h
View File

@@ -5,7 +5,7 @@
constexpr auto ghs_rh850_d1m1a_baremetal_json = R"( constexpr auto ghs_rh850_d1m1a_baremetal_json = R"(
{ {
"qulVersion": "2.3.0", "qulVersion": "2.4.0",
"compatVersion": "1", "compatVersion": "1",
"platform": { "platform": {
"id": "RH850-D1M1A-BAREMETAL", "id": "RH850-D1M1A-BAREMETAL",
@@ -19,17 +19,16 @@ constexpr auto ghs_rh850_d1m1a_baremetal_json = R"(
"setting": "FlashProgrammerPath", "setting": "FlashProgrammerPath",
"label": "Renesas Flash Programmer", "label": "Renesas Flash Programmer",
"type": "path", "type": "path",
"setting": "RenesasFlashProgrammer",
"cmakeVar": "RENESAS_FLASH_PROGRAMMER_PATH", "cmakeVar": "RENESAS_FLASH_PROGRAMMER_PATH",
"defaultValue": { "defaultValue": {
"windows": "%{Env:PROGRAMFILES}/Renesas Electronics/Programming Tools/Renesas Flash Programmer V3.09", "linux": "",
"linux": "%{Env:HOME}" "windows": "%{Env:PROGRAMFILES(x86)}/Renesas Electronics/Programming Tools/Renesas Flash Programmer V3.09"
}, },
"detectionPath": { "detectionPath": {
"windows": "rfp-cli.exe", "windows": "rfp-cli.exe",
"linux": "rfp-cli" "linux": "rfp-cli"
}, },
"envVar": "RENESAS_FLASH_PROGRAMMER_PATH", "envVar": "RenesasFlashProgrammer_PATH",
"optional": true, "optional": true,
"addToSystemPath": true "addToSystemPath": true
} }
@@ -45,6 +44,10 @@ constexpr auto ghs_rh850_d1m1a_baremetal_json = R"(
"setting": "GHSToolchain", "setting": "GHSToolchain",
"label": "Green Hills Compiler", "label": "Green Hills Compiler",
"type": "path", "type": "path",
"defaultValue": {
"linux": "",
"windows": "C:/ghs/comp_201815"
},
"optional": false, "optional": false,
"versionDetection": { "versionDetection": {
"filePattern": { "filePattern": {
@@ -71,12 +74,16 @@ constexpr auto ghs_rh850_d1m1a_baremetal_json = R"(
"envVar": "RGL_DIR", "envVar": "RGL_DIR",
"setting": "RGL_DIR", "setting": "RGL_DIR",
"versions": [ "versions": [
"2.0.0",
"2.0.0a" "2.0.0a"
], ],
"label": "Renesas Graphics Library", "label": "Renesas Graphics Library",
"cmakeVar": "QUL_BOARD_SDK_DIR", "cmakeVar": "QUL_BOARD_SDK_DIR",
"type": "path", "type": "path",
"defaultValue": "/Renesas_Electronics/D1x_RGL/rgl_ghs_D1Mx_obj_V.2.0.0a", "defaultValue": {
"linux": "",
"windows": "%{Env:PROGRAMFILES(x86)}/Renesas_Electronics/D1x_RGL/rgl_ghs_D1Mx_obj_V.2.0.0a"
},
"versionDetection": { "versionDetection": {
"regex": "\\d+\\.\\d+\\.\\w+" "regex": "\\d+\\.\\d+\\.\\w+"
}, },

15
src/plugins/mcusupport/test/ghs_tviic2d4m_baremetal_json.h
View File

@@ -5,7 +5,7 @@
constexpr auto ghs_tviic2d4m_baremetal_json = R"( constexpr auto ghs_tviic2d4m_baremetal_json = R"(
{ {
"qulVersion": "2.3.0", "qulVersion": "2.4.0",
"compatVersion": "1", "compatVersion": "1",
"platform": { "platform": {
"id": "TVIIC2D4M-BAREMETAL", "id": "TVIIC2D4M-BAREMETAL",
@@ -16,9 +16,10 @@ constexpr auto ghs_tviic2d4m_baremetal_json = R"(
"cmakeEntries": [ "cmakeEntries": [
{ {
"id": "INFINEON_AUTO_FLASH_UTILITY_DIR", "id": "INFINEON_AUTO_FLASH_UTILITY_DIR",
"setting": "CypressAutoFlashUtil", "setting": "InfineonAutoFlashUtil",
"label": "Cypress Auto Flash Utility", "label": "Infineon Auto Flash Utility",
"type": "path", "type": "path",
"defaultValue": "%{Env:PROGRAMFILES(x86)}/Infineon/Auto Flash Utility 1.2",
"cmakeVar": "INFINEON_AUTO_FLASH_UTILITY_DIR", "cmakeVar": "INFINEON_AUTO_FLASH_UTILITY_DIR",
"detectionPath": "bin/openocd.exe", "detectionPath": "bin/openocd.exe",
"optional": false, "optional": false,
@@ -36,8 +37,8 @@ constexpr auto ghs_tviic2d4m_baremetal_json = R"(
"label": "Green Hills Compiler for ARM", "label": "Green Hills Compiler for ARM",
"cmakeVar": "QUL_TARGET_TOOLCHAIN_DIR", "cmakeVar": "QUL_TARGET_TOOLCHAIN_DIR",
"setting": "GHSArmToolchain", "setting": "GHSArmToolchain",
"detectionPath": "cxarm.exe",
"type": "path", "type": "path",
"defaultValue": "C:/ghs/comp_201954",
"optional": false, "optional": false,
"versionDetection": { "versionDetection": {
"filePattern": "gversion.exe", "filePattern": "gversion.exe",
@@ -59,15 +60,17 @@ constexpr auto ghs_tviic2d4m_baremetal_json = R"(
"envVar": "TVII_GRAPHICS_DRIVER_DIR", "envVar": "TVII_GRAPHICS_DRIVER_DIR",
"setting": "TVII_GRAPHICS_DRIVER_DIR", "setting": "TVII_GRAPHICS_DRIVER_DIR",
"versions": [ "versions": [
"V1e.1.0" "V1.2.0"
], ],
"id": "TVII_GRAPHICS_DRIVER_DIR", "id": "TVII_GRAPHICS_DRIVER_DIR",
"label": "Graphics Driver for Traveo II Cluster Series", "label": "Graphics Driver for Traveo II Cluster Series",
"cmakeVar": "QUL_BOARD_SDK_DIR", "cmakeVar": "QUL_BOARD_SDK_DIR",
"type": "path", "type": "path",
"defaultValue": "C:/TVII-GraphicsDriver",
"optional": false, "optional": false,
"versionDetection": { "versionDetection": {
"regex": "V\\w+\\.\\d+\\.\\d+" "regex": "V\\d+\\.\\d+\\.\\d+"
}
} }
} }
)"; )";

15
src/plugins/mcusupport/test/ghs_tviic2d6m_baremetal_json.h
View File

@@ -5,7 +5,7 @@
constexpr auto ghs_tviic2d6m_baremetal_json = R"( constexpr auto ghs_tviic2d6m_baremetal_json = R"(
{ {
"qulVersion": "2.3.0", "qulVersion": "2.4.0",
"compatVersion": "1", "compatVersion": "1",
"platform": { "platform": {
"id": "TVIIC2D6M-BAREMETAL", "id": "TVIIC2D6M-BAREMETAL",
@@ -16,9 +16,10 @@ constexpr auto ghs_tviic2d6m_baremetal_json = R"(
"cmakeEntries": [ "cmakeEntries": [
{ {
"id": "INFINEON_AUTO_FLASH_UTILITY_DIR", "id": "INFINEON_AUTO_FLASH_UTILITY_DIR",
"setting": "CypressAutoFlashUtil", "setting": "InfineonAutoFlashUtil",
"label": "Cypress Auto Flash Utility", "label": "Infineon Auto Flash Utility",
"type": "path", "type": "path",
"defaultValue": "%{Env:PROGRAMFILES(x86)}/Infineon/Auto Flash Utility 1.2",
"cmakeVar": "INFINEON_AUTO_FLASH_UTILITY_DIR", "cmakeVar": "INFINEON_AUTO_FLASH_UTILITY_DIR",
"detectionPath": "bin/openocd.exe", "detectionPath": "bin/openocd.exe",
"optional": false, "optional": false,
@@ -36,8 +37,8 @@ constexpr auto ghs_tviic2d6m_baremetal_json = R"(
"label": "Green Hills Compiler for ARM", "label": "Green Hills Compiler for ARM",
"cmakeVar": "QUL_TARGET_TOOLCHAIN_DIR", "cmakeVar": "QUL_TARGET_TOOLCHAIN_DIR",
"setting": "GHSArmToolchain", "setting": "GHSArmToolchain",
"detectionPath": "cxarm.exe",
"type": "path", "type": "path",
"defaultValue": "C:/ghs/comp_201954",
"optional": false, "optional": false,
"versionDetection": { "versionDetection": {
"filePattern": "gversion.exe", "filePattern": "gversion.exe",
@@ -59,15 +60,17 @@ constexpr auto ghs_tviic2d6m_baremetal_json = R"(
"envVar": "TVII_GRAPHICS_DRIVER_DIR", "envVar": "TVII_GRAPHICS_DRIVER_DIR",
"setting": "TVII_GRAPHICS_DRIVER_DIR", "setting": "TVII_GRAPHICS_DRIVER_DIR",
"versions": [ "versions": [
"V1e.1.0" "V2e.1.0"
], ],
"id": "TVII_GRAPHICS_DRIVER_DIR", "id": "TVII_GRAPHICS_DRIVER_DIR",
"label": "Graphics Driver for Traveo II Cluster Series", "label": "Graphics Driver for Traveo II Cluster Series",
"cmakeVar": "QUL_BOARD_SDK_DIR", "cmakeVar": "QUL_BOARD_SDK_DIR",
"type": "path", "type": "path",
"defaultValue": "C:/TVII-GraphicsDriver",
"optional": false, "optional": false,
"versionDetection": { "versionDetection": {
"regex": "V\\w+\\.\\d+\\.\\d+" "regex": "V\\d+e\\.\\d+\\.\\d+"
}
} }
} }
)"; )";

77
src/plugins/mcusupport/test/iar_tviic2d4m_baremetal_json.h Normal file
View File

@@ -0,0 +1,77 @@
// Copyright (C) 2022 The Qt Company Ltd.
// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
#pragma once
constexpr auto iar_tviic2d6m_baremetal_json = R"(
{
"qulVersion": "2.4.0",
"compatVersion": "1",
"platform": {
"id": "TVIIC2D4M-BAREMETAL",
"vendor": "CYPRESS",
"colorDepths": [
32
],
"cmakeEntries": [
{
"id": "INFINEON_AUTO_FLASH_UTILITY_DIR",
"setting": "InfineonAutoFlashUtil",
"label": "Infineon Auto Flash Utility",
"type": "path",
"defaultValue": "%{Env:PROGRAMFILES(x86)}/Infineon/Auto Flash Utility 1.2",
"cmakeVar": "INFINEON_AUTO_FLASH_UTILITY_DIR",
"detectionPath": "bin/openocd.exe",
"optional": false,
"addToSystemPath": true
}
]
},
"toolchain": {
"id": "iar",
"versions": [
"8.22.3"
],
"compiler": {
"id": "IARToolchain",
"setting": "IARToolchain",
"envVar": "IAR_ARM_COMPILER_DIR",
"label": "IAR ARM Compiler",
"cmakeVar": "QUL_TARGET_TOOLCHAIN_DIR",
"type": "path",
"versionDetection": {
"filePattern": "bin/iccarm.exe",
"executableArgs": "--version",
"regex": "\\bV(\\d+\\.\\d+\\.\\d+)\\.\\d+\\b"
},
"detectionPath": "bin/iccarm.exe",
"defaultValue": "%{Env:PROGRAMFILES(x86)}/IAR Systems/Embedded Workbench 8.0 EWARM FS 8.22.3/arm",
"optional": false
},
"file": {
"id": "IAR_CMAKE_TOOLCHAIN_FILE",
"cmakeVar": "CMAKE_TOOLCHAIN_FILE",
"type": "file",
"defaultValue": "%{Qul_ROOT}/lib/cmake/Qul/toolchain/iar.cmake",
"visible": false,
"optional": false
}
},
"boardSdk": {
"envVar": "TVII_GRAPHICS_DRIVER_DIR",
"setting": "TVII_GRAPHICS_DRIVER_DIR",
"versions": [
"V1.2.0"
],
"id": "TVII_GRAPHICS_DRIVER_DIR",
"label": "Graphics Driver for Traveo II Cluster Series",
"cmakeVar": "QUL_BOARD_SDK_DIR",
"type": "path",
"defaultValue": "C:/TVII-GraphicsDriver",
"optional": false,
"versionDetection": {
"regex": "V\\d+\\.\\d+\\.\\d+"
}
}
}
)";

19
src/plugins/mcusupport/test/iar_tviic2d6m_baremetal_json.h
View File

@@ -5,7 +5,7 @@
constexpr auto iar_tviic2d6m_baremetal_json = R"( constexpr auto iar_tviic2d6m_baremetal_json = R"(
{ {
"qulVersion": "2.3.0", "qulVersion": "2.4.0",
"compatVersion": "1", "compatVersion": "1",
"platform": { "platform": {
"id": "TVIIC2D6M-BAREMETAL", "id": "TVIIC2D6M-BAREMETAL",
@@ -16,9 +16,10 @@ constexpr auto iar_tviic2d6m_baremetal_json = R"(
"cmakeEntries": [ "cmakeEntries": [
{ {
"id": "INFINEON_AUTO_FLASH_UTILITY_DIR", "id": "INFINEON_AUTO_FLASH_UTILITY_DIR",
"setting": "CypressAutoFlashUtil", "setting": "InfineonAutoFlashUtil",
"label": "Cypress Auto Flash Utility", "label": "Infineon Auto Flash Utility",
"type": "path", "type": "path",
"defaultValue": "%{Env:PROGRAMFILES(x86)}/Infineon/Auto Flash Utility 1.2",
"cmakeVar": "INFINEON_AUTO_FLASH_UTILITY_DIR", "cmakeVar": "INFINEON_AUTO_FLASH_UTILITY_DIR",
"detectionPath": "bin/openocd.exe", "detectionPath": "bin/openocd.exe",
"optional": false, "optional": false,
@@ -39,14 +40,12 @@ constexpr auto iar_tviic2d6m_baremetal_json = R"(
"cmakeVar": "QUL_TARGET_TOOLCHAIN_DIR", "cmakeVar": "QUL_TARGET_TOOLCHAIN_DIR",
"type": "path", "type": "path",
"versionDetection": { "versionDetection": {
"filePattern": { "filePattern": "bin/iccarm.exe",
"windows": "bin/iccarm.exe",
"linux": "bin/iccarm"
},
"executableArgs": "--version", "executableArgs": "--version",
"regex": "\\bV(\\d+\\.\\d+\\.\\d+)\\.\\d+\\b" "regex": "\\bV(\\d+\\.\\d+\\.\\d+)\\.\\d+\\b"
}, },
"detectionPath": "bin/iccarm.exe", "detectionPath": "bin/iccarm.exe",
"defaultValue": "%{Env:PROGRAMFILES(x86)}/IAR Systems/Embedded Workbench 8.0 EWARM FS 8.22.3/arm",
"optional": false "optional": false
}, },
"file": { "file": {
@@ -62,15 +61,17 @@ constexpr auto iar_tviic2d6m_baremetal_json = R"(
"envVar": "TVII_GRAPHICS_DRIVER_DIR", "envVar": "TVII_GRAPHICS_DRIVER_DIR",
"setting": "TVII_GRAPHICS_DRIVER_DIR", "setting": "TVII_GRAPHICS_DRIVER_DIR",
"versions": [ "versions": [
"V1e.1.0" "V2e.1.0"
], ],
"id": "TVII_GRAPHICS_DRIVER_DIR", "id": "TVII_GRAPHICS_DRIVER_DIR",
"label": "Graphics Driver for Traveo II Cluster Series", "label": "Graphics Driver for Traveo II Cluster Series",
"cmakeVar": "QUL_BOARD_SDK_DIR", "cmakeVar": "QUL_BOARD_SDK_DIR",
"type": "path", "type": "path",
"defaultValue": "C:/TVII-GraphicsDriver",
"optional": false, "optional": false,
"versionDetection": { "versionDetection": {
"regex": "V\\w+\\.\\d+\\.\\d+" "regex": "V\\d+e\\.\\d+\\.\\d+"
}
} }
} }
)"; )";