DISCO_F746NG - disable uLib for uvision4, use scatter file

uLib does not support floating, does not make sense to have it enabled.
ARMmbed · Jan 11, 2016 · 35574d2 · 35574d2
1 parent 6cb8531
commit 35574d2
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 4 deletions.
diff --git a/workspace_tools/export/uvision4.py b/workspace_tools/export/uvision4.py
@@ -121,7 +121,6 @@ class Uvision4(Exporter):
         'DISCO_F334C8',
         'DISCO_F429ZI',
         'DISCO_F469NI',
-        'DISCO_F746NG',
         'DISCO_L053C8',
         'DISCO_L476VG',
         'LPC1549',

diff --git a/workspace_tools/export/uvision4_disco_f746ng.uvproj.tmpl b/workspace_tools/export/uvision4_disco_f746ng.uvproj.tmpl
@@ -226,7 +226,7 @@
             <hadIRAM2>0</hadIRAM2>
             <hadIROM2>0</hadIROM2>
             <StupSel>8</StupSel>
-            <useUlib>1</useUlib>
+            <useUlib>0</useUlib>
             <EndSel>0</EndSel>
             <uLtcg>0</uLtcg>
             <RoSelD>3</RoSelD>
@@ -390,7 +390,7 @@
             </VariousControls>
           </Aads>
           <LDads>
-            <umfTarg>1</umfTarg>
+            <umfTarg>0</umfTarg>
             <Ropi>0</Ropi>
             <Rwpi>0</Rwpi>
             <noStLib>0</noStLib>

diff --git a/workspace_tools/targets.py b/workspace_tools/targets.py
@@ -852,7 +852,6 @@ def __init__(self):
         self.core = "Cortex-M7F"
         self.extra_labels = ['STM', 'STM32F7', 'STM32F746', 'STM32F746NG']
         self.supported_toolchains = ["ARM", "uARM", "IAR", "GCC_ARM"]
-        self.default_toolchain = "uARM"
         self.detect_code = ["0815"]
 
 class DISCO_L476VG(Target):