Merge branch 'release/v2.0.0'

platformio · May 3, 2017 · eff92c7 · eff92c7
2 parents 47f890c + aa7736c
commit eff92c7
Show file tree

Hide file tree

Showing 14 changed files with 237 additions and 58 deletions.
diff --git a/boards/IBMEthernetKit.json b/boards/IBMEthernetKit.json
@@ -1,17 +1,33 @@
 {
   "build": {
-    "cpu": "cortex-m4", 
-    "f_cpu": "120000000L", 
+    "cpu": "cortex-m4",
+    "f_cpu": "120000000L",
     "mcu": "mk64fn1m0vll12"
-  }, 
+  },
+  "debug": {
+    "tools": {
+      "cmsis-dap": {
+        "server": {
+          "package": "tool-openocd",
+          "executable": "bin/openocd",
+          "arguments": [
+            "-f", "scripts/interface/cmsis-dap.cfg",
+            "-c", "set CHIPNAME k64",
+            "-f", "scripts/target/kx.cfg"
+          ]
+        },
+        "onboard": true
+      }
+    }
+  },
   "frameworks": [
     "mbed"
-  ], 
-  "name": "Ethernet IoT Starter Kit", 
+  ],
+  "name": "Ethernet IoT Starter Kit",
   "upload": {
-    "maximum_ram_size": 262144, 
+    "maximum_ram_size": 262144,
     "maximum_size": 1048576
-  }, 
-  "url": "http://developer.mbed.org/platforms/IBMEthernetKit/", 
+  },
+  "url": "http://developer.mbed.org/platforms/IBMEthernetKit/",
   "vendor": "Freescale"
 }
diff --git a/boards/frdm_k20d50m.json b/boards/frdm_k20d50m.json
@@ -1,17 +1,33 @@
 {
   "build": {
-    "cpu": "cortex-m4", 
-    "f_cpu": "48000000L", 
+    "cpu": "cortex-m4",
+    "f_cpu": "48000000L",
     "mcu": "mk20dx128vlh5"
-  }, 
+  },
+  "debug": {
+    "tools": {
+      "cmsis-dap": {
+        "server": {
+          "package": "tool-openocd",
+          "executable": "bin/openocd",
+          "arguments": [
+            "-f", "scripts/interface/cmsis-dap.cfg",
+            "-c", "set CHIPNAME k20",
+            "-f", "scripts/target/kx.cfg"
+          ]
+        },
+        "onboard": true
+      }
+    }
+  },
   "frameworks": [
     "mbed"
-  ], 
-  "name": "Freescale Kinetis FRDM-K20D50M", 
+  ],
+  "name": "Freescale Kinetis FRDM-K20D50M",
   "upload": {
-    "maximum_ram_size": 16384, 
+    "maximum_ram_size": 16384,
     "maximum_size": 131072
-  }, 
-  "url": "https://developer.mbed.org/platforms/FRDM-K20D50M/", 
+  },
+  "url": "https://developer.mbed.org/platforms/FRDM-K20D50M/",
   "vendor": "Freescale"
 }
diff --git a/boards/frdm_k22f.json b/boards/frdm_k22f.json
@@ -1,17 +1,33 @@
 {
   "build": {
-    "cpu": "cortex-m4", 
-    "f_cpu": "120000000L", 
+    "cpu": "cortex-m4",
+    "f_cpu": "120000000L",
     "mcu": "mk22fn512vlh12"
-  }, 
+  },
+  "debug": {
+    "tools": {
+      "cmsis-dap": {
+        "server": {
+          "package": "tool-openocd",
+          "executable": "bin/openocd",
+          "arguments": [
+            "-f", "scripts/interface/cmsis-dap.cfg",
+            "-c", "set CHIPNAME k22",
+            "-f", "scripts/target/kx.cfg"
+          ]
+        },
+        "onboard": true
+      }
+    }
+  },
   "frameworks": [
     "mbed"
-  ], 
-  "name": "Freescale Kinetis FRDM-K22F", 
+  ],
+  "name": "Freescale Kinetis FRDM-K22F",
   "upload": {
-    "maximum_ram_size": 131072, 
+    "maximum_ram_size": 131072,
     "maximum_size": 524288
-  }, 
-  "url": "https://developer.mbed.org/platforms/FRDM-K22F/", 
+  },
+  "url": "https://developer.mbed.org/platforms/FRDM-K22F/",
   "vendor": "Freescale"
 }
diff --git a/boards/frdm_k64f.json b/boards/frdm_k64f.json
@@ -1,17 +1,33 @@
 {
   "build": {
-    "cpu": "cortex-m4", 
-    "f_cpu": "120000000L", 
+    "cpu": "cortex-m4",
+    "f_cpu": "120000000L",
     "mcu": "mk64fn1m0vll12"
-  }, 
+  },
+  "debug": {
+    "tools": {
+      "cmsis-dap": {
+        "server": {
+          "package": "tool-openocd",
+          "executable": "bin/openocd",
+          "arguments": [
+            "-f", "scripts/interface/cmsis-dap.cfg",
+            "-c", "set CHIPNAME k64",
+            "-f", "scripts/target/kx.cfg"
+          ]
+        },
+        "onboard": true
+      }
+    }
+  },
   "frameworks": [
     "mbed"
-  ], 
-  "name": "Freescale Kinetis FRDM-K64F", 
+  ],
+  "name": "Freescale Kinetis FRDM-K64F",
   "upload": {
-    "maximum_ram_size": 262144, 
+    "maximum_ram_size": 262144,
     "maximum_size": 1048576
-  }, 
-  "url": "https://developer.mbed.org/platforms/FRDM-K64F/", 
+  },
+  "url": "https://developer.mbed.org/platforms/FRDM-K64F/",
   "vendor": "Freescale"
 }
diff --git a/boards/frdm_kl05z.json b/boards/frdm_kl05z.json
@@ -1,17 +1,33 @@
 {
   "build": {
-    "cpu": "cortex-m0plus", 
-    "f_cpu": "48000000L", 
+    "cpu": "cortex-m0plus",
+    "f_cpu": "48000000L",
     "mcu": "mkl05z32vfm4"
-  }, 
+  },
+  "debug": {
+    "tools": {
+      "cmsis-dap": {
+        "server": {
+          "package": "tool-openocd",
+          "executable": "bin/openocd",
+          "arguments": [
+            "-f", "scripts/interface/cmsis-dap.cfg",
+            "-c", "set CHIPNAME kl05",
+            "-f", "scripts/target/klx.cfg"
+          ]
+        },
+        "onboard": true
+      }
+    }
+  },
   "frameworks": [
     "mbed"
-  ], 
-  "name": "Freescale Kinetis FRDM-KL05Z", 
+  ],
+  "name": "Freescale Kinetis FRDM-KL05Z",
   "upload": {
-    "maximum_ram_size": 4096, 
+    "maximum_ram_size": 4096,
     "maximum_size": 32768
-  }, 
-  "url": "https://developer.mbed.org/platforms/FRDM-KL05Z/", 
+  },
+  "url": "https://developer.mbed.org/platforms/FRDM-KL05Z/",
   "vendor": "Freescale"
 }
diff --git a/boards/frdm_kl25z.json b/boards/frdm_kl25z.json
@@ -1,17 +1,32 @@
 {
   "build": {
-    "cpu": "cortex-m0plus", 
-    "f_cpu": "48000000L", 
+    "cpu": "cortex-m0plus",
+    "f_cpu": "48000000L",
     "mcu": "mkl25z128vlk4"
-  }, 
+  },
+  "debug": {
+    "tools": {
+      "cmsis-dap": {
+        "server": {
+          "package": "tool-openocd",
+          "executable": "bin/openocd",
+          "arguments": [
+            "-f", "scripts/interface/cmsis-dap.cfg",
+            "-f", "scripts/target/kl25.cfg"
+          ]
+        },
+        "onboard": true
+      }
+    }
+  },
   "frameworks": [
     "mbed"
-  ], 
-  "name": "Freescale Kinetis FRDM-KL25Z", 
+  ],
+  "name": "Freescale Kinetis FRDM-KL25Z",
   "upload": {
-    "maximum_ram_size": 16384, 
+    "maximum_ram_size": 16384,
     "maximum_size": 131072
-  }, 
-  "url": "https://developer.mbed.org/platforms/KL25Z/", 
+  },
+  "url": "https://developer.mbed.org/platforms/KL25Z/",
   "vendor": "Freescale"
 }
diff --git a/boards/frdm_kl26z.json b/boards/frdm_kl26z.json
@@ -4,6 +4,22 @@
     "f_cpu": "48000000L",
     "mcu": "mkl26z128vlh4"
   },
+  "debug": {
+    "tools": {
+      "cmsis-dap": {
+        "server": {
+          "package": "tool-openocd",
+          "executable": "bin/openocd",
+          "arguments": [
+            "-f", "scripts/interface/cmsis-dap.cfg",
+            "-c", "set CHIPNAME kl26",
+            "-f", "scripts/target/klx.cfg"
+          ]
+        },
+        "onboard": true
+      }
+    }
+  },
   "frameworks": [
     "mbed"
   ],

diff --git a/boards/frdm_kl27z.json b/boards/frdm_kl27z.json
@@ -4,6 +4,22 @@
     "f_cpu": "48000000L",
     "mcu": "mkl27z64vlh4"
   },
+  "debug": {
+    "tools": {
+      "cmsis-dap": {
+        "server": {
+          "package": "tool-openocd",
+          "executable": "bin/openocd",
+          "arguments": [
+            "-f", "scripts/interface/cmsis-dap.cfg",
+            "-c", "set CHIPNAME kl27",
+            "-f", "scripts/target/klx.cfg"
+          ]
+        },
+        "onboard": true
+      }
+    }
+  },
   "frameworks": [
     "mbed"
   ],

diff --git a/boards/frdm_kl43z.json b/boards/frdm_kl43z.json
@@ -4,6 +4,22 @@
     "f_cpu": "48000000L",
     "mcu": "mkl43z256vlh4"
   },
+  "debug": {
+    "tools": {
+      "cmsis-dap": {
+        "server": {
+          "package": "tool-openocd",
+          "executable": "bin/openocd",
+          "arguments": [
+            "-f", "scripts/interface/cmsis-dap.cfg",
+            "-c", "set CHIPNAME kl43",
+            "-f", "scripts/target/klx.cfg"
+          ]
+        },
+        "onboard": true
+      }
+    }
+  },
   "frameworks": [
     "mbed"
   ],

diff --git a/boards/frdm_kl46z.json b/boards/frdm_kl46z.json
@@ -1,17 +1,32 @@
 {
   "build": {
-    "cpu": "cortex-m0plus", 
-    "f_cpu": "48000000L", 
+    "cpu": "cortex-m0plus",
+    "f_cpu": "48000000L",
     "mcu": "mkl46z256vll4"
-  }, 
+  },
+  "debug": {
+    "tools": {
+      "cmsis-dap": {
+        "server": {
+          "package": "tool-openocd",
+          "executable": "bin/openocd",
+          "arguments": [
+            "-f", "scripts/interface/cmsis-dap.cfg",
+            "-f", "scripts/target/kl46.cfg"
+          ]
+        },
+        "onboard": true
+      }
+    }
+  },
   "frameworks": [
     "mbed"
-  ], 
-  "name": "Freescale Kinetis FRDM-KL46Z", 
+  ],
+  "name": "Freescale Kinetis FRDM-KL46Z",
   "upload": {
-    "maximum_ram_size": 32768, 
+    "maximum_ram_size": 32768,
     "maximum_size": 262144
-  }, 
-  "url": "https://developer.mbed.org/platforms/FRDM-KL46Z/", 
+  },
+  "url": "https://developer.mbed.org/platforms/FRDM-KL46Z/",
   "vendor": "Freescale"
 }
diff --git a/boards/hexiwear.json b/boards/hexiwear.json
@@ -4,6 +4,21 @@
     "f_cpu": "120000000L",
     "mcu": "mk64fn1m0vdc12"
   },
+  "debug": {
+    "tools": {
+      "cmsis-dap": {
+        "server": {
+          "package": "tool-openocd",
+          "executable": "bin/openocd",
+          "arguments": [
+            "-f", "scripts/interface/cmsis-dap.cfg",
+            "-c", "set CHIPNAME k64",
+            "-f", "scripts/target/kx.cfg"
+          ]
+        }
+      }
+    }
+  },
   "frameworks": [
     "mbed"
   ],

diff --git a/builder/frameworks/mbed b/builder/frameworks/mbed