Diff: export/gccarm.py

Revision:

13:ab47a20b66f0

Parent:

0:66f3b5499f7f

Child:

24:25bff2709c20

--- a/export/gccarm.py	Tue Jun 14 11:33:06 2016 +0100
+++ b/export/gccarm.py	Thu Jul 14 20:21:19 2016 +0100
@@ -15,7 +15,8 @@
 limitations under the License.
 """
 from exporters import Exporter
-from os.path import splitext, basename
+from os.path import splitext, basename, relpath, join, abspath
+from os import curdir, getcwd
 
 
 class GccArm(Exporter):
@@ -68,7 +69,9 @@
         'NUCLEO_F401RE',
         'NUCLEO_F410RB',
         'NUCLEO_F411RE',
+        'NUCLEO_F429ZI',
         'NUCLEO_F446RE',
+        'NUCLEO_F446ZE',
         'B96B_F446VE',
         'ARCH_MAX',
         'NUCLEO_F030R8',
@@ -83,9 +86,13 @@
         'NUCLEO_F303RE',
         'NUCLEO_F334R8',
         'NUCLEO_F746ZG',
+        'NUCLEO_F767ZI',
         'DISCO_L053C8',
+        'NUCLEO_L011K4',
+        'NUCLEO_L031K6',
         'NUCLEO_L053R8',
         'NUCLEO_L073RZ',
+        'NUCLEO_L432KC',
         'NUCLEO_L476RG',
         'DISCO_F334C8',
         'MAX32600MBED',
@@ -95,6 +102,7 @@
         'NUCLEO_L152RE',
         'NRF51_DK',
         'NRF51_DONGLE',
+        'NRF51_MICROBIT',
         'SEEED_TINY_BLE',
         'DISCO_F401VC',
         'DELTA_DFCM_NNN40',
@@ -112,12 +120,20 @@
         'SAMD21J18A',
         'SAMD21G18A',
         'SAML21J18A',
+        'SAMG55J19',
+        'ARM_BEETLE_SOC',
+        'ELMO_F411RE',
+        'BLUEPILL_F103C8',
     ]
 
     DOT_IN_RELATIVE_PATH = True
 
+    MBED_CONFIG_HEADER_SUPPORTED = True
+
     def generate(self):
         # "make" wants Unix paths
+        if self.sources_relative:
+            self.resources.relative_to(self.prj_paths[0])
         self.resources.win_to_unix()
 
         to_be_compiled = []
@@ -133,6 +149,7 @@
             l, _ = splitext(basename(lib))
             libraries.append(l[3:])
 
+        build_dir = abspath(join(self.inputDir, ".build"))
         ctx = {
             'name': self.program_name,
             'to_be_compiled': to_be_compiled,
@@ -142,6 +159,20 @@
             'linker_script': self.resources.linker_script,
             'libraries': libraries,
             'symbols': self.get_symbols(),
-            'cpu_flags': self.toolchain.cpu
+            'cpu_flags': self.toolchain.cpu,
+            'vpath': [relpath(s, build_dir) for s in self.prj_paths] if self.sources_relative else [".."]
         }
+
+        for key in ['include_paths', 'library_paths', 'linker_script']:
+            if isinstance(ctx[key], list):
+                ctx[key] = [ctx['vpath'][0] + "/" + t for t in ctx[key]]
+            else:
+                ctx[key] = ctx['vpath'][0] + "/" + ctx[key]
+        if "../." not in ctx["include_paths"]:
+            ctx["include_paths"] += ['../.']
+        ctx.update(self.progen_flags)
         self.gen_file('gcc_arm_%s.tmpl' % self.target.lower(), ctx, 'Makefile')
+
+    def scan_and_copy_resources(self, prj_paths, trg_path, relative=False):
+        self.prj_paths = prj_paths
+        Exporter.scan_and_copy_resources(self, prj_paths, trg_path, relative)