Add default attribute to memory in cbuild-run.yml

Author: jthuangarm

tools/projmgr/include/ProjMgrRunDebug.h

@@ -36,6 +36,7 @@ struct MemoryType {
   std::string access;
   std::string alias;
   std::string fromPack;
+  std::optional<bool> bDefault;
   unsigned long long start = 0;
   unsigned long long size = 0;
   std::string pname;

tools/projmgr/schemas/common.schema.json

@@ -2247,12 +2247,13 @@
     "SystemMemoryType": {
       "type": "object",
       "properties": {
-        "name":      { "type": "string", "description": "Name of the memory region." },
+        "name":      { "type": "string",  "description": "Name of the memory region." },
         "access":    { "$ref": "#/definitions/MemoryAccessType" },
-        "start":     { "type": "number", "description": "Base address of the memory." },
-        "size":      { "type": "number", "description": "Size of the memory." },
-        "pname":     { "type": "string", "description": "Only accessible by the specified processor." },
-        "alias":     { "type": "string", "description": "Name of identical memory exposed at different address." },
+        "start":     { "type": "number",  "description": "Base address of the memory." },
+        "size":      { "type": "number",  "description": "Size of the memory." },
+        "pname":     { "type": "string",  "description": "Only accessible by the specified processor." },
+        "alias":     { "type": "string",  "description": "Name of identical memory exposed at different address." },
+        "default":   { "type": "boolean", "description": "Marks a general-purpose default memory region." },
         "from-pack": { "$ref": "#/definitions/PackID" }
       },
       "additionalProperties": false,

tools/projmgr/src/ProjMgrCbuildRun.cpp

@@ -131,6 +131,9 @@ void ProjMgrCbuildRun::SetResourcesNode(YAML::Node node, const SystemResourcesTy
     SetNodeValue(memoryNode[YAML_SIZE], ProjMgrUtils::ULLToHex(item.size));
     SetNodeValue(memoryNode[YAML_PNAME], item.pname);
     SetNodeValue(memoryNode[YAML_ALIAS], item.alias);
+    if (item.bDefault.has_value()) {
+      memoryNode[YAML_DEFAULT] = item.bDefault.value();
+    }
     SetNodeValue(memoryNode[YAML_FROM_PACK], item.fromPack);
     node[YAML_MEMORY].push_back(memoryNode);
   }

tools/projmgr/src/ProjMgrRunDebug.cpp

@@ -212,6 +212,9 @@ bool ProjMgrRunDebug::CollectSettings(const vector<ContextItem*>& contexts, cons
     item.size = memory->GetAttributeAsULL("size");
     item.fromPack = memory->GetPackageID(true);
     item.pname = memory->GetProcessorName();
+    if (memory->HasAttribute("default")) {
+      item.bDefault = memory->IsDefault();
+    }
     m_runDebug.systemResources.memories.push_back(item);
   }
 

tools/projmgr/test/data/ImageOnly/ref/image-only+CM0.cbuild-run.yml

@@ -21,11 +21,13 @@ cbuild-run:
         access: rx
         start: 0x00000000
         size: 0x00040000
+        default: true
         from-pack: ARM::RteTest_DFP@0.2.0
       - name: IRAM1
         access: rwx
         start: 0x20000000
         size: 0x00020000
+        default: true
         from-pack: ARM::RteTest_DFP@0.2.0
     processors:
       - core: Cortex-M0

tools/projmgr/test/data/ImageOnly/ref/image-only-multicore+CM0.cbuild-run.yml

@@ -21,22 +21,26 @@ cbuild-run:
         start: 0x00000000
         size: 0x00080000
         pname: cm0_core0
+        default: true
         from-pack: ARM::RteTest_DFP@0.2.0
       - name: SRAM_DUAL
         access: rwx
         start: 0x80000000
         size: 0x00020000
         pname: cm0_core1
+        default: true
         from-pack: ARM::RteTest_DFP@0.2.0
       - name: IROM1
         access: rx
         start: 0x00000000
         size: 0x00040000
+        default: true
         from-pack: ARM::RteTest_DFP@0.2.0
       - name: IRAM1
         access: rwx
         start: 0x20000000
         size: 0x00020000
+        default: true
         from-pack: ARM::RteTest_DFP@0.2.0
     processors:
       - core: Cortex-M0

tools/projmgr/test/data/TestRunDebug/ref/custom+TestHW.cbuild-run.yml

@@ -17,11 +17,13 @@ cbuild-run:
         access: rx
         start: 0x00000000
         size: 0x00040000
+        default: true
         from-pack: ARM::RteTest_DFP@0.2.0
       - name: SRAM
         access: rwx
         start: 0x20000000
         size: 0x00020000
+        default: true
         from-pack: ARM::RteTest_DFP@0.2.0
     processors:
       - core: Cortex-M4

tools/projmgr/test/data/TestRunDebug/ref/run-debug+TestHW.cbuild-run.yml

@@ -33,11 +33,13 @@ cbuild-run:
         access: rx
         start: 0x00000000
         size: 0x00040000
+        default: true
         from-pack: ARM::RteTest_DFP@0.2.0
       - name: SRAM
         access: rwx
         start: 0x20000000
         size: 0x00020000
+        default: true
         from-pack: ARM::RteTest_DFP@0.2.0
       - name: CustomMemory
         access: rwx

tools/projmgr/test/data/TestRunDebug/ref/run-debug+TestHW2.cbuild-run.yml

@@ -30,11 +30,13 @@ cbuild-run:
         access: rx
         start: 0x00000000
         size: 0x00040000
+        default: true
         from-pack: ARM::RteTest_DFP@0.2.0
       - name: IRAM1
         access: rwx
         start: 0x20000000
         size: 0x00020000
+        default: true
         from-pack: ARM::RteTest_DFP@0.2.0
       - name: RAM-External
         access: rwx

tools/projmgr/test/data/TestRunDebug/ref/run-debug+TestHW3.cbuild-run.yml

@@ -34,22 +34,26 @@ cbuild-run:
         start: 0x00000000
         size: 0x00080000
         pname: cm0_core0
+        default: true
         from-pack: ARM::RteTest_DFP@0.2.0
       - name: SRAM_DUAL
         access: rwx
         start: 0x80000000
         size: 0x00020000
         pname: cm0_core1
+        default: true
         from-pack: ARM::RteTest_DFP@0.2.0
       - name: IROM1
         access: rx
         start: 0x00000000
         size: 0x00040000
+        default: true
         from-pack: ARM::RteTest_DFP@0.2.0
       - name: IRAM1
         access: rwx
         start: 0x20000000
         size: 0x00020000
+        default: true
         from-pack: ARM::RteTest_DFP@0.2.0
     processors:
       - core: Cortex-M0