Merge branch 'main' into outbound/svdTypesRestructure

Author: thorstendb-ARM

tools/projmgr/src/ProjMgrCbuild.cpp

@@ -159,7 +159,9 @@ void ProjMgrCbuild::SetDebugConfigNode(YAML::Node node, const ContextItem* conte
   map<string, StrVec> dbgconfList;
   for (const auto& debugger : context->debuggers) {
     string dbgconf = debugger.dbgconf.empty() ? context->dbgconf.first : debugger.dbgconf;
-    CollectionUtils::PushBackUniquely(dbgconfList[dbgconf], debugger.name);
+    if (!dbgconf.empty()) {
+      CollectionUtils::PushBackUniquely(dbgconfList[dbgconf], debugger.name);
+    }
   }
   if (dbgconfList.empty() && !context->dbgconf.first.empty()) {
     dbgconfList[context->dbgconf.first];

tools/svdconv/SVDModel/src/SvdItem.cpp

@@ -235,7 +235,7 @@ bool SvdItem::ProcessXmlElement(XMLTreeElement* xmlElement)
 	}
   else if(tag == "protection") {
     const auto svdLevel = GetSvdLevel();
-    if(svdLevel == L_Device || svdLevel == L_Peripheral || svdLevel == L_Register || svdLevel == L_Cluster) {
+    if(svdLevel == L_Device || svdLevel == L_Peripheral || svdLevel == L_Register || svdLevel == L_Cluster || svdLevel == L_AddressBlock) {
       if(!SvdUtils::ConvertProtectionStringType (value, m_protection, xmlElement->GetLineNumber())) {
         SvdUtils::CheckParseError(tag, value, xmlElement->GetLineNumber());
       }