Merge branch 'master' of https://github.com/mbedmicro/mbed

Author: bcostm

libraries/mbed/targets/cmsis/TARGET_STM/TARGET_NUCLEO_F401RE/stm32f4xx_hal_msp_template.c

@@ -116,8 +116,6 @@ def build_library(src_paths, build_path, target, toolchain_name,
         toolchain.copy_files(resource.headers, build_path, rel_path=resource.base_path)
     dependencies_include_dir.extend(toolchain.scan_resources(build_path).inc_dirs)
 
-    toolchain.resources = resources
-
     # Compile Sources
     objects = []
     for resource in resources:

workspace_tools/build_api.py

@@ -193,7 +193,7 @@ def init_hooks(self, hook, toolchain_name):
             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
@@ -393,8 +393,8 @@ def init_hooks(self, hook, toolchain_name):
             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: