Skip to content

Commit 5ea3b32

Browse files
committed
Fixing uvision exporter with CPM updates
1 parent 00f204f commit 5ea3b32

File tree

1 file changed

+7
-7
lines changed

1 file changed

+7
-7
lines changed

tools/export/uvision/__init__.py

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@ def generate_flash_dll(self):
8585
# Default according to Keil developer
8686
ramsize = '1000'
8787
if len(RAMS) >= 1:
88-
ramstart = RAMS[0][0]
88+
ramstart = '{:x}'.format(RAMS[0][0])
8989
extra_flags = []
9090
for info in self.target_info["algorithms"]:
9191
if not info:
@@ -103,9 +103,9 @@ def generate_flash_dll(self):
103103
rom_start_flag = "-FS" + str(fl_count) + str(start)
104104
rom_size_flag = "-FL" + str(fl_count) + str(size)
105105

106-
if info["ramstart"] is not None and info["ramsize"] is not None:
107-
ramstart = '{:x}'.format(info["ramstart"])
108-
ramsize = '{:x}'.format(info["ramsize"])
106+
if info["ram_start"] is not None and info["ram_size"] is not None:
107+
ramstart = '{:x}'.format(info["ram_start"])
108+
ramsize = '{:x}'.format(info["ram_size"])
109109

110110
path_flag = "-FP{}($$Device:{}${})".format(
111111
str(fl_count), self.dname, name
@@ -318,8 +318,8 @@ def is_target_supported(cls, target_name):
318318
else:
319319
if not (set(target.supported_toolchains).intersection(
320320
set(["ARM", "uARM"]))):
321-
return False
322-
321+
return False
322+
323323
if not DeviceCMSIS.check_supported(target_name):
324324
return False
325325
if "Cortex-A" in target.core:
@@ -347,7 +347,7 @@ def is_target_supported(cls, target_name):
347347
else:
348348
if "ARMC6" not in target.supported_toolchains:
349349
return False
350-
350+
351351
if not DeviceCMSIS.check_supported(target_name):
352352
return False
353353
if "Cortex-A" in target.core:

0 commit comments

Comments
 (0)