Merge branch 'release/v2.1.1'

platformio · May 26, 2017 · c0d318f · c0d318f
2 parents 1e4cc94 + 2540658
commit c0d318f
Show file tree

Hide file tree

Showing 12 changed files with 12 additions and 12 deletions.
diff --git a/boards/IBMEthernetKit.json b/boards/IBMEthernetKit.json
@@ -16,7 +16,7 @@
             "-f", "scripts/target/kx.cfg"
           ]
         },
-        "preload": true,
+        "load_cmd": "preload",
         "onboard": true
       }
     }

diff --git a/boards/frdm_k20d50m.json b/boards/frdm_k20d50m.json
@@ -16,7 +16,7 @@
             "-f", "scripts/target/kx.cfg"
           ]
         },
-        "preload": true,
+        "load_cmd": "preload",
         "onboard": true
       }
     }

diff --git a/boards/frdm_k22f.json b/boards/frdm_k22f.json
@@ -16,7 +16,7 @@
             "-f", "scripts/target/kx.cfg"
           ]
         },
-        "preload": true,
+        "load_cmd": "preload",
         "onboard": true
       }
     }

diff --git a/boards/frdm_k64f.json b/boards/frdm_k64f.json
@@ -16,7 +16,7 @@
             "-f", "scripts/target/kx.cfg"
           ]
         },
-        "preload": true,
+        "load_cmd": "preload",
         "onboard": true
       }
     }

diff --git a/boards/frdm_kl05z.json b/boards/frdm_kl05z.json
@@ -16,7 +16,7 @@
             "-f", "scripts/target/klx.cfg"
           ]
         },
-        "preload": true,
+        "load_cmd": "preload",
         "onboard": true
       }
     }

diff --git a/boards/frdm_kl25z.json b/boards/frdm_kl25z.json
@@ -15,7 +15,7 @@
             "-f", "scripts/target/kl25.cfg"
           ]
         },
-        "preload": true,
+        "load_cmd": "preload",
         "onboard": true
       }
     }

diff --git a/boards/frdm_kl26z.json b/boards/frdm_kl26z.json
@@ -16,7 +16,7 @@
             "-f", "scripts/target/klx.cfg"
           ]
         },
-        "preload": true,
+        "load_cmd": "preload",
         "onboard": true
       }
     }

diff --git a/boards/frdm_kl27z.json b/boards/frdm_kl27z.json
@@ -16,7 +16,7 @@
             "-f", "scripts/target/klx.cfg"
           ]
         },
-        "preload": true,
+        "load_cmd": "preload",
         "onboard": true
       }
     }

diff --git a/boards/frdm_kl43z.json b/boards/frdm_kl43z.json
@@ -16,7 +16,7 @@
             "-f", "scripts/target/klx.cfg"
           ]
         },
-        "preload": true,
+        "load_cmd": "preload",
         "onboard": true
       }
     }

diff --git a/boards/frdm_kl46z.json b/boards/frdm_kl46z.json
@@ -15,7 +15,7 @@
             "-f", "scripts/target/kl46.cfg"
           ]
         },
-        "preload": true,
+        "load_cmd": "preload",
         "onboard": true
       }
     }

diff --git a/boards/hexiwear.json b/boards/hexiwear.json
@@ -16,7 +16,7 @@
             "-f", "scripts/target/kx.cfg"
           ]
         },
-        "preload": true
+        "load_cmd": "preload"
       }
     }
   },

diff --git a/platform.json b/platform.json
@@ -12,7 +12,7 @@
     "type": "git",
     "url": "https://github.com/platformio/platform-freescalekinetis.git"
   },
-  "version": "2.1.0",
+  "version": "2.1.1",
   "packageRepositories": [
     "https://dl.bintray.com/platformio/dl-packages/manifest.json",
     "https://sourceforge.net/projects/platformio-storage/files/packages/manifest.json/download",
-Original file line number
+Diff line change
@@ Expand Up / @@ -16,7 +16,7 @@ @@
                 "-f", "scripts/target/kx.cfg"
               ]
             },
-            "preload": true
+            "load_cmd": "preload"
           }
         }
       },
@@ Expand Down @@