Merge branch 'release/v5.3.0'

valeros · valeros · commit f347e1241e24 · 2023-07-28T13:57:48.000+03:00
diff --git a/examples/mbed-rtos-blink-baremetal/.gitignore b/examples/mbed-rtos-blink-baremetal/.gitignore
@@ -1,2 +1 @@
-.pioenvs
-.piolibdeps
+.pio
diff --git a/examples/mbed-rtos-cellular/.gitignore b/examples/mbed-rtos-cellular/.gitignore
@@ -1,2 +1 @@
-.pioenvs
-.piolibdeps
+.pio
diff --git a/examples/mbed-rtos-cellular/.mbedignore b/examples/mbed-rtos-cellular/.mbedignore
@@ -0,0 +1,2 @@
+mbed-os/features/*
+mbed-os/storage/*
diff --git a/examples/mbed-rtos-ethernet-tls/.gitignore b/examples/mbed-rtos-ethernet-tls/.gitignore
@@ -1,2 +1 @@
-.pioenvs
-.piolibdeps
+.pio
diff --git a/examples/mbed-rtos-ethernet-tls/.mbedignore b/examples/mbed-rtos-ethernet-tls/.mbedignore
@@ -0,0 +1,2 @@
+mbed-os/features/*
+mbed-os/storage/*
diff --git a/platform.json b/platform.json
@@ -18,7 +18,7 @@
     "type": "git",
     "url": "https://github.com/platformio/platform-nxpimxrt.git"
   },
-  "version": "5.2.0",
+  "version": "5.3.0",
   "frameworks": {
     "mbed": {
       "package": "framework-mbed",
@@ -42,7 +42,7 @@
       "type": "framework",
       "optional": true,
       "owner": "platformio",
-      "version": "~6.60900.0"
+      "version": "~6.61700.0"
     },
     "framework-zephyr": {
       "type": "framework",
@@ -54,7 +54,7 @@
       "type": "debugger",
       "optional": true,
       "owner": "platformio",
-      "version": "~2.1100.0"
+      "version": "~3.1200.0"
     },
     "tool-pyocd": {
       "type": "debugger",
diff --git a/platform.py b/platform.py
@@ -117,7 +117,7 @@ def _add_default_debug_tools(self, board):
                             "executable": "bin/openocd",
                             "package": "tool-openocd",
                             "arguments": [
-                                "-s", "$PACKAGE_DIR/scripts",
+                                "-s", "$PACKAGE_DIR/openocd/scripts",
                                 "-f", "interface/cmsis-dap.cfg",
                                 "-f", "target/%s.cfg" % openocd_target
                             ]

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,2 @@`
	`1`	`+mbed-os/features/*`
	`2`	`+mbed-os/storage/*`
Original file line number	Diff line number	Diff line change
`@@ -117,7 +117,7 @@ def _add_default_debug_tools(self, board):`
`117`	`117`	`"executable": "bin/openocd",`
`118`	`118`	`"package": "tool-openocd",`
`119`	`119`	`"arguments": [`
`120`		`- "-s", "$PACKAGE_DIR/scripts",`
	`120`	`+ "-s", "$PACKAGE_DIR/openocd/scripts",`
`121`	`121`	`"-f", "interface/cmsis-dap.cfg",`
`122`	`122`	`"-f", "target/%s.cfg" % openocd_target`
`123`	`123`	`]`