[cbuild[-gen].yml] Always output fully qualified device and board identifier

Author: spcaipers-arm

tools/projmgr/src/ProjMgrCbuild.cpp

@@ -62,14 +62,20 @@ void ProjMgrCbuild::SetContextNode(YAML::Node contextNode, const ContextItem* co
   SetNodeValue(contextNode[YAML_CONTEXT], context->name);
   SetNodeValue(contextNode[YAML_COMPILER], context->toolchain.name +
     (context->toolchain.required.empty() || context->toolchain.required == ">=0.0.0" ? "" : '@' + context->toolchain.required));
-  if (!context->board.empty()) {
-    SetNodeValue(contextNode[YAML_BOARD], context->board);
+  if (!context->boardItem.name.empty()) {
+    const auto& board = context->boardItem.vendor + "::" + context->boardItem.name +
+      (context->boardItem.revision.empty() ? "" : ":" + context->boardItem.revision);
+    SetNodeValue(contextNode[YAML_BOARD], board);
     if (context->boardPack != nullptr) {
       SetNodeValue(contextNode[YAML_BOARD_PACK], context->boardPack->GetID());
     }
     SetBooksNode(contextNode[YAML_BOARD_BOOKS], context->boardBooks, context->directories.cbuild);
   }
-  SetNodeValue(contextNode[YAML_DEVICE], context->device);
+  if (!context->deviceItem.name.empty()) {
+    const auto& device = context->deviceItem.vendor + "::" + context->deviceItem.name +
+      (context->deviceItem.pname.empty() ? "" : ":" + context->deviceItem.pname);
+    SetNodeValue(contextNode[YAML_DEVICE], device);
+  }
   if (context->devicePack != nullptr) {
     SetNodeValue(contextNode[YAML_DEVICE_PACK], context->devicePack->GetID());
   }

tools/projmgr/test/data/ExternalGenerator/ref/MultiCore/core0.Debug+MultiCore.cbuild-gen.yml

@@ -6,7 +6,7 @@ build-gen:
   project: ${DEVTOOLS(data)}/ExternalGenerator/multi_0/core0.cproject.yml
   context: core0.Debug+MultiCore
   compiler: AC6
-  device: RteTest_ARMCM0_Dual:cm0_core0
+  device: ARM::RteTest_ARMCM0_Dual:cm0_core0
   device-pack: ARM::[email protected]
   device-books:
     - name: http://infocenter.arm.com/help/topic/com.arm.doc.dui0497a/index.html

tools/projmgr/test/data/ExternalGenerator/ref/MultiCore/core1.Debug+MultiCore.cbuild-gen.yml

@@ -6,7 +6,7 @@ build-gen:
   project: ${DEVTOOLS(data)}/ExternalGenerator/multi_1/core1.cproject.yml
   context: core1.Debug+MultiCore
   compiler: AC6
-  device: RteTest_ARMCM0_Dual:cm0_core1
+  device: ARM::RteTest_ARMCM0_Dual:cm0_core1
   device-pack: ARM::[email protected]
   device-books:
     - name: http://infocenter.arm.com/help/topic/com.arm.doc.dui0497a/index.html

tools/projmgr/test/data/ExternalGenerator/ref/SingleCore/single-core.Debug+Board.cbuild.yml

@@ -4,7 +4,7 @@ build:
   project: single-core.cproject.yml
   context: single-core.Debug+Board
   compiler: AC6
-  board: RteTest CM4 board
+  board: Keil::RteTest CM4 board:Rev.C
   board-pack: ARM::[email protected]
   board-books:
     - name: https://www.keil.arm.com/boards/
@@ -13,7 +13,7 @@ build:
     - name: ${CMSIS_PACK_ROOT}/ARM/RteTestBoard/0.1.0/Documents/README.md
       title: Guide
       category: other
-  device: RteTest_ARMCM4_FP
+  device: ARM::RteTest_ARMCM4_FP
   device-pack: ARM::[email protected]
   device-books:
     - name: http://infocenter.arm.com/help/topic/com.arm.doc.dui0553a/index.html

tools/projmgr/test/data/ExternalGenerator/ref/SingleCore/single-core.Debug+CM0.cbuild-gen.yml

@@ -6,7 +6,7 @@ build-gen:
   project: ${DEVTOOLS(data)}/ExternalGenerator/single/single-core.cproject.yml
   context: single-core.Debug+CM0
   compiler: AC6
-  device: RteTestGen_ARMCM0
+  device: ARM::RteTestGen_ARMCM0
   device-pack: ARM::[email protected]
   processor:
     core: Cortex-M0

tools/projmgr/test/data/ExternalGenerator/ref/SingleCore/single-core.Debug+CM0.cbuild.yml

@@ -4,7 +4,7 @@ build:
   project: single-core.cproject.yml
   context: single-core.Debug+CM0
   compiler: AC6
-  device: RteTestGen_ARMCM0
+  device: ARM::RteTestGen_ARMCM0
   device-pack: ARM::[email protected]
   processor:
     core: Cortex-M0

tools/projmgr/test/data/ExternalGenerator/ref/TrustZone/ns.Debug+CM0.cbuild-gen.yml

@@ -6,7 +6,7 @@ build-gen:
   project: ${DEVTOOLS(data)}/ExternalGenerator/tz_ns/ns.cproject.yml
   context: ns.Debug+CM0
   compiler: AC6
-  device: RteTestGen_ARMCM0
+  device: ARM::RteTestGen_ARMCM0
   device-pack: ARM::[email protected]
   processor:
     trustzone: non-secure

tools/projmgr/test/data/ExternalGenerator/ref/TrustZone/s.Debug+CM0.cbuild-gen.yml

@@ -6,7 +6,7 @@ build-gen:
   project: ${DEVTOOLS(data)}/ExternalGenerator/tz_s/s.cproject.yml
   context: s.Debug+CM0
   compiler: AC6
-  device: RteTestGen_ARMCM0
+  device: ARM::RteTestGen_ARMCM0
   device-pack: ARM::[email protected]
   processor:
     trustzone: secure

tools/projmgr/test/data/TestAccessSequences/ref/pack-access-sequences+CM4-Board.cbuild.yml

@@ -4,7 +4,7 @@ build:
   project: ../data/TestAccessSequences/pack-access-sequences.cproject.yml
   context: pack-access-sequences+CM4-Board
   compiler: AC6
-  board: RteTest CM4 board
+  board: Keil::RteTest CM4 board:Rev.C
   board-pack: ARM::[email protected]
   board-books:
     - name: https://www.keil.arm.com/boards/
@@ -13,7 +13,7 @@ build:
     - name: ${CMSIS_PACK_ROOT}/ARM/RteTestBoard/0.1.0/Documents/README.md
       title: Guide
       category: other
-  device: RteTest_ARMCM4_FP
+  device: ARM::RteTest_ARMCM4_FP
   device-pack: ARM::[email protected]
   device-books:
     - name: http://infocenter.arm.com/help/topic/com.arm.doc.dui0553a/index.html

tools/projmgr/test/data/TestDefault/ref/empty/project.Debug+TEST_TARGET.cbuild.yml

@@ -4,7 +4,7 @@ build:
   project: ../../data/TestDefault/project.cproject.yml
   context: project.Debug+TEST_TARGET
   compiler: GCC
-  device: RteTest_ARMCM0
+  device: ARM::RteTest_ARMCM0
   device-pack: ARM::[email protected]
   device-books:
     - name: http://infocenter.arm.com/help/topic/com.arm.doc.dui0497a/index.html