Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions tools/projmgr/include/ProjMgrParser.h
Original file line number Diff line number Diff line change
Expand Up @@ -120,13 +120,15 @@ struct ProcessorItem {
* start
* size
* algorithm
* pname
*/
struct MemoryItem {
std::string name;
std::string access;
std::string start;
std::string size;
std::string algorithm;
std::string pname;
};

/**
Expand Down
1 change: 1 addition & 0 deletions tools/projmgr/schemas/common.schema.json
Original file line number Diff line number Diff line change
Expand Up @@ -2108,6 +2108,7 @@
"access": { "title": "access:", "$ref": "#/definitions/MemoryAccessType" },
"start": { "title": "start:", "type": "number", "description": "Base address of the memory." },
"size": { "title": "size:", "type": "number", "description": "Size of the memory." },
"pname": { "title": "pname:", "type": "string", "description": "Only accessible by the specified processor." },
"algorithm":{ "title": "algorithm:", "type": "string", "description": "Programming algorithm for download." }
},
"additionalProperties": false,
Expand Down
1 change: 1 addition & 0 deletions tools/projmgr/src/ProjMgrRunDebug.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -229,6 +229,7 @@ bool ProjMgrRunDebug::CollectSettings(const vector<ContextItem*>& contexts, cons
memItem.access = memory.access;
memItem.start = RteUtils::StringToULL(memory.start);
memItem.size = RteUtils::StringToULL(memory.size);
memItem.pname = memory.pname;
m_runDebug.systemResources.memories.push_back(memItem);
if (!memory.algorithm.empty()) {
AlgorithmType algoItem;
Expand Down
1 change: 1 addition & 0 deletions tools/projmgr/src/ProjMgrYamlParser.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -1097,6 +1097,7 @@ bool ProjMgrYamlParser::ParseTargetType(const YAML::Node& parent, const string&
MemoryItem memoryItem;
ParseString(memoryEntry, YAML_NAME, memoryItem.name);
ParseString(memoryEntry, YAML_ACCESS, memoryItem.access);
ParseString(memoryEntry, YAML_PNAME, memoryItem.pname);
ParseString(memoryEntry, YAML_ALGORITHM, memoryItem.algorithm);
ParseNumber(memoryEntry, file, YAML_START, memoryItem.start);
ParseNumber(memoryEntry, file, YAML_SIZE, memoryItem.size);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,11 @@ cbuild-run:
size: 0x00020000
default: true
from-pack: ARM::RteTest_DFP@0.2.0
- name: CustomMemoryCore0
access: rwx
start: 0x40000000
size: 0x00020000
pname: cm0_core0
processors:
- core: Cortex-M0
revision: r0p0
Expand Down
6 changes: 6 additions & 0 deletions tools/projmgr/test/data/TestRunDebug/run-debug.csolution.yml
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,12 @@ solution:
- image: customLibrary.x
type: lib
- type: TestHW3
memory:
- start: 0x40000000
size: 0x00020000
name: CustomMemoryCore0
access: rwx
pname: cm0_core0
target-set:
- set:
images:
Expand Down
Loading