Fix build system merge with Nordic changes

Author: emilmont

workspace_tools/targets.py

@@ -49,7 +49,7 @@ def program_cycle_s(self):
 
     def get_labels(self):
         return [self.name, CORE_LABELS[self.core]] + self.extra_labels
-
+    
     def init_hooks(self, hook, toolchain_name):
         pass
 
@@ -123,18 +123,20 @@ def __init__(self):
 
         self.is_disk_virtual = True
 
+
 class KL46Z(Target):
     def __init__(self):
         Target.__init__(self)
 
         self.core = "Cortex-M0+"
 
         self.extra_labels = ['Freescale', 'KLXX']
-
+        
         self.supported_toolchains = ["GCC_ARM", "ARM"]
-
+        
         self.is_disk_virtual = True
 
+
 class K20D5M(Target):
     def __init__(self):
         Target.__init__(self)
@@ -183,13 +185,15 @@ def __init__(self):
         self.extra_labels = ['NXP', 'LPC408X']
 
         self.supported_toolchains = ["ARM", "GCC_CR", "GCC_ARM"]
+        
+        self.is_disk_virtual = True
 
     def init_hooks(self, hook, toolchain_name):
         if toolchain_name in ['ARM_STD', 'ARM_MICRO']:
             hook.hook_add_binary("post", self.binary_hook)
-
+    
     @staticmethod
-    def binary_hook(t_self, elf, binf):
+    def binary_hook(t_self, resources, elf, binf):
         if not os.path.isdir(binf):
             # Regular binary file, nothing to do
             return
@@ -260,7 +264,7 @@ def __init__(self):
 
         self.supported_toolchains = ["ARM", "GCC_ARM"]
 
-        
+
 class NUCLEO_F103RB(Target):
     def __init__(self):
         Target.__init__(self)
@@ -272,8 +276,8 @@ def __init__(self):
         self.supported_toolchains = ["ARM", "uARM", "GCC_ARM"]
 
         self.binary_naming = "8.3"
-        
-        
+
+
 class NUCLEO_L152RE(Target):
     def __init__(self):
         Target.__init__(self)
@@ -286,7 +290,7 @@ def __init__(self):
 
         self.binary_naming = "8.3"
 
-        
+
 class NUCLEO_F401RE(Target):
     def __init__(self):
         Target.__init__(self)
@@ -299,7 +303,7 @@ def __init__(self):
 
         self.binary_naming = "8.3"
 
-        
+
 class NUCLEO_F030R8(Target):
     def __init__(self):
         Target.__init__(self)
@@ -311,17 +315,6 @@ def __init__(self):
         self.supported_toolchains = ["ARM", "uARM", "GCC_ARM"]
 
         self.binary_naming = "8.3"
-                
-                
-class MBED_MCU(Target):
-    def __init__(self):
-        Target.__init__(self)
-        
-        self.core = "Cortex-M0+"
-        
-        self.extra_labels = ['ARM']
-        
-        self.supported_toolchains = ["ARM"]
 
 
 class LPC1347(Target):
@@ -378,11 +371,14 @@ def __init__(self):
 
         self.supported_toolchains = ["ARM", "uARM", "GCC_ARM", "GCC_CS", "GCC_CR", "IAR"]        
 
+
 class NRF51822(Target):
     EXPECTED_SOFTDEVICE = 's110_nrf51822_6.0.0_softdevice.hex'
     UICR_START = 0x10001000
     APPCODE_OFFSET = 0x14000
-
+    
+    OUTPUT_EXT = '.hex'
+    
     def __init__(self):
         Target.__init__(self)
 
@@ -391,43 +387,39 @@ def __init__(self):
         self.extra_labels = ["NORDIC"]
 
         self.supported_toolchains = ["ARM"]
-        
-        self.binary_format = "hex"
-        
+    
     def init_hooks(self, hook, toolchain_name):
         if toolchain_name in ['ARM_STD', 'ARM_MICRO']:
             hook.hook_add_binary("post", self.binary_hook)
-
+    
     @staticmethod
-    def binary_hook(t_self, elf, binf):
-        for hexf in t_self.resources.hex_files:
+    def binary_hook(t_self, resources, elf, binf):
+        for hexf in resources.hex_files:
             if hexf.find(NRF51822.EXPECTED_SOFTDEVICE) != -1:
                 break
         else:
             t_self.debug("Hex file not found. Aborting.")
             return
-
+        
         # Generate hex file
         # NOTE: this is temporary, it will be removed later and only the
         # combined binary file (below) will be used
         from intelhex import IntelHex
         binh = IntelHex()
         binh.loadbin(binf, offset = NRF51822.APPCODE_OFFSET)
-
+        
         sdh = IntelHex(hexf)
         sdh.merge(binh)
-        outname = binf + ".temp"
+        
+        outname = binf.replace('.bin', '.hex')
         with open(outname, "w") as f:
             sdh.tofile(f, format = 'hex')
         t_self.debug("Generated SoftDevice-enabled image in '%s'" % outname)
-
-        if t_self.target.binary_format == "hex":
-            os.rename(outname, binf)
-            return
-
+        
         # Generate concatenated SoftDevice + application binary
         # Currently, this is only supported for SoftDevice images that have
         # an UICR area
+        """
         sdh = IntelHex(hexf)
         if sdh.maxaddr() < NRF51822.UICR_START:
             t_self.error("SoftDevice image does not have UICR area. Aborting.")
@@ -438,25 +430,27 @@ def binary_hook(t_self, elf, binf):
         except ValueError:
             t_self.error("UICR start address not found in the SoftDevice image. Aborting.")
             return
-
+        
         # Assume that everything up to uicr_start_index are contiguous addresses
         # in the SoftDevice code area
         softdevice_code_size = addrlist[uicr_start_index - 1] + 1
         t_self.debug("SoftDevice code size is %d bytes" % softdevice_code_size)
-
+        
         # First part: SoftDevice code
         bindata = sdh[:softdevice_code_size].tobinstr()
-
+        
         # Second part: pad with 0xFF up to APPCODE_OFFSET
         bindata = bindata + '\xFF' * (NRF51822.APPCODE_OFFSET - softdevice_code_size)
-
+        
         # Last part: the application code
         with open(binf, 'r+b') as f:
             bindata = bindata + f.read()
             # Write back the binary
             f.seek(0)
             f.write(bindata)
         t_self.debug("Generated concatenated binary of %d bytes" % len(bindata))
+        """
+
 
 # Get a single instance for each target
 TARGETS = [
@@ -477,7 +471,6 @@ def binary_hook(t_self, elf, binf):
     NUCLEO_L152RE(),
     NUCLEO_F401RE(),
     NUCLEO_F030R8(),
-    MBED_MCU(),
     LPC1347(),
     LPC1114(),
     LPC11C24(),

workspace_tools/toolchains/__init__.py

@@ -443,38 +443,39 @@ def build_library(self, objects, dir, name):
             self.archive(objects, fout)
 
     def link_program(self, r, tmp_path, name):
-        if hasattr(self.target, 'binary_format'):
-            ext = self.target.binary_format
-        else:
-            ext = 'bin'
-
+        ext = 'bin'
+        
         if hasattr(self.target, 'binary_naming'):
             if self.target.binary_naming == "8.3":
                 name = name[0:8]
                 ext = ext[0:3]
-
+        
         filename = name+'.'+ext
-
+        
         elf = join(tmp_path, name + '.elf')
         bin = join(tmp_path, filename)
 
         if self.need_update(elf, r.objects + r.libraries + [r.linker_script]):
             self.progress("link", name)
             self.link(elf, r.objects, r.libraries, r.lib_dirs, r.linker_script)
-
+        
         if self.need_update(bin, [elf]):
             self.progress("elf2bin", name)
+            
             self.binary(r, elf, bin)
 
             if self.target.name.startswith('LPC'):
                 self.debug("LPC Patch %s" % filename)
                 patch(bin)
-            
+        
         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)
+        
         return bin
 
     def default_cmd(self, command):

workspace_tools/toolchains/arm.py

@@ -128,13 +128,12 @@ def link(self, output, objects, libraries, lib_dirs, mem_map):
         self.default_cmd(self.ld + args + objects + libraries + self.sys_libs)
 
     @hook_tool
-
     def binary(self, resources, elf, bin):
         args = [self.elf2bin, '--bin', '-o', bin, elf]
-
+        
         if hasattr(self.target, "binary_cmdline_hook"):
             args = self.target.binary_cmdline_hook(self.__class__.__name__, args)
-
+        
         self.default_cmd(args)
 
 class ARM_STD(ARM):