ARMmbed
/
mbed-os
mirror of https://github.com/ARMmbed/mbed-os.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Changed binary naming flag to OUTPUT_NAMING; Fixed binary_hook() to use 3 params

pull/163/head
Mihail Stoyanov 2014-02-10 15:21:57 +00:00 committed by root
parent 9272cdeb45
commit 8c9d70d224
2 changed files with 15 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
workspace_tools/targets.py
View File

@ -193,7 +193,7 @@ class LPC4088(Target):
hook.hook_add_binary("post", self.binary_hook)
@staticmethod
def binary_hook(t_self, resources, elf, binf):
def binary_hook(t_self, elf, binf):
if not os.path.isdir(binf):
# Regular binary file, nothing to do
return
@ -266,6 +266,8 @@ class STM32F407(Target):
class NUCLEO_F103RB(Target):
OUTPUT_NAMING = "8.3"
def __init__(self):
Target.__init__(self)
@ -274,11 +276,11 @@ class NUCLEO_F103RB(Target):
self.extra_labels = ['STM', 'STM32F1', 'STM32F103RB']
self.supported_toolchains = ["ARM", "uARM", "GCC_ARM"]
self.binary_naming = "8.3"
class NUCLEO_L152RE(Target):
OUTPUT_NAMING = "8.3"
def __init__(self):
Target.__init__(self)
@ -287,11 +289,11 @@ class NUCLEO_L152RE(Target):
self.extra_labels = ['STM', 'STM32L1', 'STM32L152RE']
self.supported_toolchains = ["ARM", "uARM", "GCC_ARM"]
self.binary_naming = "8.3"
class NUCLEO_F401RE(Target):
OUTPUT_NAMING = "8.3"
def __init__(self):
Target.__init__(self)
@ -300,11 +302,11 @@ class NUCLEO_F401RE(Target):
self.extra_labels = ['STM', 'STM32F4', 'STM32F401RE']
self.supported_toolchains = ["ARM", "uARM", "GCC_ARM"]
self.binary_naming = "8.3"
class NUCLEO_F030R8(Target):
OUTPUT_NAMING = "8.3"
def __init__(self):
Target.__init__(self)
@ -313,8 +315,6 @@ class NUCLEO_F030R8(Target):
self.extra_labels = ['STM', 'STM32F0', 'STM32F030R8']
self.supported_toolchains = ["ARM", "uARM", "GCC_ARM"]
self.binary_naming = "8.3"
class LPC1347(Target):
@ -393,8 +393,8 @@ class NRF51822(Target):
hook.hook_add_binary("post", self.binary_hook)
@staticmethod
def binary_hook(t_self, resources, elf, binf):
for hexf in resources.hex_files:
def binary_hook(t_self, elf, binf):
for hexf in t_self.resources.hex_files:
if hexf.find(NRF51822.EXPECTED_SOFTDEVICE) != -1:
break
else:

9
workspace_tools/toolchains/__init__.py
View File

@ -445,8 +445,9 @@ class mbedToolchain:
def link_program(self, r, tmp_path, name):
ext = 'bin'
if hasattr(self.target, 'binary_naming'):
if self.target.binary_naming == "8.3":
if hasattr(self.target, 'OUTPUT_NAMING'):
self.var("binary_naming", self.target.OUTPUT_NAMING)
if self.target.OUTPUT_NAMING == "8.3":
name = name[0:8]
ext = ext[0:3]
@ -470,9 +471,7 @@ class mbedToolchain:
self.var("compile_succeded", True)
self.var("binary", filename)
if hasattr(self.target, 'binary_naming'):
self.var("binary_naming", self.target.binary_naming)
if hasattr(self.target, 'OUTPUT_EXT'):
bin = bin.replace('.bin', self.target.OUTPUT_EXT)