From 3da7c6f3c08d4e10bc32f8e6a0150c205bdbe45d Mon Sep 17 00:00:00 2001 From: Mahesh Mahadevan Date: Thu, 14 Mar 2019 07:24:19 -0500 Subject: [PATCH] Update to provide the right device name in the Asymmetric case Signed-off-by: Mahesh Mahadevan --- tools/export/cmsis/__init__.py | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/tools/export/cmsis/__init__.py b/tools/export/cmsis/__init__.py index f4e4d94a18..a4569122b5 100644 --- a/tools/export/cmsis/__init__.py +++ b/tools/export/cmsis/__init__.py @@ -51,10 +51,14 @@ class DeviceCMSIS(): try: self.dfpu = target_info['processor']['Symmetric']['fpu'] except KeyError: - cmsis_core = self.core.replace("F", "").replace("-", "") - for proc in target_info['processor']['Asymmetric'].values(): + # TODO: refactor this into a "base_core_for" function + cmsis_core = self.core.replace("F", "").replace("-", "").replace("E", "") + cmsis_core = cmsis_core.replace("NS", "") + for core_name, proc in target_info['processor']['Asymmetric'].items(): if proc['core'] == cmsis_core: self.dfpu = proc['fpu'] + self.dname = '{}:{}'.format(self.dname, core_name) + break self.debug, self.dvendor = self.vendor_debug( target_info.get('vendor') or target_info['from_pack']['vendor'] )