Correct .uf2 conversion cmd for zephyr

Until https://github.com/earlephilhower/arduino-pico/pull/686 is merged

.github/workflows/examples.yml

@@ -10,6 +10,7 @@ jobs:
         os: [ubuntu-latest, windows-latest, macos-latest]
         example:
           - "examples/arduino-blink"
+          - "examples/arduino-wifi-scan"
           - "examples/arduino-external-libs"
     runs-on: ${{ matrix.os }}
     steps:

boards/adafruit_feather.json

@@ -3,8 +3,8 @@
     "arduino": {
       "earlephilhower": {
         "boot2_source": "boot2_w25x10cl_4_padded_checksum.S",
-        "usb_vid": "0x239a",
+        "usb_vid": "0x239A",
-        "usb_pid": "0x80f1"
+        "usb_pid": "0x80F1"
       }
     },
     "core": "earlephilhower",
@@ -15,6 +15,10 @@
       [
         "0x2E8A",
         "0x00C0"
+      ],
+      [
+        "0x239A",
+        "0x80F1"
       ]
     ],
     "mcu": "rp2040",

boards/adafruit_itsybitsy.json

@@ -3,8 +3,8 @@
     "arduino": {
       "earlephilhower": {
         "boot2_source": "boot2_w25q080_2_padded_checksum.S",
-        "usb_vid": "0x239a",
+        "usb_vid": "0x239A",
-        "usb_pid": "0x80fd"
+        "usb_pid": "0x80FD"
       }
     },
     "core": "earlephilhower",
@@ -15,6 +15,10 @@
       [
         "0x2E8A",
         "0x00C0"
+      ],
+      [
+        "0x239A",
+        "0x80FD"
       ]
     ],
     "mcu": "rp2040",

boards/adafruit_kb2040.json

@@ -3,7 +3,7 @@
     "arduino": {
       "earlephilhower": {
         "boot2_source": "boot2_w25q080_2_padded_checksum.S",
-        "usb_vid": "0x239a",
+        "usb_vid": "0x239A",
         "usb_pid": "0x8105"
       }
     },
@@ -15,6 +15,10 @@
       [
         "0x2E8A",
         "0x00C0"
+      ],
+      [
+        "0x239A",
+        "0x8105"
       ]
     ],
     "mcu": "rp2040",

boards/adafruit_macropad2040.json

@@ -3,7 +3,7 @@
     "arduino": {
       "earlephilhower": {
         "boot2_source": "boot2_w25q080_2_padded_checksum.S",
-        "usb_vid": "0x239a",
+        "usb_vid": "0x239A",
         "usb_pid": "0x8107"
       }
     },
@@ -15,6 +15,10 @@
       [
         "0x2E8A",
         "0x00C0"
+      ],
+      [
+        "0x239A",
+        "0x8107"
       ]
     ],
     "mcu": "rp2040",

boards/adafruit_qtpy.json

@@ -3,8 +3,8 @@
     "arduino": {
       "earlephilhower": {
         "boot2_source": "boot2_w25q080_2_padded_checksum.S",
-        "usb_vid": "0x239a",
+        "usb_vid": "0x239A",
-        "usb_pid": "0x80f7"
+        "usb_pid": "0x80F7"
       }
     },
     "core": "earlephilhower",
@@ -15,6 +15,10 @@
       [
         "0x2E8A",
         "0x00C0"
+      ],
+      [
+        "0x239A",
+        "0x80F7"
       ]
     ],
     "mcu": "rp2040",

boards/adafruit_stemmafriend.json

@@ -3,8 +3,8 @@
     "arduino": {
       "earlephilhower": {
         "boot2_source": "boot2_w25q080_2_padded_checksum.S",
-        "usb_vid": "0x239a",
+        "usb_vid": "0x239A",
-        "usb_pid": "0x80e3"
+        "usb_pid": "0x80E3"
       }
     },
     "core": "earlephilhower",
@@ -15,6 +15,10 @@
       [
         "0x2E8A",
         "0x00C0"
+      ],
+      [
+        "0x239A",
+        "0x80E3"
       ]
     ],
     "mcu": "rp2040",

boards/adafruit_trinkeyrp2040qt.json

@@ -3,7 +3,7 @@
     "arduino": {
       "earlephilhower": {
         "boot2_source": "boot2_w25q080_2_padded_checksum.S",
-        "usb_vid": "0x239a",
+        "usb_vid": "0x239A",
         "usb_pid": "0x8109"
       }
     },
@@ -15,6 +15,10 @@
       [
         "0x2E8A",
         "0x00C0"
+      ],
+      [
+        "0x239A",
+        "0x8109"
       ]
     ],
     "mcu": "rp2040",

boards/arduino_nano_connect.json

@@ -15,6 +15,10 @@
       [
         "0x2E8A",
         "0x00C0"
+      ],
+      [
+        "0x2341",
+        "0x0058"
       ]
     ],
     "mcu": "rp2040",

boards/challenger_2040_lora.json

@@ -3,7 +3,7 @@
     "arduino": {
       "earlephilhower": {
         "boot2_source": "boot2_w25q080_2_padded_checksum.S",
-        "usb_vid": "0x2e8a",
+        "usb_vid": "0x2E8A",
         "usb_pid": "0x1023"
       }
     },
@@ -15,6 +15,10 @@
       [
         "0x2E8A",
         "0x00C0"
+      ],
+      [
+        "0x2E8A",
+        "0x1023"
       ]
     ],
     "mcu": "rp2040",

boards/challenger_2040_lte.json

@@ -3,8 +3,8 @@
     "arduino": {
       "earlephilhower": {
         "boot2_source": "boot2_w25q080_2_padded_checksum.S",
-        "usb_vid": "0x2e8a",
+        "usb_vid": "0x2E8A",
-        "usb_pid": "0x100b"
+        "usb_pid": "0x100B"
       }
     },
     "core": "earlephilhower",
@@ -15,6 +15,10 @@
       [
         "0x2E8A",
         "0x00C0"
+      ],
+      [
+        "0x2E8A",
+        "0x100B"
       ]
     ],
     "mcu": "rp2040",

boards/challenger_2040_sdrtc.json

@@ -0,0 +1,54 @@
+{
+  "build": {
+    "arduino": {
+      "earlephilhower": {
+        "boot2_source": "boot2_w25q080_2_padded_checksum.S",
+        "usb_vid": "0x2E8A",
+        "usb_pid": "0x102D"
+      }
+    },
+    "core": "earlephilhower",
+    "cpu": "cortex-m0plus",
+    "extra_flags": "-D ARDUINO_CHALLENGER_NB_2040_SDRTC_RP2040 -DARDUINO_ARCH_RP2040 -DUSBD_MAX_POWER_MA=250",
+    "f_cpu": "133000000L",
+    "hwids": [
+      [
+        "0x2E8A",
+        "0x00C0"
+      ],
+      [
+        "0x2E8A",
+        "0x102D"
+      ]
+    ],
+    "mcu": "rp2040",
+    "variant": "challenger_2040_sdrtc"
+  },
+  "debug": {
+    "jlink_device": "RP2040_M0_0",
+    "openocd_target": "rp2040.cfg",
+    "svd_path": "rp2040.svd"
+  },
+  "frameworks": [
+    "arduino"
+  ],
+  "name": "Challenger 2040 SD/RTC",
+  "upload": {
+    "maximum_ram_size": 270336,
+    "maximum_size": 8388608,
+    "require_upload_port": true,
+    "native_usb": true,
+    "use_1200bps_touch": true,
+    "wait_for_upload_port": false,
+    "protocol": "picotool",
+    "protocols": [
+      "cmsis-dap",
+      "jlink",
+      "raspberrypi-swd",
+      "picotool",
+      "picoprobe"
+    ]
+  },
+  "url": "https://www.raspberrypi.org/products/raspberry-pi-pico/",
+  "vendor": "iLabs"
+}

boards/challenger_2040_subghz.json

@@ -0,0 +1,54 @@
+{
+  "build": {
+    "arduino": {
+      "earlephilhower": {
+        "boot2_source": "boot2_w25q080_2_padded_checksum.S",
+        "usb_vid": "0x2E8A",
+        "usb_pid": "0x1032"
+      }
+    },
+    "core": "earlephilhower",
+    "cpu": "cortex-m0plus",
+    "extra_flags": "-D ARDUINO_CHALLENGER_2040_SUBGHZ_RP2040 -DARDUINO_ARCH_RP2040 -DUSBD_MAX_POWER_MA=250",
+    "f_cpu": "133000000L",
+    "hwids": [
+      [
+        "0x2E8A",
+        "0x00C0"
+      ],
+      [
+        "0x2E8A",
+        "0x1032"
+      ]
+    ],
+    "mcu": "rp2040",
+    "variant": "challenger_2040_subghz"
+  },
+  "debug": {
+    "jlink_device": "RP2040_M0_0",
+    "openocd_target": "rp2040.cfg",
+    "svd_path": "rp2040.svd"
+  },
+  "frameworks": [
+    "arduino"
+  ],
+  "name": "Challenger 2040 SubGHz",
+  "upload": {
+    "maximum_ram_size": 270336,
+    "maximum_size": 8388608,
+    "require_upload_port": true,
+    "native_usb": true,
+    "use_1200bps_touch": true,
+    "wait_for_upload_port": false,
+    "protocol": "picotool",
+    "protocols": [
+      "cmsis-dap",
+      "jlink",
+      "raspberrypi-swd",
+      "picotool",
+      "picoprobe"
+    ]
+  },
+  "url": "https://www.raspberrypi.org/products/raspberry-pi-pico/",
+  "vendor": "iLabs"
+}

boards/challenger_2040_wifi.json

@@ -3,7 +3,7 @@
     "arduino": {
       "earlephilhower": {
         "boot2_source": "boot2_w25q080_2_padded_checksum.S",
-        "usb_vid": "0x2e8a",
+        "usb_vid": "0x2E8A",
         "usb_pid": "0x1006"
       }
     },
@@ -15,6 +15,10 @@
       [
         "0x2E8A",
         "0x00C0"
+      ],
+      [
+        "0x2E8A",
+        "0x1006"
       ]
     ],
     "mcu": "rp2040",

boards/challenger_2040_wifi_ble.json

@@ -3,7 +3,7 @@
     "arduino": {
       "earlephilhower": {
         "boot2_source": "boot2_w25q080_2_padded_checksum.S",
-        "usb_vid": "0x2e8a",
+        "usb_vid": "0x2E8A",
         "usb_pid": "0x102C"
       }
     },
@@ -15,6 +15,10 @@
       [
         "0x2E8A",
         "0x00C0"
+      ],
+      [
+        "0x2E8A",
+        "0x102C"
       ]
     ],
     "mcu": "rp2040",

boards/challenger_nb_2040_wifi.json

@@ -3,8 +3,8 @@
     "arduino": {
       "earlephilhower": {
         "boot2_source": "boot2_w25q080_2_padded_checksum.S",
-        "usb_vid": "0x2e8a",
+        "usb_vid": "0x2E8A",
-        "usb_pid": "0x100b"
+        "usb_pid": "0x100B"
       }
     },
     "core": "earlephilhower",
@@ -15,6 +15,10 @@
       [
         "0x2E8A",
         "0x00C0"
+      ],
+      [
+        "0x2E8A",
+        "0x100B"
       ]
     ],
     "mcu": "rp2040",

boards/cytron_maker_nano_rp2040.json

@@ -3,8 +3,8 @@
     "arduino": {
       "earlephilhower": {
         "boot2_source": "boot2_w25q080_2_padded_checksum.S",
-        "usb_vid": "0x2e8a",
+        "usb_vid": "0x2E8A",
-        "usb_pid": "0x100f"
+        "usb_pid": "0x100F"
       }
     },
     "core": "earlephilhower",
@@ -15,6 +15,10 @@
       [
         "0x2E8A",
         "0x00C0"
+      ],
+      [
+        "0x2E8A",
+        "0x100F"
       ]
     ],
     "mcu": "rp2040",

boards/cytron_maker_pi_rp2040.json

@@ -3,7 +3,7 @@
     "arduino": {
       "earlephilhower": {
         "boot2_source": "boot2_w25q080_2_padded_checksum.S",
-        "usb_vid": "0x2e8a",
+        "usb_vid": "0x2E8A",
         "usb_pid": "0x1000"
       }
     },
@@ -15,6 +15,10 @@
       [
         "0x2E8A",
         "0x00C0"
+      ],
+      [
+        "0x2E8A",
+        "0x1000"
       ]
     ],
     "mcu": "rp2040",

boards/dfrobot_beetle_rp2040.json

@@ -15,6 +15,10 @@
       [
         "0x2E8A",
         "0x00C0"
+      ],
+      [
+        "0x3343",
+        "0x4253"
       ]
     ],
     "mcu": "rp2040",

boards/flyboard2040_core.json

@@ -3,8 +3,8 @@
     "arduino": {
       "earlephilhower": {
         "boot2_source": "boot2_generic_03h_4_padded_checksum.S",
-        "usb_vid": "0x2e8a",
+        "usb_vid": "0x2E8A",
-        "usb_pid": "0x008a"
+        "usb_pid": "0x008A"
       }
     },
     "core": "earlephilhower",
@@ -15,6 +15,10 @@
       [
         "0x2E8A",
         "0x00C0"
+      ],
+      [
+        "0x2E8A",
+        "0x008A"
       ]
     ],
     "mcu": "rp2040",

boards/generic.json

@@ -3,8 +3,8 @@
     "arduino": {
       "earlephilhower": {
         "boot2_source": "boot2_generic_03h_4_padded_checksum.S",
-        "usb_vid": "0x2e8a",
+        "usb_vid": "0x2E8A",
-        "usb_pid": "0xf00a"
+        "usb_pid": "0xF00A"
       }
     },
     "core": "earlephilhower",
@@ -15,6 +15,10 @@
       [
         "0x2E8A",
         "0x00C0"
+      ],
+      [
+        "0x2E8A",
+        "0xF00A"
       ]
     ],
     "mcu": "rp2040",

boards/ilabs_rpico32.json

@@ -3,7 +3,7 @@
     "arduino": {
       "earlephilhower": {
         "boot2_source": "boot2_w25q080_2_padded_checksum.S",
-        "usb_vid": "0x2e8a",
+        "usb_vid": "0x2E8A",
         "usb_pid": "0x1010"
       }
     },
@@ -15,6 +15,10 @@
       [
         "0x2E8A",
         "0x00C0"
+      ],
+      [
+        "0x2E8A",
+        "0x1010"
       ]
     ],
     "mcu": "rp2040",

boards/melopero_shake_rp2040.json

@@ -3,7 +3,7 @@
     "arduino": {
       "earlephilhower": {
         "boot2_source": "boot2_w25q080_2_padded_checksum.S",
-        "usb_vid": "0x2e8a",
+        "usb_vid": "0x2E8A",
         "usb_pid": "0x1005"
       }
     },
@@ -15,6 +15,10 @@
       [
         "0x2E8A",
         "0x00C0"
+      ],
+      [
+        "0x2E8A",
+        "0x1005"
       ]
     ],
     "mcu": "rp2040",

boards/pico.json

@@ -21,7 +21,10 @@
       ]
     ],
     "mcu": "rp2040",
-    "variant": "RASPBERRY_PI_PICO"
+    "variant": "RASPBERRY_PI_PICO",
+    "zephyr": {
+      "variant": "rpi_pico"
+    }
   },
   "debug": {
     "jlink_device": "RP2040_M0_0",
@@ -29,7 +32,8 @@
     "svd_path": "rp2040.svd"
   },
   "frameworks": [
-    "arduino"
+    "arduino",
+    "zephyr"
   ],
   "name": "Raspberry Pi Pico",
   "upload": {

boards/rpipico.json

@@ -3,8 +3,8 @@
     "arduino": {
       "earlephilhower": {
         "boot2_source": "boot2_w25q080_2_padded_checksum.S",
-        "usb_vid": "0x2e8a",
+        "usb_vid": "0x2E8A",
-        "usb_pid": "0x000a"
+        "usb_pid": "0x000A"
       }
     },
     "core": "earlephilhower",
@@ -15,6 +15,10 @@
       [
         "0x2E8A",
         "0x00C0"
+      ],
+      [
+        "0x2E8A",
+        "0x000A"
       ]
     ],
     "mcu": "rp2040",

boards/rpipicow.json

@@ -0,0 +1,54 @@
+{
+  "build": {
+    "arduino": {
+      "earlephilhower": {
+        "boot2_source": "boot2_w25q080_2_padded_checksum.S",
+        "usb_vid": "0x2E8A",
+        "usb_pid": "0xF00A"
+      }
+    },
+    "core": "earlephilhower",
+    "cpu": "cortex-m0plus",
+    "extra_flags": "-D ARDUINO_RASPBERRY_PI_PICO_W -DARDUINO_ARCH_RP2040 -DUSBD_MAX_POWER_MA=250",
+    "f_cpu": "133000000L",
+    "hwids": [
+      [
+        "0x2E8A",
+        "0x00C0"
+      ],
+      [
+        "0x2E8A",
+        "0xF00A"
+      ]
+    ],
+    "mcu": "rp2040",
+    "variant": "rpipicow"
+  },
+  "debug": {
+    "jlink_device": "RP2040_M0_0",
+    "openocd_target": "rp2040.cfg",
+    "svd_path": "rp2040.svd"
+  },
+  "frameworks": [
+    "arduino"
+  ],
+  "name": "Pico W",
+  "upload": {
+    "maximum_ram_size": 270336,
+    "maximum_size": 2097152,
+    "require_upload_port": true,
+    "native_usb": true,
+    "use_1200bps_touch": true,
+    "wait_for_upload_port": false,
+    "protocol": "picotool",
+    "protocols": [
+      "cmsis-dap",
+      "jlink",
+      "raspberrypi-swd",
+      "picotool",
+      "picoprobe"
+    ]
+  },
+  "url": "https://www.raspberrypi.org/products/raspberry-pi-pico/",
+  "vendor": "Raspberry Pi"
+}

boards/seeed_xiao_rp2040.json

@@ -3,8 +3,8 @@
     "arduino": {
       "earlephilhower": {
         "boot2_source": "boot2_w25q080_2_padded_checksum.S",
-        "usb_vid": "0x2e8a",
+        "usb_vid": "0x2E8A",
-        "usb_pid": "0x000a"
+        "usb_pid": "0x000A"
       }
     },
     "core": "earlephilhower",
@@ -15,6 +15,10 @@
       [
         "0x2E8A",
         "0x00C0"
+      ],
+      [
+        "0x2E8A",
+        "0x000A"
       ]
     ],
     "mcu": "rp2040",

boards/solderparty_rp2040_stamp.json

@@ -4,7 +4,7 @@
       "earlephilhower": {
         "boot2_source": "boot2_generic_03h_4_padded_checksum.S",
         "usb_vid": "0x1209",
-        "usb_pid": "0xa182"
+        "usb_pid": "0xA182"
       }
     },
     "core": "earlephilhower",
@@ -15,6 +15,10 @@
       [
         "0x2E8A",
         "0x00C0"
+      ],
+      [
+        "0x1209",
+        "0xA182"
       ]
     ],
     "mcu": "rp2040",

boards/sparkfun_promicrorp2040.json

@@ -3,7 +3,7 @@
     "arduino": {
       "earlephilhower": {
         "boot2_source": "boot2_generic_03h_4_padded_checksum.S",
-        "usb_vid": "0x1b4f",
+        "usb_vid": "0x1B4F",
         "usb_pid": "0x0026"
       }
     },
@@ -15,6 +15,10 @@
       [
         "0x2E8A",
         "0x00C0"
+      ],
+      [
+        "0x1B4F",
+        "0x0026"
       ]
     ],
     "mcu": "rp2040",

boards/sparkfun_thingplusrp2040.json

@@ -3,7 +3,7 @@
     "arduino": {
       "earlephilhower": {
         "boot2_source": "boot2_w25q080_2_padded_checksum.S",
-        "usb_vid": "0x1b4f",
+        "usb_vid": "0x1B4F",
         "usb_pid": "0x0026"
       }
     },
@@ -15,6 +15,10 @@
       [
         "0x2E8A",
         "0x00C0"
+      ],
+      [
+        "0x1B4F",
+        "0x0026"
       ]
     ],
     "mcu": "rp2040",

boards/upesy_rp2040_devkit.json

@@ -3,7 +3,7 @@
     "arduino": {
       "earlephilhower": {
         "boot2_source": "boot2_w25q080_2_padded_checksum.S",
-        "usb_vid": "0x2e8a",
+        "usb_vid": "0x2E8A",
         "usb_pid": "0x1007"
       }
     },
@@ -15,6 +15,10 @@
       [
         "0x2E8A",
         "0x00C0"
+      ],
+      [
+        "0x2E8A",
+        "0x1007"
       ]
     ],
     "mcu": "rp2040",

boards/wiznet_5100s_evb_pico.json

@@ -3,7 +3,7 @@
     "arduino": {
       "earlephilhower": {
         "boot2_source": "boot2_w25q080_2_padded_checksum.S",
-        "usb_vid": "0x2e8a",
+        "usb_vid": "0x2E8A",
         "usb_pid": "0x1027"
       }
     },
@@ -15,6 +15,10 @@
       [
         "0x2E8A",
         "0x00C0"
+      ],
+      [
+        "0x2E8A",
+        "0x1027"
       ]
     ],
     "mcu": "rp2040",

boards/wiznet_5500_evb_pico.json

@@ -3,7 +3,7 @@
     "arduino": {
       "earlephilhower": {
         "boot2_source": "boot2_w25q080_2_padded_checksum.S",
-        "usb_vid": "0x2e8a",
+        "usb_vid": "0x2E8A",
         "usb_pid": "0x1029"
       }
     },
@@ -15,6 +15,10 @@
       [
         "0x2E8A",
         "0x00C0"
+      ],
+      [
+        "0x2E8A",
+        "0x1029"
       ]
     ],
     "mcu": "rp2040",

boards/wiznet_wizfi360_evb_pico.json

@@ -3,7 +3,7 @@
     "arduino": {
       "earlephilhower": {
         "boot2_source": "boot2_w25q080_2_padded_checksum.S",
-        "usb_vid": "0x2e8a",
+        "usb_vid": "0x2E8A",
         "usb_pid": "0x1028"
       }
     },
@@ -15,6 +15,10 @@
       [
         "0x2E8A",
         "0x00C0"
+      ],
+      [
+        "0x2E8A",
+        "0x1028"
       ]
     ],
     "mcu": "rp2040",

builder/frameworks/zephyr.py

@@ -0,0 +1,30 @@
+# Copyright 2019-present PlatformIO <contact@platformio.org>
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#    http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+"""
+The Zephyr Project is a scalable real-time operating system (RTOS) supporting multiple
+hardware architectures, optimized for resource constrained devices, and built with
+safety and security in mind.
+
+https://github.com/zephyrproject-rtos/zephyr
+"""
+
+from os.path import join
+
+from SCons.Script import Import, SConscript
+
+Import("env")
+
+SConscript(
+    join(env.PioPlatform().get_package_dir("framework-zephyr"), "scripts",
+         "platformio", "platformio-build.py"), exports="env") 

builder/main.py

@@ -116,13 +116,33 @@ def BeforeUpload(target, source, env):  # pylint: disable=W0613,W0621
 
 
 def generate_uf2(target, source, env):
-    elf_file = target[0].get_path()
+    fw_file = target[0].get_path()
+    print("Framework is :" + str(env["PIOFRAMEWORK"]))
+    if "zephyr" in env["PIOFRAMEWORK"]:
+        FRAMEWORK_DIR = env.PioPlatform().get_package_dir("framework-zephyr")
+        env.Execute(
+            " ".join(
+                [
+                    "$PYTHONEXE",
+                    '"%s"' % join(FRAMEWORK_DIR, "scripts", "uf2conv.py"),
+                    "-c",
+                    "-f",
+                    "RP2040",
+                    "-b",
+                    board.get("upload.offset_address", "0x10000000"),
+                    "-o",
+                    '"%s"' % fw_file.replace(".bin", ".uf2"),
+                    '"%s"' % fw_file,
+                ]
+            )
+        )
+    else:
         env.Execute(
             " ".join(
                 [
                     "elf2uf2",
-                '"%s"' % elf_file,
+                    '"%s"' % fw_file,
-                '"%s"' % elf_file.replace(".elf", ".uf2"),
+                    '"%s"' % fw_file.replace(".elf", ".uf2"),
                 ]
             )
         )
@@ -213,6 +233,14 @@ env.Append(
 # Target: Build executable and linkable firmware
 #
 
+frameworks = env.get("PIOFRAMEWORK", [])
+if "zephyr" in frameworks:
+    env.SConscript(
+        join(platform.get_package_dir(
+            "framework-zephyr"), "scripts", "platformio", "platformio-build-pre.py"),
+        exports={"env": env}
+    )
+
 target_elf = None
 if "nobuild" in COMMAND_LINE_TARGETS:
     target_elf = join("$BUILD_DIR", "${PROGNAME}.elf")
@@ -231,8 +259,10 @@ env.AddPlatformTarget("buildfs", target_firm, target_firm, "Build Filesystem Ima
 AlwaysBuild(env.Alias("nobuild", target_firm))
 target_buildprog = env.Alias("buildprog", target_firm, target_firm)
 
+uf2_source = target_firm if "zephyr" in env["PIOFRAMEWORK"] else target_elf
+
 env.AddPostAction(
-    target_elf, env.VerboseAction(generate_uf2, "Generating UF2 image")
+    uf2_source, env.VerboseAction(generate_uf2, "Generating UF2 image")
 )
 
 def _update_max_upload_size(env):
@@ -330,10 +360,11 @@ elif upload_protocol.startswith("jlink"):
         if not isdir(build_dir):
             makedirs(build_dir)
         script_path = join(build_dir, "upload.jlink")
+        upload_addr = hex(env["FS_START"]) if "uploadfs" in COMMAND_LINE_TARGETS else board.get(
+            "upload.offset_address", "0x0")
         commands = [
             "h",
-            "loadbin %s, %s" % (source, board.get(
+            "loadbin %s, %s" % (source, upload_addr),
-                "upload.offset_address", "0x0")),
             "r",
             "q"
         ]

examples/arduino-blink/platformio.ini

@@ -39,3 +39,6 @@ board = seeed_xiao_rp2040
 
 [env:sparkfun_thingplusrp2040]
 board = sparkfun_thingplusrp2040
+
+[env:rpipicow]
+board = rpipicow

examples/arduino-wifi-scan/README.md

@@ -0,0 +1,25 @@
+How to build PlatformIO based project
+=====================================
+
+1. [Install PlatformIO Core](https://docs.platformio.org/page/core.html)
+2. Download [development platform with examples](https://github.com/platformio/platform-raspberrypi/archive/develop.zip)
+3. Extract ZIP archive
+4. Run these commands:
+
+```shell
+# Change directory to example
+$ cd platform-raspberrypi/examples/arduino-wifi-scan
+
+# Build project
+$ pio run
+
+# Upload firmware
+$ pio run --target upload
+
+# Clean build files
+$ pio run --target clean
+```
+
+## Notes
+
+This example is only intended for the Raspberry Pi Pico W with the [Earle Philhower](https://github.com/earlephilhower/arduino-pico) core.

examples/arduino-wifi-scan/include/README

@@ -0,0 +1,39 @@
+
+This directory is intended for project header files.
+
+A header file is a file containing C declarations and macro definitions
+to be shared between several project source files. You request the use of a
+header file in your project source file (C, C++, etc) located in `src` folder
+by including it, with the C preprocessing directive `#include'.
+
+```src/main.c
+
+#include "header.h"
+
+int main (void)
+{
+ ...
+}
+```
+
+Including a header file produces the same results as copying the header file
+into each source file that needs it. Such copying would be time-consuming
+and error-prone. With a header file, the related declarations appear
+in only one place. If they need to be changed, they can be changed in one
+place, and programs that include the header file will automatically use the
+new version when next recompiled. The header file eliminates the labor of
+finding and changing all the copies as well as the risk that a failure to
+find one copy will result in inconsistencies within a program.
+
+In C, the usual convention is to give header files names that end with `.h'.
+It is most portable to use only letters, digits, dashes, and underscores in
+header file names, and at most one dot.
+
+Read more about using header files in official GCC documentation:
+
+* Include Syntax
+* Include Operation
+* Once-Only Headers
+* Computed Includes
+
+https://gcc.gnu.org/onlinedocs/cpp/Header-Files.html

examples/arduino-wifi-scan/lib/README

@@ -0,0 +1,46 @@
+
+This directory is intended for project specific (private) libraries.
+PlatformIO will compile them to static libraries and link into executable file.
+
+The source code of each library should be placed in a an own separate directory
+("lib/your_library_name/[here are source files]").
+
+For example, see a structure of the following two libraries `Foo` and `Bar`:
+
+|--lib
+|  |
+|  |--Bar
+|  |  |--docs
+|  |  |--examples
+|  |  |--src
+|  |     |- Bar.c
+|  |     |- Bar.h
+|  |  |- library.json (optional, custom build options, etc) https://docs.platformio.org/page/librarymanager/config.html
+|  |
+|  |--Foo
+|  |  |- Foo.c
+|  |  |- Foo.h
+|  |
+|  |- README --> THIS FILE
+|
+|- platformio.ini
+|--src
+   |- main.c
+
+and a contents of `src/main.c`:
+```
+#include <Foo.h>
+#include <Bar.h>
+
+int main (void)
+{
+  ...
+}
+
+```
+
+PlatformIO Library Dependency Finder will find automatically dependent
+libraries scanning project source files.
+
+More information about PlatformIO Library Dependency Finder
+- https://docs.platformio.org/page/librarymanager/ldf.html

examples/arduino-wifi-scan/platformio.ini

@@ -0,0 +1,15 @@
+; PlatformIO Project Configuration File
+;
+;   Build options: build flags, source filter, extra scripting
+;   Upload options: custom port, speed and extra flags
+;   Library options: dependencies, extra library storages
+;
+; Please visit documentation for the other options and examples
+; https://docs.platformio.org/page/projectconf.html
+
+[env]
+platform = raspberrypi
+framework = arduino
+
+[env:rpipicow]
+board = rpipicow

examples/arduino-wifi-scan/src/main.cpp

@@ -0,0 +1,43 @@
+// Simple WiFi network scanner application
+// Released to the public domain in 2022 by Earle F. Philhower, III
+#include <Arduino.h>
+#include <WiFi.h>
+
+void setup() {
+  Serial.begin(115200);
+}
+
+const char *macToString(uint8_t mac[6]) {
+  static char s[20];
+  sprintf(s, "%02X:%02X:%02X:%02X:%02X:%02X", mac[0], mac[1], mac[2], mac[3], mac[4], mac[5]);
+  return s;
+}
+
+const char *encToString(uint8_t enc) {
+  switch (enc) {
+    case ENC_TYPE_NONE: return "NONE";
+    case ENC_TYPE_TKIP: return "WPA";
+    case ENC_TYPE_CCMP: return "WPA2";
+    case ENC_TYPE_AUTO: return "AUTO";
+  }
+  return "UNKN";
+}
+
+void loop() {
+  delay(5000);
+  Serial.printf("Beginning scan at %d\n", millis());
+  auto cnt = WiFi.scanNetworks();
+  if (!cnt) {
+    Serial.printf("No networks found\n");
+  } else {
+    Serial.printf("Found %d networks\n\n", cnt);
+    Serial.printf("%32s %5s %17s %2s %4s\n", "SSID", "ENC", "BSSID        ", "CH", "RSSI");
+    for (auto i = 0; i < cnt; i++) {
+      uint8_t bssid[6];
+      WiFi.BSSID(i, bssid);
+      Serial.printf("%32s %5s %17s %2d %4d\n", WiFi.SSID(i), encToString(WiFi.encryptionType(i)), macToString(bssid), WiFi.channel(i), WiFi.RSSI(i));
+    }
+  }
+  Serial.printf("\n--- Sleeping ---\n\n\n");
+  delay(5000);
+}

examples/arduino-wifi-scan/test/README

@@ -0,0 +1,11 @@
+
+This directory is intended for PIO Unit Testing and project tests.
+
+Unit Testing is a software testing method by which individual units of
+source code, sets of one or more MCU program modules together with associated
+control data, usage procedures, and operating procedures, are tested to
+determine whether they are fit for use. Unit testing finds problems early
+in the development cycle.
+
+More information about PIO Unit Testing:
+- https://docs.platformio.org/page/plus/unit-testing.html

examples/zephyr-blink/include/README

@@ -0,0 +1,39 @@
+
+This directory is intended for project header files.
+
+A header file is a file containing C declarations and macro definitions
+to be shared between several project source files. You request the use of a
+header file in your project source file (C, C++, etc) located in `src` folder
+by including it, with the C preprocessing directive `#include'.
+
+```src/main.c
+
+#include "header.h"
+
+int main (void)
+{
+ ...
+}
+```
+
+Including a header file produces the same results as copying the header file
+into each source file that needs it. Such copying would be time-consuming
+and error-prone. With a header file, the related declarations appear
+in only one place. If they need to be changed, they can be changed in one
+place, and programs that include the header file will automatically use the
+new version when next recompiled. The header file eliminates the labor of
+finding and changing all the copies as well as the risk that a failure to
+find one copy will result in inconsistencies within a program.
+
+In C, the usual convention is to give header files names that end with `.h'.
+It is most portable to use only letters, digits, dashes, and underscores in
+header file names, and at most one dot.
+
+Read more about using header files in official GCC documentation:
+
+* Include Syntax
+* Include Operation
+* Once-Only Headers
+* Computed Includes
+
+https://gcc.gnu.org/onlinedocs/cpp/Header-Files.html

examples/zephyr-blink/lib/README

@@ -0,0 +1,46 @@
+
+This directory is intended for project specific (private) libraries.
+PlatformIO will compile them to static libraries and link into executable file.
+
+The source code of each library should be placed in a an own separate directory
+("lib/your_library_name/[here are source files]").
+
+For example, see a structure of the following two libraries `Foo` and `Bar`:
+
+|--lib
+|  |
+|  |--Bar
+|  |  |--docs
+|  |  |--examples
+|  |  |--src
+|  |     |- Bar.c
+|  |     |- Bar.h
+|  |  |- library.json (optional, custom build options, etc) https://docs.platformio.org/page/librarymanager/config.html
+|  |
+|  |--Foo
+|  |  |- Foo.c
+|  |  |- Foo.h
+|  |
+|  |- README --> THIS FILE
+|
+|- platformio.ini
+|--src
+   |- main.c
+
+and a contents of `src/main.c`:
+```
+#include <Foo.h>
+#include <Bar.h>
+
+int main (void)
+{
+  ...
+}
+
+```
+
+PlatformIO Library Dependency Finder will find automatically dependent
+libraries scanning project source files.
+
+More information about PlatformIO Library Dependency Finder
+- https://docs.platformio.org/page/librarymanager/ldf.html

examples/zephyr-blink/platformio.ini

@@ -0,0 +1,14 @@
+; PlatformIO Project Configuration File
+;
+;   Build options: build flags, source filter
+;   Upload options: custom upload port, speed and extra flags
+;   Library options: dependencies, extra library storages
+;   Advanced options: extra scripting
+;
+; Please visit documentation for the other options and examples
+; https://docs.platformio.org/page/projectconf.html
+
+[env:pico]
+platform = https://github.com/maxgerhardt/platform-raspberrypi.git
+board = pico
+framework = zephyr

examples/zephyr-blink/src/main.c

@@ -0,0 +1,51 @@
+/*
+ * Copyright (c) 2016 Intel Corporation
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#include <zephyr.h>
+#include <device.h>
+#include <devicetree.h>
+#include <drivers/gpio.h>
+
+/* 1000 msec = 1 sec */
+#define SLEEP_TIME_MS   1000
+
+/* The devicetree node identifier for the "led0" alias. */
+#define LED0_NODE DT_ALIAS(led0)
+
+#if DT_NODE_HAS_STATUS(LED0_NODE, okay)
+#define LED0	DT_GPIO_LABEL(LED0_NODE, gpios)
+#define PIN	DT_GPIO_PIN(LED0_NODE, gpios)
+#define FLAGS	DT_GPIO_FLAGS(LED0_NODE, gpios)
+#else
+/* A build error here means your board isn't set up to blink an LED. */
+#error "Unsupported board: led0 devicetree alias is not defined"
+#define LED0	""
+#define PIN	0
+#define FLAGS	0
+#endif
+
+void main(void)
+{
+	const struct device *dev;
+	bool led_is_on = true;
+	int ret;
+
+	dev = device_get_binding(LED0);
+	if (dev == NULL) {
+		return;
+	}
+
+	ret = gpio_pin_configure(dev, PIN, GPIO_OUTPUT_ACTIVE | FLAGS);
+	if (ret < 0) {
+		return;
+	}
+
+	while (1) {
+		gpio_pin_set(dev, PIN, (int)led_is_on);
+		led_is_on = !led_is_on;
+		k_msleep(SLEEP_TIME_MS);
+	}
+}

examples/zephyr-blink/test/README

@@ -0,0 +1,11 @@
+
+This directory is intended for PlatformIO Test Runner and project tests.
+
+Unit Testing is a software testing method by which individual units of
+source code, sets of one or more MCU program modules together with associated
+control data, usage procedures, and operating procedures, are tested to
+determine whether they are fit for use. Unit testing finds problems early
+in the development cycle.
+
+More information about PlatformIO Unit Testing:
+- https://docs.platformio.org/en/latest/advanced/unit-testing/index.html

examples/zephyr-blink/zephyr/CMakeLists.txt

@@ -0,0 +1,7 @@
+# SPDX-License-Identifier: Apache-2.0
+
+cmake_minimum_required(VERSION 3.20.0)
+find_package(Zephyr REQUIRED HINTS $ENV{ZEPHYR_BASE})
+project(blinky)
+
+target_sources(app PRIVATE ../src/main.c)

examples/zephyr-blink/zephyr/prj.conf

@@ -0,0 +1 @@
+# nothing here

platform.json

@@ -23,19 +23,26 @@
     "arduino": {
       "package": "framework-arduino-mbed",
       "script": "builder/frameworks/arduino/arduino.py"
+    },
+    "zephyr": {
+      "package": "framework-zephyr",
+      "script": "builder/frameworks/zephyr.py",
+      "description": "The Zephyr Project is a scalable real-time operating system (RTOS) supporting multiple hardware architectures, optimized for resource constrained devices, and built with safety and security in mind",
+      "homepage": "https://www.zephyrproject.org",
+      "title": "Zephyr RTOS"
     }
   },
   "packages": {
     "toolchain-gccarmnoneeabi": {
       "type": "toolchain",
       "owner": "platformio",
-      "version": "~1.90201.0"
+      "version": ">=1.90201.0,<1.90302.0"
     },
     "toolchain-rp2040-earlephilhower": {
       "type": "toolchain", 
       "optional": true,
       "owner": "earlephilhower",
-      "version": "~5.100300.0"
+      "version": "5.100300.220714"
     },
     "framework-arduino-mbed": {
       "type": "framework",
@@ -47,7 +54,13 @@
       "type": "framework",
       "optional": true,
       "owner": "earlephilhower",
-      "version": "https://github.com/maxgerhardt/arduino-pico.git"
+      "version": "~1.20303.0"
+    },
+    "framework-zephyr": {
+      "type": "framework",
+      "optional": true,
+      "owner": "platformio",
+      "version": "https://github.com/maxgerhardt/zephyr.git#3.1.0_pio"
     },
     "tool-rp2040tools": {
       "type": "uploader",
@@ -71,6 +84,26 @@
       "optional": true,
       "owner": "earlephilhower",
       "version": "~5.100300.0"
+    },
+    "tool-cmake": {
+      "optional": true,
+      "owner": "platformio",
+      "version": "~3.21.0"
+    },
+    "tool-dtc": {
+      "optional": true,
+      "owner": "platformio",
+      "version": "~1.4.7"
+    },
+    "tool-ninja": {
+      "optional": true,
+      "owner": "platformio",
+      "version": "^1.7.0"
+    },
+    "tool-gperf": {
+      "optional": true,
+      "owner": "platformio",
+      "version": "^3.0.0"
     }
   }
 }

platform.py

@@ -13,10 +13,13 @@
 # limitations under the License.
 
 import platform
+import sys
 
 from platformio.public import PlatformBase
 
 
+IS_WINDOWS = sys.platform.startswith("win")
+
 class RaspberrypiPlatform(PlatformBase):
 
     def is_embedded(self):
@@ -51,6 +54,15 @@ class RaspberrypiPlatform(PlatformBase):
         if "buildfs" in targets:
             self.packages["tool-mklittlefs-rp2040-earlephilhower"]["optional"] = False
 
+        if "zephyr" in variables.get("pioframework", []):
+            for p in self.packages:
+                if p in ("tool-cmake", "tool-dtc", "tool-ninja"):
+                    self.packages[p]["optional"] = False
+            self.packages["toolchain-gccarmnoneeabi"]["version"] = "~1.80201.0"
+            self.packages.pop("toolchain-rp2040-earlephilhower", None)
+            if not IS_WINDOWS:
+                self.packages["tool-gperf"]["optional"] = False
+
         # configure J-LINK tool
         jlink_conds = [
             "jlink" in variables.get(option, "")