Merge branch 'release/v1.3.0'

platformio · Jan 19, 2017 · d516724 · d516724
2 parents 7924fc1 + 2808d8d
commit d516724
Show file tree

Hide file tree

Showing 7 changed files with 86 additions and 50 deletions.
diff --git a/boards/lplm4f120h5qr.json b/boards/lplm4f120h5qr.json
@@ -1,21 +1,22 @@
 {
   "build": {
-    "core": "lm4f", 
-    "cpu": "cortex-m4", 
-    "f_cpu": "80000000L", 
-    "ldscript": "lm4fcpp_blizzard.ld", 
-    "mcu": "lplm4f120h5qr", 
-    "variant": "stellarpad"
-  }, 
+    "extra_flags": "-DENERGIA_ARCH_TIVAC -DENERGIA_EK_TM4C123GXL",
+    "core": "tivac",
+    "cpu": "cortex-m4",
+    "f_cpu": "80000000L",
+    "ldscript": "lm4fcpp_blizzard.ld",
+    "mcu": "lplm4f120h5qr",
+    "variant": "EK-TM4C123GXL"
+  },
   "frameworks": [
-    "energia", 
+    "energia",
     "libopencm3"
-  ], 
-  "name": "TI LaunchPad (Stellaris) w/ lm4f120 (80MHz)", 
+  ],
+  "name": "TI LaunchPad (Stellaris) w/ lm4f120 (80MHz)",
   "upload": {
-    "maximum_ram_size": 32768, 
+    "maximum_ram_size": 32768,
     "maximum_size": 262144
-  }, 
-  "url": "http://www.ti.com/tool/ek-lm4f120xl", 
+  },
+  "url": "http://www.ti.com/tool/ek-lm4f120xl",
   "vendor": "TI"
 }
diff --git a/boards/lptm4c1230c3pm.json b/boards/lptm4c1230c3pm.json
@@ -1,21 +1,22 @@
 {
   "build": {
-    "core": "lm4f", 
-    "cpu": "cortex-m4", 
-    "f_cpu": "80000000L", 
-    "ldscript": "lm4fcpp_blizzard.ld", 
-    "mcu": "lptm4c1230c3pm", 
-    "variant": "stellarpad"
-  }, 
+    "extra_flags": "-DENERGIA_ARCH_TIVAC -DENERGIA_EK_TM4C123GXL",
+    "core": "tivac",
+    "cpu": "cortex-m4",
+    "f_cpu": "80000000L",
+    "ldscript": "lm4fcpp_blizzard.ld",
+    "mcu": "lptm4c1230c3pm",
+    "variant": "EK-TM4C123GXL"
+  },
   "frameworks": [
-    "energia", 
+    "energia",
     "libopencm3"
-  ], 
-  "name": "TI LaunchPad (Tiva C) w/ tm4c123 (80MHz)", 
+  ],
+  "name": "TI LaunchPad (Tiva C) w/ tm4c123 (80MHz)",
   "upload": {
-    "maximum_ram_size": 32768, 
+    "maximum_ram_size": 32768,
     "maximum_size": 262144
-  }, 
-  "url": "http://www.ti.com/ww/en/launchpad/launchpads-connected-ek-tm4c123gxl.html", 
+  },
+  "url": "http://www.ti.com/ww/en/launchpad/launchpads-connected-ek-tm4c123gxl.html",
   "vendor": "TI"
 }
diff --git a/boards/lptm4c1294ncpdt.json b/boards/lptm4c1294ncpdt.json
@@ -1,21 +1,22 @@
 {
   "build": {
-    "core": "lm4f", 
-    "cpu": "cortex-m4", 
-    "f_cpu": "120000000L", 
-    "ldscript": "lm4fcpp_snowflake.ld", 
-    "mcu": "lptm4c1294ncpdt", 
-    "variant": "launchpad_129"
-  }, 
+    "extra_flags": "-DENERGIA_ARCH_TIVAC -DENERGIA_EK_TM4C1294XL",
+    "core": "tivac",
+    "cpu": "cortex-m4",
+    "f_cpu": "120000000L",
+    "ldscript": "lm4fcpp_snowflake.ld",
+    "mcu": "lptm4c1294ncpdt",
+    "variant": "EK-TM4C1294XL"
+  },
   "frameworks": [
-    "energia", 
+    "energia",
     "libopencm3"
-  ], 
-  "name": "TI LaunchPad (Tiva C) w/ tm4c129 (120MHz)", 
+  ],
+  "name": "TI LaunchPad (Tiva C) w/ tm4c129 (120MHz)",
   "upload": {
-    "maximum_ram_size": 262144, 
+    "maximum_ram_size": 262144,
     "maximum_size": 1048576
-  }, 
-  "url": "http://www.ti.com/ww/en/launchpad/launchpads-connected-ek-tm4c1294xl.html", 
+  },
+  "url": "http://www.ti.com/ww/en/launchpad/launchpads-connected-ek-tm4c1294xl.html",
   "vendor": "TI"
 }
diff --git a/builder/frameworks/energia.py b/builder/frameworks/energia.py
@@ -38,24 +38,52 @@
 env.Append(
     CPPDEFINES=[
         ("ARDUINO", 10610),
-        ("ENERGIA", int(FRAMEWORK_VERSION.split(".")[1]))
+        ("ENERGIA", int(FRAMEWORK_VERSION.split(".")[1])),
+        ("printf", "iprintf")
     ],
 
+    CCFLAGS=[
+        "-mfloat-abi=hard",
+        "-mfpu=fpv4-sp-d16",
+        "-mabi=aapcs",
+        "--param", "max-inline-insns-single=500"
+    ],
+
+    LINKFLAGS=[
+        "-Wl,--entry=ResetISR",
+        # "-Wl,--cref",
+        "-Wl,--check-sections",
+        "-Wl,--gc-sections",
+        "-Wl,--unresolved-symbols=report-all",
+        "-Wl,--warn-common",
+        "-Wl,--warn-section-align",
+        "-mfloat-abi=hard",
+        "-mfpu=fpv4-sp-d16",
+        "-fsingle-precision-constant"
+    ],
+
+    LIBS=["libdriverlib"],
+
     CPPPATH=[
+        join(FRAMEWORK_DIR, "system"),
+        join(FRAMEWORK_DIR, "system", "inc"),
+        join(FRAMEWORK_DIR, "system", "driverlib"),
         join(FRAMEWORK_DIR, "cores", env.BoardConfig().get("build.core")),
         join(FRAMEWORK_DIR, "variants", env.BoardConfig().get("build.variant"))
     ],
 
+    LIBPATH=[
+        join(FRAMEWORK_DIR, "variants",
+             env.BoardConfig().get("build.variant")),
+        join(FRAMEWORK_DIR, "system", "driverlib")
+    ],
+
+
     LIBSOURCE_DIRS=[
         join(FRAMEWORK_DIR, "libraries")
     ]
 )
 
-if env.BoardConfig().get("build.core") == "lm4f":
-    env.Append(
-        LINKFLAGS=["-Wl,--entry=ResetISR"]
-    )
-
 
 #
 # Target: Build Core Library

diff --git a/builder/frameworks/libopencm3 b/builder/frameworks/libopencm3
diff --git a/builder/main.py b/builder/main.py
@@ -47,9 +47,15 @@
         "-nostdlib"
     ],
 
+    CFLAGS=[
+        "-std=gnu11"
+    ],
+
     CXXFLAGS=[
         "-fno-rtti",
-        "-fno-exceptions"
+        "-fno-exceptions",
+        "-fno-threadsafe-statics",
+        "-std=gnu++11"
     ],
 
     CPPDEFINES=[
@@ -58,7 +64,6 @@
 
     LINKFLAGS=[
         "-Os",
-        "-Wl,--gc-sections,--relax",
         "-mthumb",
         "-nostartfiles",
         "-nostdlib"

diff --git a/platform.json b/platform.json
@@ -12,7 +12,7 @@
     "type": "git",
     "url": "https://github.com/platformio/platform-titiva.git"
   },
-  "version": "1.2.0",
+  "version": "1.3.0",
   "packageRepositories": [
     "https://dl.bintray.com/platformio/dl-packages/manifest.json",
     "https://sourceforge.net/projects/platformio-storage/files/packages/manifest.json/download",
@@ -36,7 +36,7 @@
     "framework-energiativa": {
       "type": "framework",
       "optional": true,
-      "version": "~1.17.0"
+      "version": "~1.10002.0"
     },
     "framework-libopencm3": {
       "type": "framework",