From b3b70c6c0a9e033bfe2495b8933b943b649b6fe2 Mon Sep 17 00:00:00 2001 From: ohagendorf Date: Sun, 28 Sep 2014 14:40:50 +0200 Subject: [PATCH 1/2] [EXPORT][CoIDE] problem with missing linker script - a missing linker script configures the scatter file option (linker script path in CoIDE) to 'None' not to '' --- workspace_tools/export/coide.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/workspace_tools/export/coide.py b/workspace_tools/export/coide.py index 0a89943ab5..c2090931d4 100644 --- a/workspace_tools/export/coide.py +++ b/workspace_tools/export/coide.py @@ -62,6 +62,9 @@ class CoIDE(Exporter): l, _ = splitext(basename(lib)) libraries.append(l[3:]) + if self.resources.linker_script is None: + self.resources.linker_script = '' + ctx = { 'name': self.program_name, 'source_files': source_files, From f11facdc6350ec3137279dea19c2aabb97036c0e Mon Sep 17 00:00:00 2001 From: ohagendorf Date: Sun, 28 Sep 2014 14:49:57 +0200 Subject: [PATCH 2/2] [EXPORT][CoIDE] [DISCO_407] and [NUCLEO_F4x1] memory areas The templates now contains the memory areas preconfigured as they are used in linker scripts. When the CoIDE linker option 'Use memory layout from memory window' is manually switch on the correct memory layout is already there. --- workspace_tools/export/coide_disco_f407vg.coproj.tmpl | 2 +- workspace_tools/export/coide_nucleo_f401re.coproj.tmpl | 2 +- workspace_tools/export/coide_nucleo_f411re.coproj.tmpl | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/workspace_tools/export/coide_disco_f407vg.coproj.tmpl b/workspace_tools/export/coide_disco_f407vg.coproj.tmpl index d3d1bd670d..afbec29796 100644 --- a/workspace_tools/export/coide_disco_f407vg.coproj.tmpl +++ b/workspace_tools/export/coide_disco_f407vg.coproj.tmpl @@ -39,7 +39,7 @@ - + diff --git a/workspace_tools/export/coide_nucleo_f401re.coproj.tmpl b/workspace_tools/export/coide_nucleo_f401re.coproj.tmpl index 368e35afbe..dbe210f4f5 100644 --- a/workspace_tools/export/coide_nucleo_f401re.coproj.tmpl +++ b/workspace_tools/export/coide_nucleo_f401re.coproj.tmpl @@ -39,7 +39,7 @@ - + diff --git a/workspace_tools/export/coide_nucleo_f411re.coproj.tmpl b/workspace_tools/export/coide_nucleo_f411re.coproj.tmpl index efef83ebaf..2329f89403 100644 --- a/workspace_tools/export/coide_nucleo_f411re.coproj.tmpl +++ b/workspace_tools/export/coide_nucleo_f411re.coproj.tmpl @@ -39,7 +39,7 @@ - +