Remove reference to wafer_id (#2512 )

`wafer_id` is not correct, as it is a 64-bit `device_ID` instead of a separate `device_id` and `wafer_id`
Fix typo (#2508 )
2025-06-10 08:49:04 -05:00 · 2025-06-09 09:37:20 -05:00 · 2025-06-03 11:06:35 -05:00 · 2025-05-30 16:17:46 -05:00 · 2025-05-30 08:35:25 -05:00 · 2025-05-30 08:33:04 -05:00
263 changed files with 4832 additions and 1170 deletions
--- a/.bazelignore
+++ b/.bazelignore
@ -1,4 +0,0 @@
-# Don't accidentally pick up external CMake deps with Bazel build files.
-build
-# Don't treat submodules as part of this project.
-lib
--- a/.bazelrc
+++ b/.bazelrc
@ -4,3 +4,7 @@ common --host_per_file_copt=external/.*@-w

 # Produce useful output when the build fails.
 common --verbose_failures
+
+# Silence warnings about old bazel_dep pins. Bazel 8 brings along newer ones,
+# but we can support Bazel 7 (for now).
+common --check_direct_dependencies=off
--- a/.bazelversion
+++ b/.bazelversion
@ -1 +1 @@
-7.2.1
+8.1.0
--- a/.github/workflows/choco_packages.config
+++ b/.github/workflows/choco_packages.config
@ -2,5 +2,5 @@
 <packages>
  <package id="gcc-arm-embedded" version="10.2.1" />
  <package id="mingw" version="12.2.0" />
-  <package id="ninja" version="1.11.1" />
+  <package id="ninja" version="1.12.1" />
 </packages>
--- a/.github/workflows/cmake.yml
+++ b/.github/workflows/cmake.yml
@ -26,7 +26,7 @@ jobs:
      uses: actions/checkout@v4

    - name: Checkout submodules
-      run: git submodule update --init
+      run: git submodule update --init --recursive

    - name: Create Build Environment
      # Some projects don't allow in-source building, so create a separate build directory
--- a/MODULE.bazel
+++ b/MODULE.bazel
@ -1,6 +1,6 @@
 module(
    name = "pico-sdk",
-    version = "2.1.1",
+    version = "2.1.2-develop",
 )

 bazel_dep(name = "platforms", version = "0.0.9")
@ -106,7 +106,7 @@ new_git_repository(
 new_git_repository(
    name = "cyw43-driver",
    build_file = "//src/rp2_common/pico_cyw43_driver:cyw43-driver.BUILD",
-    commit = "c1075d4bc440422cf2b2fd12c64a1f53f77660ee",  # keep-in-sync-with-submodule: lib/cyw43-driver
+    commit = "dd7568229f3bf7a37737b9e1ef250c26efe75b23",  # keep-in-sync-with-submodule: lib/cyw43-driver
    remote = "https://github.com/georgerobotics/cyw43-driver.git",
 )

@ -114,10 +114,17 @@ new_git_repository(
 new_git_repository(
    name = "lwip",
    build_file = "//src/rp2_common/pico_lwip:lwip.BUILD",
-    commit = "0a0452b2c39bdd91e252aef045c115f88f6ca773",  # keep-in-sync-with-submodule: lib/lwip
+    commit = "77dcd25a72509eb83f72b033d219b1d40cd8eb95",  # keep-in-sync-with-submodule: lib/lwip
    remote = "https://github.com/lwip-tcpip/lwip.git",
 )

+new_git_repository(
+    name = "mbedtls",
+    build_file = "//src/rp2_common/pico_mbedtls:mbedtls.BUILD",
+    commit = "107ea89daaefb9867ea9121002fbbdf926780e98",  # keep-in-sync-with-submodule: lib/mbedtls
+    remote = "https://github.com/Mbed-TLS/mbedtls.git",
+)
+
 register_toolchains(
    "//bazel/toolchain:linux-aarch64-rp2040",
    "//bazel/toolchain:linux-aarch64-rp2350",
--- a/REPO.bazel
+++ b/REPO.bazel
@ -0,0 +1,10 @@
+ignore_directories(
+    [
+        # Don't accidentally pick up external CMake deps with Bazel build files.
+        "cmake-*",
+        "build",
+        "build-*",
+        # Don't treat submodules as part of this project.
+        "lib",
+    ],
+)
--- a/bazel/config/BUILD.bazel
+++ b/bazel/config/BUILD.bazel
@ -186,6 +186,12 @@ int_flag(
    build_setting_default = 0,
 )

+# PICO_BAZEL_CONFIG: PICO_TINYUSB_CONFIG, [Bazel only] The library that provides TinyUSB config header (e.g. tusb_config.h), default=//src/rp2_common/pico_stdio_usb:tusb_config, group=build
+label_flag(
+    name = "PICO_TINYUSB_CONFIG",
+    build_setting_default = "//src/rp2_common/pico_stdio_usb:tusb_config",
+)
+
 # PICO_BAZEL_CONFIG: PICO_TINYUSB_LIB, [Bazel only] The library that provides TinyUSB, default=@tinyusb//:tinyusb, group=build
 label_flag(
    name = "PICO_TINYUSB_LIB",
@ -288,3 +294,9 @@ label_flag(
    name = "PICO_FREERTOS_LIB",
    build_setting_default = "//bazel:empty_cc_lib",
 )
+
+# PICO_BAZEL_CONFIG: PICO_MBEDTL_CONFIG, [Bazel only] The cc_library that provides mbedtls_config.h, default=//bazel:empty_cc_lib, group=pico_mbedtls
+label_flag(
+    name = "PICO_MBEDTLS_CONFIG",
+    build_setting_default = "//bazel:empty_cc_lib",
+)
--- a/bazel/constraint/BUILD.bazel
+++ b/bazel/constraint/BUILD.bazel
@ -252,3 +252,9 @@ label_flag_matches(
    flag = "//bazel/config:PICO_FREERTOS_LIB",
    value = "//bazel:empty_cc_lib",
 )
+
+label_flag_matches(
+    name = "pico_mbedtls_config_unset",
+    flag = "//bazel/config:PICO_MBEDTLS_CONFIG",
+    value = "//bazel:empty_cc_lib",
+)
--- a/bazel/util/transition.bzl
+++ b/bazel/util/transition.bzl
@ -114,6 +114,7 @@ kitchen_sink_test_binary = declare_transtion(
    attrs = {
        "bt_stack_config": attr.label(mandatory = True),
        "lwip_config": attr.label(mandatory = True),
+        "mbedtls_config": attr.label(mandatory = True),
        "enable_ble": attr.bool(default = False),
        "enable_bt_classic": attr.bool(default = False),
        # This could be shared, but we don't in order to make it clearer that
@ -127,6 +128,7 @@ kitchen_sink_test_binary = declare_transtion(
        "@pico-sdk//bazel/config:PICO_LWIP_CONFIG": "lwip_config",
        "@pico-sdk//bazel/config:PICO_BT_ENABLE_BLE": "enable_ble",
        "@pico-sdk//bazel/config:PICO_BT_ENABLE_CLASSIC": "enable_bt_classic",
+        "@pico-sdk//bazel/config:PICO_MBEDTLS_CONFIG": "mbedtls_config",
    },
 )

--- a/cmake/generic_board.cmake
+++ b/cmake/generic_board.cmake
@ -20,10 +20,22 @@ if (EXISTS ${PICO_BOARD_HEADER_FILE})

    while(HEADER_FILE_CONTENTS)
        list(POP_FRONT HEADER_FILE_CONTENTS LINE)
-        if (LINE MATCHES "^[ \t\]*//[ \t\]*pico_cmake_set[ \t\]*([a-zA-Z_][a-zA-Z0-9_]*)[ \t\]*=[ \t\]*(.*)")
+        # pico_board_cmake_set(var, value)
+        if (LINE MATCHES "^[ \t\]*pico_board_cmake_set[ \t\]*\\([ \t\]*([a-zA-Z_][a-zA-Z0-9_]*)[ \t\]*,[ \t\]*(.*)[ \t\]*\\)[ \t\]*")
            set("${CMAKE_MATCH_1}" "${CMAKE_MATCH_2}")
-        endif()
-        if (LINE MATCHES "^[ \t\]*//[ \t\]*pico_cmake_set_default[ \t\]*([a-zA-Z_][a-zA-Z0-9_]*)[ \t\]*=[ \t\]*(.*)")
+        # pico_board_cmake_set_default(var, value)
+        elseif (LINE MATCHES "^[ \t\]*pico_board_cmake_set_default[ \t\]*\\([ \t\]*([a-zA-Z_][a-zA-Z0-9_]*)[ \t\]*,[ \t\]*(.*)[ \t\]*\\)[ \t\]*")
+            if (NOT DEFINED "${CMAKE_MATCH_1}")
+                set("${CMAKE_MATCH_1}" "${CMAKE_MATCH_2}")
+            else()
+                list(APPEND PICO_BOARD_CMAKE_OVERRIDES ${CMAKE_MATCH_1})
+            endif()
+        # continue to support these for now
+        # // pico_cmake_set var = value
+        elseif (LINE MATCHES "^[ \t\]*//[ \t\]*pico_cmake_set[ \t\]*([a-zA-Z_][a-zA-Z0-9_]*)[ \t\]*=[ \t\]*(.*)")
+            set("${CMAKE_MATCH_1}" "${CMAKE_MATCH_2}")
+        # // pico_cmake_set_default var = value
+        elseif (LINE MATCHES "^[ \t\]*//[ \t\]*pico_cmake_set_default[ \t\]*([a-zA-Z_][a-zA-Z0-9_]*)[ \t\]*=[ \t\]*(.*)")
            if (NOT DEFINED "${CMAKE_MATCH_1}")
                set("${CMAKE_MATCH_1}" "${CMAKE_MATCH_2}")
            else()
--- a/cmake/pico_pre_load_platform.cmake
+++ b/cmake/pico_pre_load_platform.cmake
@ -122,7 +122,7 @@ if (PICO_PREVIOUS_PLATFORM AND NOT PICO_PREVIOUS_PLATFORM STREQUAL PICO_PLATFORM
                The best practice is to use separate build directories for different platforms.")
 endif()
 set(PICO_PLATFORM ${PICO_PLATFORM} CACHE STRING "PICO Build platform (e.g. rp2040, rp2350, rp2350-riscv,  host)" FORCE)
-set(PICO_PREVIOUS_PLATFORM ${PICO_PLATFORM} CACHE STRING "Saved PICO Build platform (e.g. rp2040, rp2350, rp2350-riscv,  host)" INTERNAL)
+set(PICO_PREVIOUS_PLATFORM ${PICO_PLATFORM} CACHE INTERNAL "Saved PICO Build platform (e.g. rp2040, rp2350, rp2350-riscv,  host)")

 # PICO_CMAKE_CONFIG: PICO_CMAKE_PRELOAD_PLATFORM_FILE, Custom CMake file to use to set up the platform environment, type=string, group=build
 set(PICO_CMAKE_PRELOAD_PLATFORM_FILE ${PICO_CMAKE_PRELOAD_PLATFORM_FILE} CACHE INTERNAL "")
--- a/docs/index.h
+++ b/docs/index.h
@ -48,9 +48,9 @@
 * \cond hardware_watchdog \defgroup hardware_watchdog hardware_watchdog \endcond
 * \cond hardware_xip_cache \defgroup hardware_xip_cache hardware_xip_cache \endcond
 * \cond hardware_xosc \defgroup hardware_xosc hardware_xosc \endcond
- * \cond hardware_powman hardware_powman
- * \cond hardware_hazard3 hardware_hazard3
- * \cond hardware_riscv hardware_riscv
+ * \cond hardware_powman \defgroup hardware_powman hardware_powman \endcond
+ * \cond hardware_hazard3 \defgroup hardware_hazard3 hardware_hazard3 \endcond
+ * \cond hardware_riscv \defgroup hardware_riscv hardware_riscv \endcond

 * @}
 *
@ -80,6 +80,7 @@
 * \defgroup tinyusb_device tinyusb_device
 * \defgroup tinyusb_host tinyusb_host
 * \endcond
+ * \cond pico_mbedtls \defgroup pico_mbedtls pico_mbedtls \endcond
 * @}
 *
 * \defgroup networking Networking Libraries
--- a/lib/cyw43-driver
+++ b/lib/cyw43-driver
@ -1 +1 @@
-Subproject commit c1075d4bc440422cf2b2fd12c64a1f53f77660ee
+Subproject commit dd7568229f3bf7a37737b9e1ef250c26efe75b23
--- a/lib/lwip
+++ b/lib/lwip
@ -1 +1 @@
-Subproject commit 0a0452b2c39bdd91e252aef045c115f88f6ca773
+Subproject commit 77dcd25a72509eb83f72b033d219b1d40cd8eb95
--- a/lib/mbedtls
+++ b/lib/mbedtls
@ -1 +1 @@
-Subproject commit 5a764e5555c64337ed17444410269ff21cb617b1
+Subproject commit 107ea89daaefb9867ea9121002fbbdf926780e98
--- a/pico_sdk_version.cmake
+++ b/pico_sdk_version.cmake
@ -6,10 +6,10 @@ set(PICO_SDK_VERSION_MAJOR 2)
 set(PICO_SDK_VERSION_MINOR 1)
 # PICO_BUILD_DEFINE: PICO_SDK_VERSION_REVISION, SDK version revision, type=int, default=Current SDK revision, group=pico_base
 # PICO_CMAKE_CONFIG: PICO_SDK_VERSION_REVISION, SDK version revision, type=int, default=Current SDK revision, group=pico_base
-set(PICO_SDK_VERSION_REVISION 1)
+set(PICO_SDK_VERSION_REVISION 2)
 # PICO_BUILD_DEFINE: PICO_SDK_VERSION_PRE_RELEASE_ID, Optional SDK pre-release version identifier, default=Current SDK pre-release identifier, type=string, group=pico_base
 # PICO_CMAKE_CONFIG: PICO_SDK_VERSION_PRE_RELEASE_ID, Optional SDK pre-release version identifier, default=Current SDK pre-release identifier, type=string, group=pico_base
-# set(PICO_SDK_VERSION_PRE_RELEASE_ID develop)
+set(PICO_SDK_VERSION_PRE_RELEASE_ID develop)

 # PICO_BUILD_DEFINE: PICO_SDK_VERSION_STRING, SDK version string, type=string, default=Current SDK version string, group=pico_base
 # PICO_CMAKE_CONFIG: PICO_SDK_VERSION_STRING, SDK version string, type=string, default=Current SDK version string, group=pico_base
--- a/src/BUILD.bazel
+++ b/src/BUILD.bazel
@ -19,6 +19,7 @@ alias(
        "//src/rp2_common/boot_bootrom_headers:__pkg__",
        "//src/rp2_common/hardware_boot_lock:__pkg__",
        "//src/rp2_common/pico_flash:__pkg__",
+        "//src/rp2_common/hardware_rcp:__pkg__",
    ],
 )

--- a/src/boards/include/boards/0xcb_helios.h
+++ b/src/boards/include/boards/0xcb_helios.h
@ -12,11 +12,11 @@
 //------------------------------------------------------------------------------------------
 // Board definition for the 0xCB Helios

-// pico_cmake_set PICO_PLATFORM=rp2040
-
 #ifndef _BOARDS_0XCB_HELIOS_H
 #define _BOARDS_0XCB_HELIOS_H

+pico_board_cmake_set(PICO_PLATFORM, rp2040)
+
 // For board detection
 #define _0XCB_HELIOS

@ -73,7 +73,7 @@
 #endif

 // board has 16M onboard flash
-// pico_cmake_set_default PICO_FLASH_SIZE_BYTES = (16 * 1024 * 1024)
+pico_board_cmake_set_default(PICO_FLASH_SIZE_BYTES, (16 * 1024 * 1024))
 #ifndef PICO_FLASH_SIZE_BYTES
 #define PICO_FLASH_SIZE_BYTES (16 * 1024 * 1024)
 #endif
--- a/src/boards/include/boards/adafruit_feather_rp2040.h
+++ b/src/boards/include/boards/adafruit_feather_rp2040.h
@ -9,11 +9,11 @@
 //       SHOULD ONLY CONSIST OF PREPROCESSOR DIRECTIVES
 // -----------------------------------------------------

-// pico_cmake_set PICO_PLATFORM=rp2040
-
 #ifndef _BOARDS_ADAFRUIT_FEATHER_RP2040_H
 #define _BOARDS_ADAFRUIT_FEATHER_RP2040_H

+pico_board_cmake_set(PICO_PLATFORM, rp2040)
+
 // For board detection
 #define ADAFRUIT_FEATHER_RP2040

@ -83,7 +83,7 @@
 #define PICO_FLASH_SPI_CLKDIV 4
 #endif

-// pico_cmake_set_default PICO_FLASH_SIZE_BYTES = (8 * 1024 * 1024)
+pico_board_cmake_set_default(PICO_FLASH_SIZE_BYTES, (8 * 1024 * 1024))
 #ifndef PICO_FLASH_SIZE_BYTES
 #define PICO_FLASH_SIZE_BYTES (8 * 1024 * 1024)
 #endif
--- a/src/boards/include/boards/adafruit_feather_rp2040_usb_host.h
+++ b/src/boards/include/boards/adafruit_feather_rp2040_usb_host.h
@ -9,11 +9,11 @@
 //       SHOULD ONLY CONSIST OF PREPROCESSOR DIRECTIVES
 // -----------------------------------------------------

-// pico_cmake_set PICO_PLATFORM=rp2040
-
 #ifndef _BOARDS_ADAFRUIT_FEATHER_RP2040_USB_HOST_H
 #define _BOARDS_ADAFRUIT_FEATHER_RP2040_USB_HOST_H

+pico_board_cmake_set(PICO_PLATFORM, rp2040)
+
 // For board detection
 #define ADAFRUIT_FEATHER_RP2040_USB_HOST

@ -79,7 +79,7 @@
 #define PICO_FLASH_SPI_CLKDIV 4
 #endif

-// pico_cmake_set_default PICO_FLASH_SIZE_BYTES = (8 * 1024 * 1024)
+pico_board_cmake_set_default(PICO_FLASH_SIZE_BYTES, (8 * 1024 * 1024))
 #ifndef PICO_FLASH_SIZE_BYTES
 #define PICO_FLASH_SIZE_BYTES (8 * 1024 * 1024)
 #endif
--- a/src/boards/include/boards/adafruit_feather_rp2350.h
+++ b/src/boards/include/boards/adafruit_feather_rp2350.h
@ -11,11 +11,11 @@

 // This header may be included by other board headers as "boards/adafruit_feather_rp2350.h"

-// pico_cmake_set PICO_PLATFORM=rp2350
-
 #ifndef _BOARDS_ADAFRUIT_FEATHER_RP2350_H
 #define _BOARDS_ADAFRUIT_FEATHER_RP2350_H

+pico_board_cmake_set(PICO_PLATFORM, rp2350)
+
 // On some samples, the xosc can take longer to stabilize than is usual
 #ifndef PICO_XOSC_STARTUP_DELAY_MULTIPLIER
 #define PICO_XOSC_STARTUP_DELAY_MULTIPLIER 64
@ -78,12 +78,12 @@
 #define PICO_FLASH_SPI_CLKDIV 2
 #endif

-// pico_cmake_set_default PICO_FLASH_SIZE_BYTES = (8 * 1024 * 1024)
+pico_board_cmake_set_default(PICO_FLASH_SIZE_BYTES, (8 * 1024 * 1024))
 #ifndef PICO_FLASH_SIZE_BYTES
 #define PICO_FLASH_SIZE_BYTES (8 * 1024 * 1024)
 #endif

-// pico_cmake_set_default PICO_RP2350_A2_SUPPORTED = 1
+pico_board_cmake_set_default(PICO_RP2350_A2_SUPPORTED, 1)
 #ifndef PICO_RP2350_A2_SUPPORTED
 #define PICO_RP2350_A2_SUPPORTED 1
 #endif
--- a/src/boards/include/boards/adafruit_itsybitsy_rp2040.h
+++ b/src/boards/include/boards/adafruit_itsybitsy_rp2040.h
@ -9,11 +9,11 @@
 //       SHOULD ONLY CONSIST OF PREPROCESSOR DIRECTIVES
 // -----------------------------------------------------

-// pico_cmake_set PICO_PLATFORM=rp2040
-
 #ifndef _BOARDS_ADAFRUIT_ITSYBITSY_RP2040_H
 #define _BOARDS_ADAFRUIT_ITSYBITSY_RP2040_H

+pico_board_cmake_set(PICO_PLATFORM, rp2040)
+
 // For board detection
 #define ADAFRUIT_ITSYBITSY_RP2040

@ -86,7 +86,7 @@
 #define PICO_FLASH_SPI_CLKDIV 2
 #endif

-// pico_cmake_set_default PICO_FLASH_SIZE_BYTES = (8 * 1024 * 1024)
+pico_board_cmake_set_default(PICO_FLASH_SIZE_BYTES, (8 * 1024 * 1024))
 #ifndef PICO_FLASH_SIZE_BYTES
 #define PICO_FLASH_SIZE_BYTES (8 * 1024 * 1024)
 #endif
--- a/src/boards/include/boards/adafruit_kb2040.h
+++ b/src/boards/include/boards/adafruit_kb2040.h
@ -9,11 +9,11 @@
 //       SHOULD ONLY CONSIST OF PREPROCESSOR DIRECTIVES
 // -----------------------------------------------------

-// pico_cmake_set PICO_PLATFORM=rp2040
-
 #ifndef _BOARDS_ADAFRUIT_KB2040_H
 #define _BOARDS_ADAFRUIT_KB2040_H

+pico_board_cmake_set(PICO_PLATFORM, rp2040)
+
 // For board detection
 #define ADAFRUIT_KB2040

@ -78,7 +78,7 @@
 #define PICO_FLASH_SPI_CLKDIV 2
 #endif

-// pico_cmake_set_default PICO_FLASH_SIZE_BYTES = (8 * 1024 * 1024)
+pico_board_cmake_set_default(PICO_FLASH_SIZE_BYTES, (8 * 1024 * 1024))
 #ifndef PICO_FLASH_SIZE_BYTES
 #define PICO_FLASH_SIZE_BYTES (8 * 1024 * 1024)
 #endif
--- a/src/boards/include/boards/adafruit_macropad_rp2040.h
+++ b/src/boards/include/boards/adafruit_macropad_rp2040.h
@ -12,11 +12,11 @@
 #ifndef _BOARDS_ADAFRUIT_MACROPAD_RP2040_H
 #define _BOARDS_ADAFRUIT_MACROPAD_RP2040_H

-// pico_cmake_set PICO_PLATFORM=rp2040
-
 // For board detection
 #define ADAFRUIT_MACROPAD_RP2040

+pico_board_cmake_set(PICO_PLATFORM, rp2040)
+
 // On some samples, the xosc can take longer to stabilize than is usual
 #ifndef PICO_XOSC_STARTUP_DELAY_MULTIPLIER
 #define PICO_XOSC_STARTUP_DELAY_MULTIPLIER 64
@ -173,7 +173,7 @@
 #define PICO_FLASH_SPI_CLKDIV 4
 #endif

-// pico_cmake_set_default PICO_FLASH_SIZE_BYTES = (8 * 1024 * 1024)
+pico_board_cmake_set_default(PICO_FLASH_SIZE_BYTES, (8 * 1024 * 1024))
 #ifndef PICO_FLASH_SIZE_BYTES
 #define PICO_FLASH_SIZE_BYTES (8 * 1024 * 1024)
 #endif
--- a/src/boards/include/boards/adafruit_qtpy_rp2040.h
+++ b/src/boards/include/boards/adafruit_qtpy_rp2040.h
@ -9,11 +9,11 @@
 //       SHOULD ONLY CONSIST OF PREPROCESSOR DIRECTIVES
 // -----------------------------------------------------

-// pico_cmake_set PICO_PLATFORM=rp2040
-
 #ifndef _BOARDS_ADAFRUIT_QTPY_RP2040_H
 #define _BOARDS_ADAFRUIT_QTPY_RP2040_H

+pico_board_cmake_set(PICO_PLATFORM, rp2040)
+
 // For board detection
 #define ADAFRUIT_QTPY_RP2040

@ -85,7 +85,7 @@
 #define PICO_FLASH_SPI_CLKDIV 2
 #endif

-// pico_cmake_set_default PICO_FLASH_SIZE_BYTES = (8 * 1024 * 1024)
+pico_board_cmake_set_default(PICO_FLASH_SIZE_BYTES, (8 * 1024 * 1024))
 #ifndef PICO_FLASH_SIZE_BYTES
 #define PICO_FLASH_SIZE_BYTES (8 * 1024 * 1024)
 #endif
--- a/src/boards/include/boards/adafruit_trinkey_qt2040.h
+++ b/src/boards/include/boards/adafruit_trinkey_qt2040.h
@ -9,11 +9,11 @@
 //       SHOULD ONLY CONSIST OF PREPROCESSOR DIRECTIVES
 // -----------------------------------------------------

-// pico_cmake_set PICO_PLATFORM=rp2040
-
 #ifndef _BOARDS_ADAFRUIT_TRINKEY_QT2040_H
 #define _BOARDS_ADAFRUIT_TRINKEY_QT2040_H

+pico_board_cmake_set(PICO_PLATFORM, rp2040)
+
 // For board detection
 #define ADAFRUIT_TRINKEY_QT2040

@ -63,7 +63,7 @@
 #define PICO_FLASH_SPI_CLKDIV 2
 #endif

-// pico_cmake_set_default PICO_FLASH_SIZE_BYTES = (8 * 1024 * 1024)
+pico_board_cmake_set_default(PICO_FLASH_SIZE_BYTES, (8 * 1024 * 1024))
 #ifndef PICO_FLASH_SIZE_BYTES
 #define PICO_FLASH_SIZE_BYTES (8 * 1024 * 1024)
 #endif
--- a/src/boards/include/boards/amethyst_fpga.h
+++ b/src/boards/include/boards/amethyst_fpga.h
@ -9,13 +9,11 @@
 //       SHOULD ONLY CONSIST OF PREPROCESSOR DIRECTIVES
 // -----------------------------------------------------

-// FIXME delete this file before release (board file for Amethyst FPGA platform)
-
-// pico_cmake_set PICO_PLATFORM=rp2350
-
 #ifndef _BOARDS_AMETHYST_FPGA_H
 #define _BOARDS_AMETHYST_FPGA_H

+pico_board_cmake_set(PICO_PLATFORM, rp2350)
+
 #if !PICO_RP2350
 #error "Invalid PICO_PLATFORM for amethyst_fpga.h: must be rp2350 or rp2350-riscv"
 #endif
@ -100,7 +98,7 @@
 #define PICO_FLASH_SPI_CLKDIV 2
 #endif

-// pico_cmake_set_default PICO_FLASH_SIZE_BYTES = (16 * 1024 * 1024)
+pico_board_cmake_set_default(PICO_FLASH_SIZE_BYTES, (16 * 1024 * 1024))
 #ifndef PICO_FLASH_SIZE_BYTES
 #define PICO_FLASH_SIZE_BYTES (16 * 1024 * 1024)
 #endif
--- a/src/boards/include/boards/archi.h
+++ b/src/boards/include/boards/archi.h
@ -11,11 +11,11 @@

 // This header may be included by other board headers as "boards/archi.h"

-// pico_cmake_set PICO_PLATFORM=rp2040
-
 #ifndef _BOARDS_ARCHI_H
 #define _BOARDS_ARCHI_H

+pico_board_cmake_set(PICO_PLATFORM, rp2040)
+
 // For board detection
 #define ARCHI

@ -104,7 +104,7 @@
 #define PICO_FLASH_SPI_CLKDIV 4
 #endif

-// pico_cmake_set_default PICO_FLASH_SIZE_BYTES = (4 * 1024 * 1024)
+pico_board_cmake_set_default(PICO_FLASH_SIZE_BYTES, (4 * 1024 * 1024))
 #ifndef PICO_FLASH_SIZE_BYTES
 #define PICO_FLASH_SIZE_BYTES (4 * 1024 * 1024)
 #endif
--- a/src/boards/include/boards/arduino_nano_rp2040_connect.h
+++ b/src/boards/include/boards/arduino_nano_rp2040_connect.h
@ -9,11 +9,11 @@
 //       SHOULD ONLY CONSIST OF PREPROCESSOR DIRECTIVES
 // -----------------------------------------------------

-// pico_cmake_set PICO_PLATFORM=rp2040
-
 #ifndef _BOARDS_ARDUINO_NANO_RP2040_CONNECT_H
 #define _BOARDS_ARDUINO_NANO_RP2040_CONNECT_H

+pico_board_cmake_set(PICO_PLATFORM, rp2040)
+
 // For board detection
 #define ARDUINO_NANO_RP2040_CONNECT

@ -74,7 +74,7 @@
 #define PICO_FLASH_SPI_CLKDIV 2
 #endif

-// pico_cmake_set_default PICO_FLASH_SIZE_BYTES = (16 * 1024 * 1024)
+pico_board_cmake_set_default(PICO_FLASH_SIZE_BYTES, (16 * 1024 * 1024))
 #ifndef PICO_FLASH_SIZE_BYTES
 #define PICO_FLASH_SIZE_BYTES (16 * 1024 * 1024)
 #endif
--- a/src/boards/include/boards/cytron_maker_pi_rp2040.h
+++ b/src/boards/include/boards/cytron_maker_pi_rp2040.h
@ -9,11 +9,11 @@
 //       SHOULD ONLY CONSIST OF PREPROCESSOR DIRECTIVES
 // -----------------------------------------------------

-// pico_cmake_set PICO_PLATFORM=rp2040
-
 #ifndef _BOARDS_CYTRON_MAKER_PI_RP2040_H
 #define _BOARDS_CYTRON_MAKER_PI_RP2040_H

+pico_board_cmake_set(PICO_PLATFORM, rp2040)
+
 // For board detection
 #define CYTRON_MAKER_PI_RP2040

@ -179,7 +179,7 @@
 #define PICO_FLASH_SPI_CLKDIV 2
 #endif

-// pico_cmake_set_default PICO_FLASH_SIZE_BYTES = (2 * 1024 * 1024)
+pico_board_cmake_set_default(PICO_FLASH_SIZE_BYTES, (2 * 1024 * 1024))
 #ifndef PICO_FLASH_SIZE_BYTES
 #define PICO_FLASH_SIZE_BYTES (2 * 1024 * 1024)
 #endif
--- a/src/boards/include/boards/datanoisetv_rp2040_dsp.h
+++ b/src/boards/include/boards/datanoisetv_rp2040_dsp.h
@ -14,11 +14,11 @@
 //
 // This header may be included by other board headers as "boards/datanoisetv_rp2040_dsp.h"

-// pico_cmake_set PICO_PLATFORM=rp2040
-
 #ifndef _BOARDS_DATANOISETV_RP2040_DSP_H
 #define _BOARDS_DATANOISETV_RP2040_DSP_H

+pico_board_cmake_set(PICO_PLATFORM, rp2040)
+
 // For board detection
 #define DATANOISETV_RP2040_DSP

@ -40,7 +40,7 @@
 #define PICO_FLASH_SPI_CLKDIV 2
 #endif

-// pico_cmake_set_default PICO_FLASH_SIZE_BYTES = (16 * 1024 * 1024)
+pico_board_cmake_set_default(PICO_FLASH_SIZE_BYTES, (16 * 1024 * 1024))
 #ifndef PICO_FLASH_SIZE_BYTES
 #define PICO_FLASH_SIZE_BYTES (16 * 1024 * 1024)
 #endif
--- a/src/boards/include/boards/datanoisetv_rp2350_dsp.h
+++ b/src/boards/include/boards/datanoisetv_rp2350_dsp.h
@ -14,11 +14,11 @@
 //
 // This header may be included by other board headers as "boards/datanoisetv_rp2350_dsp.h"

-// pico_cmake_set PICO_PLATFORM=rp2350
-
 #ifndef _BOARDS_DATANOISETV_RP2350_DSP_H
 #define _BOARDS_DATANOISETV_RP2350_DSP_H

+pico_board_cmake_set(PICO_PLATFORM, rp2350)
+
 // For board detection
 #define DATANOISETV_RP2350_DSP

@ -43,12 +43,12 @@
 #define PICO_FLASH_SPI_CLKDIV 2
 #endif

-// pico_cmake_set_default PICO_FLASH_SIZE_BYTES = (8 * 1024 * 1024)
+pico_board_cmake_set_default(PICO_FLASH_SIZE_BYTES, (8 * 1024 * 1024))
 #ifndef PICO_FLASH_SIZE_BYTES
 #define PICO_FLASH_SIZE_BYTES (8 * 1024 * 1024)
 #endif

-// pico_cmake_set_default PICO_RP2350_A2_SUPPORTED = 1
+pico_board_cmake_set_default(PICO_RP2350_A2_SUPPORTED, 1)
 #ifndef PICO_RP2350_A2_SUPPORTED
 #define PICO_RP2350_A2_SUPPORTED 1
 #endif
--- a/src/boards/include/boards/defcon32_badge.h
+++ b/src/boards/include/boards/defcon32_badge.h
@ -9,11 +9,11 @@
 //       SHOULD ONLY CONSIST OF PREPROCESSOR DIRECTIVES
 // -----------------------------------------------------

-// pico_cmake_set PICO_PLATFORM=rp2350
-
 #ifndef _BOARDS_DEFCON32_BADGE_H
 #define _BOARDS_DEFCON32_BADGE_H

+pico_board_cmake_set(PICO_PLATFORM, rp2350)
+
 // For board detection
 #define DEFCON32_BADGE

@ -103,12 +103,12 @@
 #define PICO_FLASH_SPI_CLKDIV 2
 #endif

-// pico_cmake_set_default PICO_FLASH_SIZE_BYTES = (4 * 1024 * 1024)
+pico_board_cmake_set_default(PICO_FLASH_SIZE_BYTES, (4 * 1024 * 1024))
 #ifndef PICO_FLASH_SIZE_BYTES
 #define PICO_FLASH_SIZE_BYTES (4 * 1024 * 1024)
 #endif

-// pico_cmake_set_default PICO_RP2350_A2_SUPPORTED = 1
+pico_board_cmake_set_default(PICO_RP2350_A2_SUPPORTED, 1)
 #ifndef PICO_RP2350_A2_SUPPORTED
 #define PICO_RP2350_A2_SUPPORTED 1
 #endif
--- a/src/boards/include/boards/eelectronicparts_picomini_16mb.h
+++ b/src/boards/include/boards/eelectronicparts_picomini_16mb.h
@ -0,0 +1,86 @@
+/*
+ * Copyright (c) 2020 Raspberry Pi (Trading) Ltd.
+ *
+ * SPDX-License-Identifier: BSD-3-Clause
+ */
+
+// -----------------------------------------------------
+// NOTE: THIS HEADER IS ALSO INCLUDED BY ASSEMBLER SO
+//       SHOULD ONLY CONSIST OF PREPROCESSOR DIRECTIVES
+// -----------------------------------------------------
+//
+//------------------------------------------------------------------------------------------
+// Board definition for the E Electronic Parts "Pico_Mini RP2040"
+//
+// This header may be included by other board headers as "boards/eelectronicparts_picomini_16mb.h"
+
+#ifndef _BOARDS_EELECTRONICPARTS_PICOMINI_16MB_H
+#define _BOARDS_EELECTRONICPARTS_PICOMINI_16MB_H
+
+pico_board_cmake_set(PICO_PLATFORM, rp2040)
+
+// For board detection
+#define EELECTRONICPARTS_PICOMINI_16MB
+
+#ifndef PICO_DEFAULT_UART
+#define PICO_DEFAULT_UART 0
+#endif
+#ifndef PICO_DEFAULT_UART_TX_PIN
+#define PICO_DEFAULT_UART_TX_PIN 0
+#endif
+#ifndef PICO_DEFAULT_UART_RX_PIN
+#define PICO_DEFAULT_UART_RX_PIN 1
+#endif
+
+#ifndef PICO_DEFAULT_LED_PIN
+#define PICO_DEFAULT_LED_PIN   25
+#endif
+#ifndef PICO_DEFAULT_WS2812_PIN
+#define PICO_DEFAULT_WS2812_PIN 16
+#endif
+
+#ifndef PICO_DEFAULT_I2C
+#define PICO_DEFAULT_I2C       0
+#endif
+#ifndef PICO_DEFAULT_I2C_SDA_PIN
+#define PICO_DEFAULT_I2C_SDA_PIN   16
+#endif
+#ifndef PICO_DEFAULT_I2C_SCL_PIN
+#define PICO_DEFAULT_I2C_SCL_PIN   17
+#endif
+
+// --- SPI ---
+#ifndef PICO_DEFAULT_SPI
+#define PICO_DEFAULT_SPI 1
+#endif
+#ifndef PICO_DEFAULT_SPI_SCK_PIN
+#define PICO_DEFAULT_SPI_SCK_PIN 10
+#endif
+#ifndef PICO_DEFAULT_SPI_TX_PIN
+#define PICO_DEFAULT_SPI_TX_PIN 11
+#endif
+#ifndef PICO_DEFAULT_SPI_RX_PIN
+#define PICO_DEFAULT_SPI_RX_PIN 12
+#endif
+#ifndef PICO_DEFAULT_SPI_CSN_PIN
+#define PICO_DEFAULT_SPI_CSN_PIN 13
+#endif
+
+#define PICO_BOOT_STAGE2_CHOOSE_W25Q080 1
+
+#ifndef PICO_FLASH_SPI_CLKDIV
+#define PICO_FLASH_SPI_CLKDIV 2
+#endif
+
+pico_board_cmake_set_default(PICO_FLASH_SIZE_BYTES, (16 * 1024 * 1024))
+#ifndef PICO_FLASH_SIZE_BYTES
+// This board comes in 2MB, 4MB, 8MB, and 16MB variants
+#define PICO_FLASH_SIZE_BYTES (16 * 1024 * 1024)
+#endif
+// All boards have B1 RP2040
+
+#ifndef PICO_RP2040_B0_SUPPORTED
+#define PICO_RP2040_B0_SUPPORTED 0
+#endif
+
+#endif
--- a/src/boards/include/boards/eelectronicparts_picomini_2mb.h
+++ b/src/boards/include/boards/eelectronicparts_picomini_2mb.h
@ -0,0 +1,86 @@
+/*
+ * Copyright (c) 2020 Raspberry Pi (Trading) Ltd.
+ *
+ * SPDX-License-Identifier: BSD-3-Clause
+ */
+
+// -----------------------------------------------------
+// NOTE: THIS HEADER IS ALSO INCLUDED BY ASSEMBLER SO
+//       SHOULD ONLY CONSIST OF PREPROCESSOR DIRECTIVES
+// -----------------------------------------------------
+//
+//------------------------------------------------------------------------------------------
+// Board definition for the E Electronic Parts "Pico_Mini RP2040"
+//
+// This header may be included by other board headers as "boards/eelectronicparts_picomini_2mb.h"
+
+#ifndef _BOARDS_EELECTRONICPARTS_PICOMINI_2MB_H
+#define _BOARDS_EELECTRONICPARTS_PICOMINI_2MB_H
+
+pico_board_cmake_set(PICO_PLATFORM, rp2040)
+
+// For board detection
+#define EELECTRONICPARTS_PICOMINI_2MB
+
+#ifndef PICO_DEFAULT_UART
+#define PICO_DEFAULT_UART 0
+#endif
+#ifndef PICO_DEFAULT_UART_TX_PIN
+#define PICO_DEFAULT_UART_TX_PIN 0
+#endif
+#ifndef PICO_DEFAULT_UART_RX_PIN
+#define PICO_DEFAULT_UART_RX_PIN 1
+#endif
+
+#ifndef PICO_DEFAULT_LED_PIN
+#define PICO_DEFAULT_LED_PIN   25
+#endif
+#ifndef PICO_DEFAULT_WS2812_PIN
+#define PICO_DEFAULT_WS2812_PIN 16
+#endif
+
+#ifndef PICO_DEFAULT_I2C
+#define PICO_DEFAULT_I2C       0
+#endif
+#ifndef PICO_DEFAULT_I2C_SDA_PIN
+#define PICO_DEFAULT_I2C_SDA_PIN   16
+#endif
+#ifndef PICO_DEFAULT_I2C_SCL_PIN
+#define PICO_DEFAULT_I2C_SCL_PIN   17
+#endif
+
+// --- SPI ---
+#ifndef PICO_DEFAULT_SPI
+#define PICO_DEFAULT_SPI 1
+#endif
+#ifndef PICO_DEFAULT_SPI_SCK_PIN
+#define PICO_DEFAULT_SPI_SCK_PIN 10
+#endif
+#ifndef PICO_DEFAULT_SPI_TX_PIN
+#define PICO_DEFAULT_SPI_TX_PIN 11
+#endif
+#ifndef PICO_DEFAULT_SPI_RX_PIN
+#define PICO_DEFAULT_SPI_RX_PIN 12
+#endif
+#ifndef PICO_DEFAULT_SPI_CSN_PIN
+#define PICO_DEFAULT_SPI_CSN_PIN 13
+#endif
+
+#define PICO_BOOT_STAGE2_CHOOSE_W25Q080 1
+
+#ifndef PICO_FLASH_SPI_CLKDIV
+#define PICO_FLASH_SPI_CLKDIV 2
+#endif
+
+pico_board_cmake_set_default(PICO_FLASH_SIZE_BYTES, (2 * 1024 * 1024))
+#ifndef PICO_FLASH_SIZE_BYTES
+// This board comes in 2MB, 4MB, 8MB, and 16MB variants
+#define PICO_FLASH_SIZE_BYTES (2 * 1024 * 1024)
+#endif
+// All boards have B1 RP2040
+
+#ifndef PICO_RP2040_B0_SUPPORTED
+#define PICO_RP2040_B0_SUPPORTED 0
+#endif
+
+#endif
--- a/src/boards/include/boards/eelectronicparts_picomini_4mb.h
+++ b/src/boards/include/boards/eelectronicparts_picomini_4mb.h
@ -0,0 +1,86 @@
+/*
+ * Copyright (c) 2020 Raspberry Pi (Trading) Ltd.
+ *
+ * SPDX-License-Identifier: BSD-3-Clause
+ */
+
+// -----------------------------------------------------
+// NOTE: THIS HEADER IS ALSO INCLUDED BY ASSEMBLER SO
+//       SHOULD ONLY CONSIST OF PREPROCESSOR DIRECTIVES
+// -----------------------------------------------------
+//
+//------------------------------------------------------------------------------------------
+// Board definition for the E Electronic Parts "Pico_Mini RP2040"
+//
+// This header may be included by other board headers as "boards/eelectronicparts_picomini_4mb.h"
+
+#ifndef _BOARDS_EELECTRONICPARTS_PICOMINI_4MB_H
+#define _BOARDS_EELECTRONICPARTS_PICOMINI_4MB_H
+
+pico_board_cmake_set(PICO_PLATFORM, rp2040)
+
+// For board detection
+#define EELECTRONICPARTS_PICOMINI_4MB
+
+#ifndef PICO_DEFAULT_UART
+#define PICO_DEFAULT_UART 0
+#endif
+#ifndef PICO_DEFAULT_UART_TX_PIN
+#define PICO_DEFAULT_UART_TX_PIN 0
+#endif
+#ifndef PICO_DEFAULT_UART_RX_PIN
+#define PICO_DEFAULT_UART_RX_PIN 1
+#endif
+
+#ifndef PICO_DEFAULT_LED_PIN
+#define PICO_DEFAULT_LED_PIN   25
+#endif
+#ifndef PICO_DEFAULT_WS2812_PIN
+#define PICO_DEFAULT_WS2812_PIN 16
+#endif
+
+#ifndef PICO_DEFAULT_I2C
+#define PICO_DEFAULT_I2C       0
+#endif
+#ifndef PICO_DEFAULT_I2C_SDA_PIN
+#define PICO_DEFAULT_I2C_SDA_PIN   16
+#endif
+#ifndef PICO_DEFAULT_I2C_SCL_PIN
+#define PICO_DEFAULT_I2C_SCL_PIN   17
+#endif
+
+// --- SPI ---
+#ifndef PICO_DEFAULT_SPI
+#define PICO_DEFAULT_SPI 1
+#endif
+#ifndef PICO_DEFAULT_SPI_SCK_PIN
+#define PICO_DEFAULT_SPI_SCK_PIN 10
+#endif
+#ifndef PICO_DEFAULT_SPI_TX_PIN
+#define PICO_DEFAULT_SPI_TX_PIN 11
+#endif
+#ifndef PICO_DEFAULT_SPI_RX_PIN
+#define PICO_DEFAULT_SPI_RX_PIN 12
+#endif
+#ifndef PICO_DEFAULT_SPI_CSN_PIN
+#define PICO_DEFAULT_SPI_CSN_PIN 13
+#endif
+
+#define PICO_BOOT_STAGE2_CHOOSE_W25Q080 1
+
+#ifndef PICO_FLASH_SPI_CLKDIV
+#define PICO_FLASH_SPI_CLKDIV 2
+#endif
+
+pico_board_cmake_set_default(PICO_FLASH_SIZE_BYTES, (4 * 1024 * 1024))
+#ifndef PICO_FLASH_SIZE_BYTES
+// This board comes in 2MB, 4MB, 8MB, and 16MB variants
+#define PICO_FLASH_SIZE_BYTES (4 * 1024 * 1024)
+#endif
+// All boards have B1 RP2040
+
+#ifndef PICO_RP2040_B0_SUPPORTED
+#define PICO_RP2040_B0_SUPPORTED 0
+#endif
+
+#endif
--- a/src/boards/include/boards/eelectronicparts_picomini_8mb.h
+++ b/src/boards/include/boards/eelectronicparts_picomini_8mb.h
@ -0,0 +1,86 @@
+/*
+ * Copyright (c) 2020 Raspberry Pi (Trading) Ltd.
+ *
+ * SPDX-License-Identifier: BSD-3-Clause
+ */
+
+// -----------------------------------------------------
+// NOTE: THIS HEADER IS ALSO INCLUDED BY ASSEMBLER SO
+//       SHOULD ONLY CONSIST OF PREPROCESSOR DIRECTIVES
+// -----------------------------------------------------
+//
+//------------------------------------------------------------------------------------------
+// Board definition for the E Electronic Parts "Pico_Mini RP2040"
+//
+// This header may be included by other board headers as "boards/eelectronicparts_picomini_8mb.h"
+
+#ifndef _BOARDS_EELECTRONICPARTS_PICOMINI_8MB_H
+#define _BOARDS_EELECTRONICPARTS_PICOMINI_8MB_H
+
+pico_board_cmake_set(PICO_PLATFORM, rp2040)
+
+// For board detection
+#define EELECTRONICPARTS_PICOMINI_8MB
+
+#ifndef PICO_DEFAULT_UART
+#define PICO_DEFAULT_UART 0
+#endif
+#ifndef PICO_DEFAULT_UART_TX_PIN
+#define PICO_DEFAULT_UART_TX_PIN 0
+#endif
+#ifndef PICO_DEFAULT_UART_RX_PIN
+#define PICO_DEFAULT_UART_RX_PIN 1
+#endif
+
+#ifndef PICO_DEFAULT_LED_PIN
+#define PICO_DEFAULT_LED_PIN   25
+#endif
+#ifndef PICO_DEFAULT_WS2812_PIN
+#define PICO_DEFAULT_WS2812_PIN 16
+#endif
+
+#ifndef PICO_DEFAULT_I2C
+#define PICO_DEFAULT_I2C       0
+#endif
+#ifndef PICO_DEFAULT_I2C_SDA_PIN
+#define PICO_DEFAULT_I2C_SDA_PIN   16
+#endif
+#ifndef PICO_DEFAULT_I2C_SCL_PIN
+#define PICO_DEFAULT_I2C_SCL_PIN   17
+#endif
+
+// --- SPI ---
+#ifndef PICO_DEFAULT_SPI
+#define PICO_DEFAULT_SPI 1
+#endif
+#ifndef PICO_DEFAULT_SPI_SCK_PIN
+#define PICO_DEFAULT_SPI_SCK_PIN 10
+#endif
+#ifndef PICO_DEFAULT_SPI_TX_PIN
+#define PICO_DEFAULT_SPI_TX_PIN 11
+#endif
+#ifndef PICO_DEFAULT_SPI_RX_PIN
+#define PICO_DEFAULT_SPI_RX_PIN 12
+#endif
+#ifndef PICO_DEFAULT_SPI_CSN_PIN
+#define PICO_DEFAULT_SPI_CSN_PIN 13
+#endif
+
+#define PICO_BOOT_STAGE2_CHOOSE_W25Q080 1
+
+#ifndef PICO_FLASH_SPI_CLKDIV
+#define PICO_FLASH_SPI_CLKDIV 2
+#endif
+
+pico_board_cmake_set_default(PICO_FLASH_SIZE_BYTES, (8 * 1024 * 1024))
+#ifndef PICO_FLASH_SIZE_BYTES
+// This board comes in 2MB, 4MB, 8MB, and 16MB variants
+#define PICO_FLASH_SIZE_BYTES (8 * 1024 * 1024)
+#endif
+// All boards have B1 RP2040
+
+#ifndef PICO_RP2040_B0_SUPPORTED
+#define PICO_RP2040_B0_SUPPORTED 0
+#endif
+
+#endif
--- a/src/boards/include/boards/eetree_gamekit_rp2040.h
+++ b/src/boards/include/boards/eetree_gamekit_rp2040.h
@ -9,11 +9,11 @@
 //       SHOULD ONLY CONSIST OF PREPROCESSOR DIRECTIVES
 // -----------------------------------------------------

-// pico_cmake_set PICO_PLATFORM=rp2040
-
 #ifndef _BOARDS_EETREE_GAMEKIT_RP2040_H
 #define _BOARDS_EETREE_GAMEKIT_RP2040_H

+pico_board_cmake_set(PICO_PLATFORM, rp2040)
+
 // For board detection
 #define EETREE_GAMEKIT_RP2040

@ -69,7 +69,7 @@
 #ifndef PICO_FLASH_SPI_CLKDIV
    #define PICO_FLASH_SPI_CLKDIV 2
 #endif
-// pico_cmake_set_default PICO_FLASH_SIZE_BYTES = (2 * 1024 * 1024)
+pico_board_cmake_set_default(PICO_FLASH_SIZE_BYTES, (2 * 1024 * 1024))
 #ifndef PICO_FLASH_SIZE_BYTES
    #define PICO_FLASH_SIZE_BYTES (2 * 1024 * 1024)
 #endif
--- a/src/boards/include/boards/garatronic_pybstick26_rp2040.h
+++ b/src/boards/include/boards/garatronic_pybstick26_rp2040.h
@ -9,11 +9,11 @@
 //       SHOULD ONLY CONSIST OF PREPROCESSOR DIRECTIVES
 // -----------------------------------------------------

-// pico_cmake_set PICO_PLATFORM=rp2040
-
 #ifndef _BOARDS_GARATRONIC_PYBSTICK26_RP2040_H
 #define _BOARDS_GARATRONIC_PYBSTICK26_RP2040_H

+pico_board_cmake_set(PICO_PLATFORM, rp2040)
+
 // For board detection
 #define GARATRONIC_PYBSTICK26_RP2040

@ -70,7 +70,7 @@
 #define PICO_FLASH_SPI_CLKDIV 2 
 #endif

-// pico_cmake_set_default PICO_FLASH_SIZE_BYTES = (1 * 1024 * 1024)
+pico_board_cmake_set_default(PICO_FLASH_SIZE_BYTES, (1 * 1024 * 1024))
 #ifndef PICO_FLASH_SIZE_BYTES
 #define PICO_FLASH_SIZE_BYTES (1 * 1024 * 1024)
 #endif
--- a/src/boards/include/boards/gen4_rp2350_24.h
+++ b/src/boards/include/boards/gen4_rp2350_24.h
@ -9,11 +9,11 @@
 //       SHOULD ONLY CONSIST OF PREPROCESSOR DIRECTIVES
 // -----------------------------------------------------

-// pico_cmake_set PICO_PLATFORM=rp2350
-
 #ifndef _BOARDS_GEN4_RP2350_24_H
 #define _BOARDS_GEN4_RP2350_24_H

+pico_board_cmake_set(PICO_PLATFORM, rp2350)
+
 // For board detection
 #define GEN4_RP2350_24

@ -71,12 +71,12 @@
 #define PICO_FLASH_SPI_CLKDIV 2
 #endif

-// pico_cmake_set_default PICO_FLASH_SIZE_BYTES = (16 * 1024 * 1024)
+pico_board_cmake_set_default(PICO_FLASH_SIZE_BYTES, (16 * 1024 * 1024))
 #ifndef PICO_FLASH_SIZE_BYTES
 #define PICO_FLASH_SIZE_BYTES (16 * 1024 * 1024)
 #endif

-// pico_cmake_set_default PICO_RP2350_A2_SUPPORTED = 1
+pico_board_cmake_set_default(PICO_RP2350_A2_SUPPORTED, 1)
 #ifndef PICO_RP2350_A2_SUPPORTED
 #define PICO_RP2350_A2_SUPPORTED 1
 #endif
--- a/src/boards/include/boards/gen4_rp2350_24ct.h
+++ b/src/boards/include/boards/gen4_rp2350_24ct.h
@ -9,11 +9,11 @@
 //       SHOULD ONLY CONSIST OF PREPROCESSOR DIRECTIVES
 // -----------------------------------------------------

-// pico_cmake_set PICO_PLATFORM=rp2350
-
 #ifndef _BOARDS_GEN4_RP2350_24CT_H
 #define _BOARDS_GEN4_RP2350_24CT_H

+pico_board_cmake_set(PICO_PLATFORM, rp2350)
+
 // For board detection
 #define GEN4_RP2350_24CT	// CLB variants are exactly the same in operation

@ -71,12 +71,12 @@
 #define PICO_FLASH_SPI_CLKDIV 2
 #endif

-// pico_cmake_set_default PICO_FLASH_SIZE_BYTES = (16 * 1024 * 1024)
+pico_board_cmake_set_default(PICO_FLASH_SIZE_BYTES, (16 * 1024 * 1024))
 #ifndef PICO_FLASH_SIZE_BYTES
 #define PICO_FLASH_SIZE_BYTES (16 * 1024 * 1024)
 #endif

-// pico_cmake_set_default PICO_RP2350_A2_SUPPORTED = 1
+pico_board_cmake_set_default(PICO_RP2350_A2_SUPPORTED, 1)
 #ifndef PICO_RP2350_A2_SUPPORTED
 #define PICO_RP2350_A2_SUPPORTED 1
 #endif
--- a/src/boards/include/boards/gen4_rp2350_24t.h
+++ b/src/boards/include/boards/gen4_rp2350_24t.h
@ -9,11 +9,11 @@
 //       SHOULD ONLY CONSIST OF PREPROCESSOR DIRECTIVES
 // -----------------------------------------------------

-// pico_cmake_set PICO_PLATFORM=rp2350
-
 #ifndef _BOARDS_GEN4_RP2350_24T_H
 #define _BOARDS_GEN4_RP2350_24T_H

+pico_board_cmake_set(PICO_PLATFORM, rp2350)
+
 // For board detection
 #define GEN4_RP2350_24T

@ -71,12 +71,12 @@
 #define PICO_FLASH_SPI_CLKDIV 2
 #endif

-// pico_cmake_set_default PICO_FLASH_SIZE_BYTES = (16 * 1024 * 1024)
+pico_board_cmake_set_default(PICO_FLASH_SIZE_BYTES, (16 * 1024 * 1024))
 #ifndef PICO_FLASH_SIZE_BYTES
 #define PICO_FLASH_SIZE_BYTES (16 * 1024 * 1024)
 #endif

-// pico_cmake_set_default PICO_RP2350_A2_SUPPORTED = 1
+pico_board_cmake_set_default(PICO_RP2350_A2_SUPPORTED, 1)
 #ifndef PICO_RP2350_A2_SUPPORTED
 #define PICO_RP2350_A2_SUPPORTED 1
 #endif
--- a/src/boards/include/boards/gen4_rp2350_28.h
+++ b/src/boards/include/boards/gen4_rp2350_28.h
@ -9,11 +9,11 @@
 //       SHOULD ONLY CONSIST OF PREPROCESSOR DIRECTIVES
 // -----------------------------------------------------

-// pico_cmake_set PICO_PLATFORM=rp2350
-
 #ifndef _BOARDS_GEN4_RP2350_28_H
 #define _BOARDS_GEN4_RP2350_28_H

+pico_board_cmake_set(PICO_PLATFORM, rp2350)
+
 // For board detection
 #define GEN4_RP2350_28

@ -71,12 +71,12 @@
 #define PICO_FLASH_SPI_CLKDIV 2
 #endif

-// pico_cmake_set_default PICO_FLASH_SIZE_BYTES = (16 * 1024 * 1024)
+pico_board_cmake_set_default(PICO_FLASH_SIZE_BYTES, (16 * 1024 * 1024))
 #ifndef PICO_FLASH_SIZE_BYTES
 #define PICO_FLASH_SIZE_BYTES (16 * 1024 * 1024)
 #endif

-// pico_cmake_set_default PICO_RP2350_A2_SUPPORTED = 1
+pico_board_cmake_set_default(PICO_RP2350_A2_SUPPORTED, 1)
 #ifndef PICO_RP2350_A2_SUPPORTED
 #define PICO_RP2350_A2_SUPPORTED 1
 #endif
--- a/src/boards/include/boards/gen4_rp2350_28ct.h
+++ b/src/boards/include/boards/gen4_rp2350_28ct.h
@ -9,11 +9,11 @@
 //       SHOULD ONLY CONSIST OF PREPROCESSOR DIRECTIVES
 // -----------------------------------------------------

-// pico_cmake_set PICO_PLATFORM=rp2350
-
 #ifndef _BOARDS_GEN4_RP2350_28CT_H
 #define _BOARDS_GEN4_RP2350_28CT_H

+pico_board_cmake_set(PICO_PLATFORM, rp2350)
+
 // For board detection
 #define GEN4_RP2350_28CT	// CLB variants are exactly the same in operation

@ -71,12 +71,12 @@
 #define PICO_FLASH_SPI_CLKDIV 2
 #endif

-// pico_cmake_set_default PICO_FLASH_SIZE_BYTES = (16 * 1024 * 1024)
+pico_board_cmake_set_default(PICO_FLASH_SIZE_BYTES, (16 * 1024 * 1024))
 #ifndef PICO_FLASH_SIZE_BYTES
 #define PICO_FLASH_SIZE_BYTES (16 * 1024 * 1024)
 #endif

-// pico_cmake_set_default PICO_RP2350_A2_SUPPORTED = 1
+pico_board_cmake_set_default(PICO_RP2350_A2_SUPPORTED, 1)
 #ifndef PICO_RP2350_A2_SUPPORTED
 #define PICO_RP2350_A2_SUPPORTED 1
 #endif
--- a/src/boards/include/boards/gen4_rp2350_28t.h
+++ b/src/boards/include/boards/gen4_rp2350_28t.h
@ -9,11 +9,11 @@
 //       SHOULD ONLY CONSIST OF PREPROCESSOR DIRECTIVES
 // -----------------------------------------------------

-// pico_cmake_set PICO_PLATFORM=rp2350
-
 #ifndef _BOARDS_GEN4_RP2350_28T_H
 #define _BOARDS_GEN4_RP2350_28T_H

+pico_board_cmake_set(PICO_PLATFORM, rp2350)
+
 // For board detection
 #define GEN4_RP2350_28T

@ -71,12 +71,12 @@
 #define PICO_FLASH_SPI_CLKDIV 2
 #endif

-// pico_cmake_set_default PICO_FLASH_SIZE_BYTES = (16 * 1024 * 1024)
+pico_board_cmake_set_default(PICO_FLASH_SIZE_BYTES, (16 * 1024 * 1024))
 #ifndef PICO_FLASH_SIZE_BYTES
 #define PICO_FLASH_SIZE_BYTES (16 * 1024 * 1024)
 #endif

-// pico_cmake_set_default PICO_RP2350_A2_SUPPORTED = 1
+pico_board_cmake_set_default(PICO_RP2350_A2_SUPPORTED, 1)
 #ifndef PICO_RP2350_A2_SUPPORTED
 #define PICO_RP2350_A2_SUPPORTED 1
 #endif
--- a/src/boards/include/boards/gen4_rp2350_32.h
+++ b/src/boards/include/boards/gen4_rp2350_32.h
@ -9,11 +9,11 @@
 //       SHOULD ONLY CONSIST OF PREPROCESSOR DIRECTIVES
 // -----------------------------------------------------

-// pico_cmake_set PICO_PLATFORM=rp2350
-
 #ifndef _BOARDS_GEN4_RP2350_32_H
 #define _BOARDS_GEN4_RP2350_32_H

+pico_board_cmake_set(PICO_PLATFORM, rp2350)
+
 // For board detection
 #define GEN4_RP2350_32

@ -71,12 +71,12 @@
 #define PICO_FLASH_SPI_CLKDIV 2
 #endif

-// pico_cmake_set_default PICO_FLASH_SIZE_BYTES = (16 * 1024 * 1024)
+pico_board_cmake_set_default(PICO_FLASH_SIZE_BYTES, (16 * 1024 * 1024))
 #ifndef PICO_FLASH_SIZE_BYTES
 #define PICO_FLASH_SIZE_BYTES (16 * 1024 * 1024)
 #endif

-// pico_cmake_set_default PICO_RP2350_A2_SUPPORTED = 1
+pico_board_cmake_set_default(PICO_RP2350_A2_SUPPORTED, 1)
 #ifndef PICO_RP2350_A2_SUPPORTED
 #define PICO_RP2350_A2_SUPPORTED 1
 #endif
--- a/src/boards/include/boards/gen4_rp2350_32ct.h
+++ b/src/boards/include/boards/gen4_rp2350_32ct.h
@ -9,11 +9,11 @@
 //       SHOULD ONLY CONSIST OF PREPROCESSOR DIRECTIVES
 // -----------------------------------------------------

-// pico_cmake_set PICO_PLATFORM=rp2350
-
 #ifndef _BOARDS_GEN4_RP2350_32CT_H
 #define _BOARDS_GEN4_RP2350_32CT_H

+pico_board_cmake_set(PICO_PLATFORM, rp2350)
+
 // For board detection
 #define GEN4_RP2350_32CT	// CLB variants are exactly the same in operation

@ -71,12 +71,12 @@
 #define PICO_FLASH_SPI_CLKDIV 2
 #endif

-// pico_cmake_set_default PICO_FLASH_SIZE_BYTES = (16 * 1024 * 1024)
+pico_board_cmake_set_default(PICO_FLASH_SIZE_BYTES, (16 * 1024 * 1024))
 #ifndef PICO_FLASH_SIZE_BYTES
 #define PICO_FLASH_SIZE_BYTES (16 * 1024 * 1024)
 #endif

-// pico_cmake_set_default PICO_RP2350_A2_SUPPORTED = 1
+pico_board_cmake_set_default(PICO_RP2350_A2_SUPPORTED, 1)
 #ifndef PICO_RP2350_A2_SUPPORTED
 #define PICO_RP2350_A2_SUPPORTED 1
 #endif
--- a/src/boards/include/boards/gen4_rp2350_32t.h
+++ b/src/boards/include/boards/gen4_rp2350_32t.h
@ -9,11 +9,11 @@
 //       SHOULD ONLY CONSIST OF PREPROCESSOR DIRECTIVES
 // -----------------------------------------------------

-// pico_cmake_set PICO_PLATFORM=rp2350
-
 #ifndef _BOARDS_GEN4_RP2350_32T_H
 #define _BOARDS_GEN4_RP2350_32T_H

+pico_board_cmake_set(PICO_PLATFORM, rp2350)
+
 // For board detection
 #define GEN4_RP2350_32T

@ -71,12 +71,12 @@
 #define PICO_FLASH_SPI_CLKDIV 2
 #endif

-// pico_cmake_set_default PICO_FLASH_SIZE_BYTES = (16 * 1024 * 1024)
+pico_board_cmake_set_default(PICO_FLASH_SIZE_BYTES, (16 * 1024 * 1024))
 #ifndef PICO_FLASH_SIZE_BYTES
 #define PICO_FLASH_SIZE_BYTES (16 * 1024 * 1024)
 #endif

-// pico_cmake_set_default PICO_RP2350_A2_SUPPORTED = 1
+pico_board_cmake_set_default(PICO_RP2350_A2_SUPPORTED, 1)
 #ifndef PICO_RP2350_A2_SUPPORTED
 #define PICO_RP2350_A2_SUPPORTED 1
 #endif
--- a/src/boards/include/boards/gen4_rp2350_35.h
+++ b/src/boards/include/boards/gen4_rp2350_35.h
@ -9,11 +9,11 @@
 //       SHOULD ONLY CONSIST OF PREPROCESSOR DIRECTIVES
 // -----------------------------------------------------

-// pico_cmake_set PICO_PLATFORM=rp2350
-
 #ifndef _BOARDS_GEN4_RP2350_35_H
 #define _BOARDS_GEN4_RP2350_35_H

+pico_board_cmake_set(PICO_PLATFORM, rp2350)
+
 // For board detection
 #define GEN4_RP2350_35

@ -71,12 +71,12 @@
 #define PICO_FLASH_SPI_CLKDIV 2
 #endif

-// pico_cmake_set_default PICO_FLASH_SIZE_BYTES = (16 * 1024 * 1024)
+pico_board_cmake_set_default(PICO_FLASH_SIZE_BYTES, (16 * 1024 * 1024))
 #ifndef PICO_FLASH_SIZE_BYTES
 #define PICO_FLASH_SIZE_BYTES (16 * 1024 * 1024)
 #endif

-// pico_cmake_set_default PICO_RP2350_A2_SUPPORTED = 1
+pico_board_cmake_set_default(PICO_RP2350_A2_SUPPORTED, 1)
 #ifndef PICO_RP2350_A2_SUPPORTED
 #define PICO_RP2350_A2_SUPPORTED 1
 #endif
--- a/src/boards/include/boards/gen4_rp2350_35ct.h
+++ b/src/boards/include/boards/gen4_rp2350_35ct.h
@ -9,11 +9,11 @@
 //       SHOULD ONLY CONSIST OF PREPROCESSOR DIRECTIVES
 // -----------------------------------------------------

-// pico_cmake_set PICO_PLATFORM=rp2350
-
 #ifndef _BOARDS_GEN4_RP2350_35CT_H
 #define _BOARDS_GEN4_RP2350_35CT_H

+pico_board_cmake_set(PICO_PLATFORM, rp2350)
+
 // For board detection
 #define GEN4_RP2350_35CT	// CLB variants are exactly the same in operation

@ -71,12 +71,12 @@
 #define PICO_FLASH_SPI_CLKDIV 2
 #endif

-// pico_cmake_set_default PICO_FLASH_SIZE_BYTES = (16 * 1024 * 1024)
+pico_board_cmake_set_default(PICO_FLASH_SIZE_BYTES, (16 * 1024 * 1024))
 #ifndef PICO_FLASH_SIZE_BYTES
 #define PICO_FLASH_SIZE_BYTES (16 * 1024 * 1024)
 #endif

-// pico_cmake_set_default PICO_RP2350_A2_SUPPORTED = 1
+pico_board_cmake_set_default(PICO_RP2350_A2_SUPPORTED, 1)
 #ifndef PICO_RP2350_A2_SUPPORTED
 #define PICO_RP2350_A2_SUPPORTED 1
 #endif
--- a/src/boards/include/boards/gen4_rp2350_35t.h
+++ b/src/boards/include/boards/gen4_rp2350_35t.h
@ -9,11 +9,11 @@
 //       SHOULD ONLY CONSIST OF PREPROCESSOR DIRECTIVES
 // -----------------------------------------------------

-// pico_cmake_set PICO_PLATFORM=rp2350
-
 #ifndef _BOARDS_GEN4_RP2350_35T_H
 #define _BOARDS_GEN4_RP2350_35T_H

+pico_board_cmake_set(PICO_PLATFORM, rp2350)
+
 // For board detection
 #define GEN4_RP2350_35T

@ -71,12 +71,12 @@
 #define PICO_FLASH_SPI_CLKDIV 2
 #endif

-// pico_cmake_set_default PICO_FLASH_SIZE_BYTES = (16 * 1024 * 1024)
+pico_board_cmake_set_default(PICO_FLASH_SIZE_BYTES, (16 * 1024 * 1024))
 #ifndef PICO_FLASH_SIZE_BYTES
 #define PICO_FLASH_SIZE_BYTES (16 * 1024 * 1024)
 #endif

-// pico_cmake_set_default PICO_RP2350_A2_SUPPORTED = 1
+pico_board_cmake_set_default(PICO_RP2350_A2_SUPPORTED, 1)
 #ifndef PICO_RP2350_A2_SUPPORTED
 #define PICO_RP2350_A2_SUPPORTED 1
 #endif
--- a/src/boards/include/boards/hellbender_0001.h
+++ b/src/boards/include/boards/hellbender_0001.h
@ -12,7 +12,7 @@
 #ifndef _BOARDS_HELLBENDER_0001_H
 #define _BOARDS_HELLBENDER_0001_H

-// pico_cmake_set PICO_PLATFORM=rp2350
+pico_board_cmake_set(PICO_PLATFORM, rp2350)

 // For board detection
 #define HELLBENDER_0001
@ -130,7 +130,7 @@
 #define PICO_FLASH_SPI_CLKDIV 2
 #endif

-// pico_cmake_set_default PICO_FLASH_SIZE_BYTES = (8 * 1024 * 1024)
+pico_board_cmake_set_default(PICO_FLASH_SIZE_BYTES, (8 * 1024 * 1024))
 #ifndef PICO_FLASH_SIZE_BYTES
 #define PICO_FLASH_SIZE_BYTES (8 * 1024 * 1024)
 #endif
@ -138,9 +138,9 @@
 #define HELLBENDER_0001_BLACKBOX_FLASH_SIZE_BYTES (16 * 1024 * 1024)

 // --- RP2350 VARIANT ---
-#define PICO_RP2350B 1
+#define PICO_RP2350A 0

-// pico_cmake_set_default PICO_RP2350_A2_SUPPORTED = 1
+pico_board_cmake_set_default(PICO_RP2350_A2_SUPPORTED, 1)
 #ifndef PICO_RP2350_A2_SUPPORTED
 #define PICO_RP2350_A2_SUPPORTED 1
 #endif
--- a/src/boards/include/boards/hellbender_2350A_devboard.h
+++ b/src/boards/include/boards/hellbender_2350A_devboard.h
@ -12,7 +12,7 @@
 #ifndef _BOARDS_HELLBENDER_2350A_DEVBOARD_H
 #define _BOARDS_HELLBENDER_2350A_DEVBOARD_H

-// pico_cmake_set PICO_PLATFORM=rp2350
+pico_board_cmake_set(PICO_PLATFORM, rp2350)

 // For board detection
 #define HELLBENDER_2350A_DEVBOARD
@ -22,16 +22,17 @@
 #define HB_2350A_IMU_INT_PIN 1
 #define HB_2350A_USER_QWIIC_SDA_PIN 2
 #define HB_2350A_USER_QWIIC_SCL_PIN 3
-#define HB_2350A_RTC_INT_PIN 8
+#define HB_2350A_RTC_INT_PIN 22
 #define HB_2350A_SDCARD_CS_PIN 9
 #define HB_2350A_LORA_IO1_PIN 10
 #define HB_2350A_LORA_IO3_PIN 11
-#define HB_2350A_LORA_CS_PIN 21
+#define HB_2350A_LORA_CS_PIN 28
+#define HB_2350A_LORA_BUSY_PIN 24
+#define HB_2350A_LORA_RESET_PIN 29
 #define HB_2350A_RTC_CLKIN_PIN 22
 #define HB_2350A_IMU_CLKOUT_PIN 23
-#define HB_2350A_LORA_BUSY_PIN 24
-#define HB_2350A_FUSB307_INT_PIN 25
-#define HB_2350A_LORA_RESET_PIN 29
+#define HB_2350A_FUSB307_INT_PIN 21
+#define HB_2350A_BQ25792_INT_PIN 8

 // --- UART ---
 // Note, conflicts with HSTX range
@ -45,7 +46,11 @@
 #define PICO_DEFAULT_UART_RX_PIN 13
 #endif

-// no PICO_DEFAULT_LED_PIN
+// --- LED ---
+#ifndef PICO_DEFAULT_LED_PIN
+#define PICO_DEFAULT_LED_PIN 25
+#endif
+
 // no PICO_DEFAULT_WS2812_PIN

 // --- I2C ---
@ -72,9 +77,8 @@
 #ifndef PICO_DEFAULT_SPI_RX_PIN
 #define PICO_DEFAULT_SPI_RX_PIN 20
 #endif
-#ifndef PICO_DEFAULT_SPI_CSN_PIN
-#define PICO_DEFAULT_SPI_CSN_PIN 21
-#endif
+// multiple devices, so this doesn't make much sense
+// no PICO_DEFAULT_SPI_CSN_PIN

 // --- FLASH ---

@ -84,14 +88,14 @@
 #define PICO_FLASH_SPI_CLKDIV 2
 #endif

-// pico_cmake_set_default PICO_FLASH_SIZE_BYTES = (16 * 1024 * 1024)
+pico_board_cmake_set_default(PICO_FLASH_SIZE_BYTES, (16 * 1024 * 1024))
 #ifndef PICO_FLASH_SIZE_BYTES
 #define PICO_FLASH_SIZE_BYTES (16 * 1024 * 1024)
 #endif
 // --- RP2350 VARIANT ---
 #define PICO_RP2350A 1

-// pico_cmake_set_default PICO_RP2350_A2_SUPPORTED = 1
+pico_board_cmake_set_default(PICO_RP2350_A2_SUPPORTED, 1)
 #ifndef PICO_RP2350_A2_SUPPORTED
 #define PICO_RP2350_A2_SUPPORTED 1
 #endif
--- a/src/boards/include/boards/ilabs_challenger_rp2350_bconnect.h
+++ b/src/boards/include/boards/ilabs_challenger_rp2350_bconnect.h
@ -11,11 +11,11 @@

 // This header may be included by other board headers as "boards/ilabs_challenger_rp2350_bconnect.h"

-// pico_cmake_set PICO_PLATFORM=rp2350
-
 #ifndef _BOARDS_ILABS_CHALLENGER_RP2350_BCONNECT_H
 #define _BOARDS_ILABS_CHALLENGER_RP2350_BCONNECT_H

+pico_board_cmake_set(PICO_PLATFORM, rp2350)
+
 // For board detection
 #define ILABS_CHALLENGER_RP2350_BCONNECT

@ -78,12 +78,12 @@
 #define PICO_FLASH_SPI_CLKDIV 2
 #endif

-// pico_cmake_set_default PICO_FLASH_SIZE_BYTES = (8 * 1024 * 1024)
+pico_board_cmake_set_default(PICO_FLASH_SIZE_BYTES, (8 * 1024 * 1024))
 #ifndef PICO_FLASH_SIZE_BYTES
 #define PICO_FLASH_SIZE_BYTES (8 * 1024 * 1024)
 #endif

-// pico_cmake_set_default PICO_RP2350_A2_SUPPORTED = 1
+pico_board_cmake_set_default(PICO_RP2350_A2_SUPPORTED, 1)
 #ifndef PICO_RP2350_A2_SUPPORTED
 #define PICO_RP2350_A2_SUPPORTED 1
 #endif
--- a/src/boards/include/boards/ilabs_challenger_rp2350_wifi_ble.h
+++ b/src/boards/include/boards/ilabs_challenger_rp2350_wifi_ble.h
@ -11,11 +11,11 @@

 // This header may be included by other board headers as "boards/ilabs_challenger_rp2350_wifi_ble.h"

-// pico_cmake_set PICO_PLATFORM=rp2350
-
 #ifndef _BOARDS_ILABS_CHALLENGER_RP2350_WIFI_BLE_H
 #define _BOARDS_ILABS_CHALLENGER_RP2350_WIFI_BLE_H

+pico_board_cmake_set(PICO_PLATFORM, rp2350)
+
 // For board detection
 #define ILABS_CHALLENGER_RP2350_WIFI_BLE

@ -75,12 +75,12 @@
 #define PICO_FLASH_SPI_CLKDIV 2
 #endif

-// pico_cmake_set_default PICO_FLASH_SIZE_BYTES = (8 * 1024 * 1024)
+pico_board_cmake_set_default(PICO_FLASH_SIZE_BYTES, (8 * 1024 * 1024))
 #ifndef PICO_FLASH_SIZE_BYTES
 #define PICO_FLASH_SIZE_BYTES (8 * 1024 * 1024)
 #endif

-// pico_cmake_set_default PICO_RP2350_A2_SUPPORTED = 1
+pico_board_cmake_set_default(PICO_RP2350_A2_SUPPORTED, 1)
 #ifndef PICO_RP2350_A2_SUPPORTED
 #define PICO_RP2350_A2_SUPPORTED 1
 #endif
--- a/src/boards/include/boards/ilabs_opendec02.h
+++ b/src/boards/include/boards/ilabs_opendec02.h
@ -12,11 +12,11 @@
 //------------------------------------------------------------------------------------------
 // Board definition for the opendec02 open source dcc decoder
 //
-// pico_cmake_set PICO_PLATFORM=rp2040
-
 #ifndef _BOARDS_ILABS_OPENDEC02_H
 #define _BOARDS_ILABS_OPENDEC02_H

+pico_board_cmake_set(PICO_PLATFORM, rp2040)
+
 // For board detection
 #define ILABS_OPENDEC02

@ -50,7 +50,7 @@
 #define PICO_FLASH_SPI_CLKDIV 2
 #endif

-// pico_cmake_set_default PICO_FLASH_SIZE_BYTES = (8 * 1024 * 1024)
+pico_board_cmake_set_default(PICO_FLASH_SIZE_BYTES, (8 * 1024 * 1024))
 #ifndef PICO_FLASH_SIZE_BYTES
 #define PICO_FLASH_SIZE_BYTES (8 * 1024 * 1024)
 #endif
--- a/src/boards/include/boards/machdyne_werkzeug.h
+++ b/src/boards/include/boards/machdyne_werkzeug.h
@ -9,11 +9,11 @@
 //       SHOULD ONLY CONSIST OF PREPROCESSOR DIRECTIVES
 // -----------------------------------------------------

-// pico_cmake_set PICO_PLATFORM=rp2040
-
 #ifndef _BOARDS_MACHDYNE_WERKZEUG_H
 #define _BOARDS_MACHDYNE_WERKZEUG_H

+pico_board_cmake_set(PICO_PLATFORM, rp2040)
+
 // For board detection
 #define MACHDYNE_WERKZEUG

@ -75,7 +75,7 @@
 #define PICO_FLASH_SPI_CLKDIV 2
 #endif

-// pico_cmake_set_default PICO_FLASH_SIZE_BYTES = (1 * 1024 * 1024)
+pico_board_cmake_set_default(PICO_FLASH_SIZE_BYTES, (1 * 1024 * 1024))
 #ifndef PICO_FLASH_SIZE_BYTES
 #define PICO_FLASH_SIZE_BYTES (1 * 1024 * 1024)
 #endif
--- a/src/boards/include/boards/melopero_perpetuo_rp2350_lora.h
+++ b/src/boards/include/boards/melopero_perpetuo_rp2350_lora.h
@ -11,11 +11,11 @@

 // This header may be included by other board headers as "boards/melopero_perpetuo_rp2350_lora.h"

-// pico_cmake_set PICO_PLATFORM=rp2350
-
 #ifndef _BOARDS_MELOPERO_PERPETUO_RP2350_LORA_H
 #define _BOARDS_MELOPERO_PERPETUO_RP2350_LORA_H

+pico_board_cmake_set(PICO_PLATFORM, rp2350)
+
 // For board detection
 #define MELOPERO_PERPETUO_RP2350_LORA

@ -75,14 +75,14 @@
 #define PICO_FLASH_SPI_CLKDIV 2
 #endif

-// pico_cmake_set_default PICO_FLASH_SIZE_BYTES = (8 * 1024 * 1024)
+pico_board_cmake_set_default(PICO_FLASH_SIZE_BYTES, (8 * 1024 * 1024))
 #ifndef PICO_FLASH_SIZE_BYTES
 #define PICO_FLASH_SIZE_BYTES (8 * 1024 * 1024)
 #endif



-// pico_cmake_set_default PICO_RP2350_A2_SUPPORTED = 1
+pico_board_cmake_set_default(PICO_RP2350_A2_SUPPORTED, 1)
 #ifndef PICO_RP2350_A2_SUPPORTED
 #define PICO_RP2350_A2_SUPPORTED 1
 #endif
--- a/src/boards/include/boards/melopero_shake_rp2040.h
+++ b/src/boards/include/boards/melopero_shake_rp2040.h
@ -9,11 +9,11 @@
 //       SHOULD ONLY CONSIST OF PREPROCESSOR DIRECTIVES
 // -----------------------------------------------------

-// pico_cmake_set PICO_PLATFORM=rp2040
-
 #ifndef _BOARDS_MELOPERO_SHAKE_RP2040_H
 #define _BOARDS_MELOPERO_SHAKE_RP2040_H

+pico_board_cmake_set(PICO_PLATFORM, rp2040)
+
 // For board detection
 #define MELOPERO_SHAKE_RP2040

@ -82,7 +82,7 @@
 #define PICO_FLASH_SPI_CLKDIV 2
 #endif

-// pico_cmake_set_default PICO_FLASH_SIZE_BYTES = (16 * 1024 * 1024)
+pico_board_cmake_set_default(PICO_FLASH_SIZE_BYTES, (16 * 1024 * 1024))
 #ifndef PICO_FLASH_SIZE_BYTES
 #define PICO_FLASH_SIZE_BYTES (16 * 1024 * 1024)
 #endif
--- a/src/boards/include/boards/metrotech_xerxes_rp2040.h
+++ b/src/boards/include/boards/metrotech_xerxes_rp2040.h
@ -9,11 +9,11 @@
 //       SHOULD ONLY CONSIST OF PREPROCESSOR DIRECTIVES
 // -----------------------------------------------------

-// pico_cmake_set PICO_PLATFORM=rp2040
-
 #ifndef _BOARDS_METROTECH_XERXES_RP2040_H
 #define _BOARDS_METROTECH_XERXES_RP2040_H

+pico_board_cmake_set(PICO_PLATFORM, rp2040)
+
 #define USR_SW_PIN 18
 #define USR_BTN_PIN 24
 #define USR_LED_PIN 25
@ -144,7 +144,7 @@
 #define PICO_XOSC_STARTUP_DELAY_MULTIPLIER 16
 #endif // !PICO_XOSC_STARTUP_DELAY_MULTIPLIER

-// pico_cmake_set_default PICO_FLASH_SIZE_BYTES = (16 * 1024 * 1024)
+pico_board_cmake_set_default(PICO_FLASH_SIZE_BYTES, (16 * 1024 * 1024))
 #ifndef PICO_FLASH_SIZE_BYTES
 /**
 * @brief 16MiB, Flash size in bytes
--- a/src/boards/include/boards/net8086_usb_interposer.h
+++ b/src/boards/include/boards/net8086_usb_interposer.h
@ -9,11 +9,11 @@
 //       SHOULD ONLY CONSIST OF PREPROCESSOR DIRECTIVES
 // -----------------------------------------------------

-// pico_cmake_set PICO_PLATFORM=rp2040
-
 #ifndef _BOARDS_NET8086_USB_INTERPOSER_H
 #define _BOARDS_NET8086_USB_INTERPOSER_H

+pico_board_cmake_set(PICO_PLATFORM, rp2040)
+
 // For board detection
 #define NET8086_USB_INTERPOSER

@ -62,7 +62,7 @@
 #define PICO_FLASH_SPI_CLKDIV 4
 #endif

-// pico_cmake_set_default PICO_FLASH_SIZE_BYTES = (16 * 1024 * 1024)
+pico_board_cmake_set_default(PICO_FLASH_SIZE_BYTES, (16 * 1024 * 1024))
 #ifndef PICO_FLASH_SIZE_BYTES
 #define PICO_FLASH_SIZE_BYTES (16 * 1024 * 1024)
 #endif
--- a/src/boards/include/boards/nullbits_bit_c_pro.h
+++ b/src/boards/include/boards/nullbits_bit_c_pro.h
@ -14,11 +14,11 @@
 //
 // This header may be included by other board headers as "boards/nullbits_bit_c_pro.h"

-// pico_cmake_set PICO_PLATFORM=rp2040
-
 #ifndef _BOARDS_NULLBITS_BIT_C_PRO_H
 #define _BOARDS_NULLBITS_BIT_C_PRO_H

+pico_board_cmake_set(PICO_PLATFORM, rp2040)
+
 // For board detection
 #define NULLBITS_BIT_C_PRO

@ -100,7 +100,7 @@
 #endif

 // Bit-C PRO has 4MB SPI flash
-// pico_cmake_set_default PICO_FLASH_SIZE_BYTES = (4 * 1024 * 1024)
+pico_board_cmake_set_default(PICO_FLASH_SIZE_BYTES, (4 * 1024 * 1024))
 #ifndef PICO_FLASH_SIZE_BYTES
 #define PICO_FLASH_SIZE_BYTES (4 * 1024 * 1024)
 #endif
--- a/src/boards/include/boards/phyx_rick_tny_rp2350.h
+++ b/src/boards/include/boards/phyx_rick_tny_rp2350.h
@ -11,11 +11,11 @@

 // This header may be included by other board headers as "boards/phyx_rick_tny_rp2350.h"

-// pico_cmake_set PICO_PLATFORM=rp2350
-
 #ifndef _BOARDS_PHYX_RICK_TNY_RP2350_H
 #define _BOARDS_PHYX_RICK_TNY_RP2350_H

+pico_board_cmake_set(PICO_PLATFORM, rp2350)
+
 // For board detection
 #define PHYX_RICK_TNY_RP2350

@ -75,12 +75,12 @@
 #define PICO_FLASH_SPI_CLKDIV 2
 #endif

-// pico_cmake_set_default PICO_FLASH_SIZE_BYTES = (16 * 1024 * 1024)
+pico_board_cmake_set_default(PICO_FLASH_SIZE_BYTES, (16 * 1024 * 1024))
 #ifndef PICO_FLASH_SIZE_BYTES
 #define PICO_FLASH_SIZE_BYTES (16 * 1024 * 1024)
 #endif

-// pico_cmake_set_default PICO_RP2350_A2_SUPPORTED = 1
+pico_board_cmake_set_default(PICO_RP2350_A2_SUPPORTED, 1)
 #ifndef PICO_RP2350_A2_SUPPORTED
 #define PICO_RP2350_A2_SUPPORTED 1
 #endif
--- a/src/boards/include/boards/pi-plates_micropi.h
+++ b/src/boards/include/boards/pi-plates_micropi.h
@ -11,11 +11,11 @@

 // Board definition for the Pi-Plates MICROPi processor board

-// pico_cmake_set PICO_PLATFORM=rp2040
-
 #ifndef _BOARDS_PI_PLATES_MICROPI_H
 #define _BOARDS_PI_PLATES_MICROPI_H

+pico_board_cmake_set(PICO_PLATFORM, rp2040)
+
 // For board detection
 #define PI_PLATES_MICROPI

@ -72,7 +72,7 @@
 #define PICO_FLASH_SPI_CLKDIV 2
 #endif

-// pico_cmake_set_default PICO_FLASH_SIZE_BYTES = (16 * 1024 * 1024)
+pico_board_cmake_set_default(PICO_FLASH_SIZE_BYTES, (16 * 1024 * 1024))
 #ifndef PICO_FLASH_SIZE_BYTES
 #define PICO_FLASH_SIZE_BYTES (16 * 1024 * 1024) //change to (16 * 1024 * 1024) on final product
 #endif
--- a/src/boards/include/boards/pico.h
+++ b/src/boards/include/boards/pico.h
@ -11,11 +11,11 @@

 // This header may be included by other board headers as "boards/pico.h"

-// pico_cmake_set PICO_PLATFORM=rp2040
-
 #ifndef _BOARDS_PICO_H
 #define _BOARDS_PICO_H

+pico_board_cmake_set(PICO_PLATFORM, rp2040)
+
 // For board detection
 #define RASPBERRYPI_PICO

@ -72,7 +72,7 @@
 #define PICO_FLASH_SPI_CLKDIV 2
 #endif

-// pico_cmake_set_default PICO_FLASH_SIZE_BYTES = (2 * 1024 * 1024)
+pico_board_cmake_set_default(PICO_FLASH_SIZE_BYTES, (2 * 1024 * 1024))
 #ifndef PICO_FLASH_SIZE_BYTES
 #define PICO_FLASH_SIZE_BYTES (2 * 1024 * 1024)
 #endif
--- a/src/boards/include/boards/pico2.h
+++ b/src/boards/include/boards/pico2.h
@ -11,11 +11,11 @@

 // This header may be included by other board headers as "boards/pico2.h"

-// pico_cmake_set PICO_PLATFORM=rp2350
-
 #ifndef _BOARDS_PICO2_H
 #define _BOARDS_PICO2_H

+pico_board_cmake_set(PICO_PLATFORM, rp2350)
+
 // For board detection
 #define RASPBERRYPI_PICO2

@ -75,7 +75,7 @@
 #define PICO_FLASH_SPI_CLKDIV 2
 #endif

-// pico_cmake_set_default PICO_FLASH_SIZE_BYTES = (4 * 1024 * 1024)
+pico_board_cmake_set_default(PICO_FLASH_SIZE_BYTES, (4 * 1024 * 1024))
 #ifndef PICO_FLASH_SIZE_BYTES
 #define PICO_FLASH_SIZE_BYTES (4 * 1024 * 1024)
 #endif
@ -93,7 +93,7 @@
 #define PICO_VSYS_PIN 29
 #endif

-// pico_cmake_set_default PICO_RP2350_A2_SUPPORTED = 1
+pico_board_cmake_set_default(PICO_RP2350_A2_SUPPORTED, 1)
 #ifndef PICO_RP2350_A2_SUPPORTED
 #define PICO_RP2350_A2_SUPPORTED 1
 #endif
--- a/src/boards/include/boards/pico2_w.h
+++ b/src/boards/include/boards/pico2_w.h
@ -11,12 +11,12 @@

 // This header may be included by other board headers as "boards/pico2_w.h"

-// pico_cmake_set PICO_PLATFORM=rp2350
-// pico_cmake_set PICO_CYW43_SUPPORTED = 1
-
 #ifndef _BOARDS_PICO2_W_H
 #define _BOARDS_PICO2_W_H

+pico_board_cmake_set(PICO_PLATFORM, rp2350)
+pico_board_cmake_set(PICO_CYW43_SUPPORTED, 1)
+
 // For board detection
 #define RASPBERRYPI_PICO2_W

@ -74,7 +74,7 @@
 #define PICO_FLASH_SPI_CLKDIV 2
 #endif

-// pico_cmake_set_default PICO_FLASH_SIZE_BYTES = (4 * 1024 * 1024)
+pico_board_cmake_set_default(PICO_FLASH_SIZE_BYTES, (4 * 1024 * 1024))
 #ifndef PICO_FLASH_SIZE_BYTES
 #define PICO_FLASH_SIZE_BYTES (4 * 1024 * 1024)
 #endif
@ -89,6 +89,12 @@
 #define CYW43_WL_GPIO_LED_PIN 0
 #endif

+// Drive high to force power supply into PWM mode (lower ripple on 3V3 at light loads)
+// As this is a CYW43 pin you can do this by calling cyw43_gpio_set
+#ifndef CYW43_WL_GPIO_SMPS_PIN
+#define CYW43_WL_GPIO_SMPS_PIN 1
+#endif
+
 // If CYW43_WL_GPIO_VBUS_PIN is defined then a CYW43 GPIO has to be used to read VBUS.
 // This can be passed to cyw43_arch_gpio_get to determine if the device is battery powered.
 // PICO_VBUS_PIN and CYW43_WL_GPIO_VBUS_PIN should not both be defined.
@ -109,7 +115,7 @@
 #define PICO_VSYS_PIN 29
 #endif

-// pico_cmake_set_default PICO_RP2350_A2_SUPPORTED = 1
+pico_board_cmake_set_default(PICO_RP2350_A2_SUPPORTED, 1)
 #ifndef PICO_RP2350_A2_SUPPORTED
 #define PICO_RP2350_A2_SUPPORTED 1
 #endif
--- a/src/boards/include/boards/pico_w.h
+++ b/src/boards/include/boards/pico_w.h
@ -9,14 +9,14 @@
 //       SHOULD ONLY CONSIST OF PREPROCESSOR DIRECTIVES
 // -----------------------------------------------------

-// pico_cmake_set PICO_PLATFORM        = rp2040
-// pico_cmake_set PICO_CYW43_SUPPORTED = 1
-
 // This header may be included by other board headers as "boards/pico_w.h"

 #ifndef _BOARDS_PICO_W_H
 #define _BOARDS_PICO_W_H

+pico_board_cmake_set(PICO_PLATFORM, rp2040)
+pico_board_cmake_set(PICO_CYW43_SUPPORTED, 1)
+
 // For board detection
 #define RASPBERRYPI_PICO_W

@ -71,7 +71,7 @@
 #define PICO_FLASH_SPI_CLKDIV 2
 #endif

-// pico_cmake_set_default PICO_FLASH_SIZE_BYTES = (2 * 1024 * 1024)
+pico_board_cmake_set_default(PICO_FLASH_SIZE_BYTES, (2 * 1024 * 1024))
 #ifndef PICO_FLASH_SIZE_BYTES
 #define PICO_FLASH_SIZE_BYTES (2 * 1024 * 1024)
 #endif
@ -94,6 +94,12 @@
 #define CYW43_WL_GPIO_LED_PIN 0
 #endif

+// Drive high to force power supply into PWM mode (lower ripple on 3V3 at light loads)
+// As this is a CYW43 pin you can do this by calling cyw43_gpio_set
+#ifndef CYW43_WL_GPIO_SMPS_PIN
+#define CYW43_WL_GPIO_SMPS_PIN 1
+#endif
+
 // If CYW43_WL_GPIO_VBUS_PIN is defined then a CYW43 GPIO has to be used to read VBUS.
 // This can be passed to cyw43_arch_gpio_get to determine if the device is battery powered.
 // PICO_VBUS_PIN and CYW43_WL_GPIO_VBUS_PIN should not both be defined.
--- a/src/boards/include/boards/pimoroni_badger2040.h
+++ b/src/boards/include/boards/pimoroni_badger2040.h
@ -9,11 +9,11 @@
 //       SHOULD ONLY CONSIST OF PREPROCESSOR DIRECTIVES
 // -----------------------------------------------------

-// pico_cmake_set PICO_PLATFORM=rp2040
-
 #ifndef _BOARDS_PIMORONI_BADGER2040_H
 #define _BOARDS_PIMORONI_BADGER2040_H

+pico_board_cmake_set(PICO_PLATFORM, rp2040)
+
 // For board detection
 #define PIMORONI_BADGER2040

@ -106,7 +106,7 @@
 #define PICO_FLASH_SPI_CLKDIV 2
 #endif

-// pico_cmake_set_default PICO_FLASH_SIZE_BYTES = (2 * 1024 * 1024)
+pico_board_cmake_set_default(PICO_FLASH_SIZE_BYTES, (2 * 1024 * 1024))
 #ifndef PICO_FLASH_SIZE_BYTES
 #define PICO_FLASH_SIZE_BYTES (2 * 1024 * 1024)
 #endif
--- a/src/boards/include/boards/pimoroni_interstate75.h
+++ b/src/boards/include/boards/pimoroni_interstate75.h
@ -9,11 +9,11 @@
 //       SHOULD ONLY CONSIST OF PREPROCESSOR DIRECTIVES
 // -----------------------------------------------------

-// pico_cmake_set PICO_PLATFORM=rp2040
-
 #ifndef _BOARDS_PIMORONI_INTERSTATE75_H
 #define _BOARDS_PIMORONI_INTERSTATE75_H

+pico_board_cmake_set(PICO_PLATFORM, rp2040)
+
 // For board detection
 #define PIMORONI_INTERSTATE75

@ -96,7 +96,7 @@
 #define PICO_FLASH_SPI_CLKDIV 2
 #endif

-// pico_cmake_set_default PICO_FLASH_SIZE_BYTES = (2 * 1024 * 1024)
+pico_board_cmake_set_default(PICO_FLASH_SIZE_BYTES, (2 * 1024 * 1024))
 #ifndef PICO_FLASH_SIZE_BYTES
 #define PICO_FLASH_SIZE_BYTES (2 * 1024 * 1024)
 #endif
--- a/src/boards/include/boards/pimoroni_keybow2040.h
+++ b/src/boards/include/boards/pimoroni_keybow2040.h
@ -9,11 +9,11 @@
 //       SHOULD ONLY CONSIST OF PREPROCESSOR DIRECTIVES
 // -----------------------------------------------------

-// pico_cmake_set PICO_PLATFORM=rp2040
-
 #ifndef _BOARDS_PIMORONI_KEYBOW2040_H
 #define _BOARDS_PIMORONI_KEYBOW2040_H

+pico_board_cmake_set(PICO_PLATFORM, rp2040)
+
 // For board detection
 #define PIMORONI_KEYBOW2040

@ -85,7 +85,7 @@
 #define PICO_FLASH_SPI_CLKDIV 2
 #endif

-// pico_cmake_set_default PICO_FLASH_SIZE_BYTES = (2 * 1024 * 1024)
+pico_board_cmake_set_default(PICO_FLASH_SIZE_BYTES, (2 * 1024 * 1024))
 #ifndef PICO_FLASH_SIZE_BYTES
 #define PICO_FLASH_SIZE_BYTES (2 * 1024 * 1024)
 #endif
--- a/src/boards/include/boards/pimoroni_motor2040.h
+++ b/src/boards/include/boards/pimoroni_motor2040.h
@ -9,11 +9,11 @@
 //       SHOULD ONLY CONSIST OF PREPROCESSOR DIRECTIVES
 // -----------------------------------------------------

-// pico_cmake_set PICO_PLATFORM=rp2040
-
 #ifndef _BOARDS_PIMORONI_MOTOR2040_H
 #define _BOARDS_PIMORONI_MOTOR2040_H

+pico_board_cmake_set(PICO_PLATFORM, rp2040)
+
 // For board detection
 #define PIMORONI_MOTOR2040

@ -128,7 +128,7 @@
 #define PICO_FLASH_SPI_CLKDIV 2
 #endif

-// pico_cmake_set_default PICO_FLASH_SIZE_BYTES = (2 * 1024 * 1024)
+pico_board_cmake_set_default(PICO_FLASH_SIZE_BYTES, (2 * 1024 * 1024))
 #ifndef PICO_FLASH_SIZE_BYTES
 #define PICO_FLASH_SIZE_BYTES (2 * 1024 * 1024)
 #endif
--- a/src/boards/include/boards/pimoroni_pga2040.h
+++ b/src/boards/include/boards/pimoroni_pga2040.h
@ -9,11 +9,11 @@
 //       SHOULD ONLY CONSIST OF PREPROCESSOR DIRECTIVES
 // -----------------------------------------------------

-// pico_cmake_set PICO_PLATFORM=rp2040
-
 #ifndef _BOARDS_PIMORONI_PGA2040_H
 #define _BOARDS_PIMORONI_PGA2040_H

+pico_board_cmake_set(PICO_PLATFORM, rp2040)
+
 // For board detection
 #define PIMORONI_PGA2040

@ -69,7 +69,7 @@
 #define PICO_FLASH_SPI_CLKDIV 2
 #endif

-// pico_cmake_set_default PICO_FLASH_SIZE_BYTES = (8 * 1024 * 1024)
+pico_board_cmake_set_default(PICO_FLASH_SIZE_BYTES, (8 * 1024 * 1024))
 #ifndef PICO_FLASH_SIZE_BYTES
 #define PICO_FLASH_SIZE_BYTES (8 * 1024 * 1024)
 #endif
--- a/src/boards/include/boards/pimoroni_pga2350.h
+++ b/src/boards/include/boards/pimoroni_pga2350.h
@ -11,15 +11,18 @@

 // This header may be included by other board headers as "boards/pimoroni_pga2350.h"

-// pico_cmake_set PICO_PLATFORM=rp2350
-
 #ifndef _BOARDS_PIMORONI_PGA2350_H
 #define _BOARDS_PIMORONI_PGA2350_H

+pico_board_cmake_set(PICO_PLATFORM, rp2350)
+
 // For board detection
 #define PIMORONI_PGA2350
 #define PIMORONI_PGA2350_16MB

+// --- RP2350 VARIANT ---
+#define PICO_RP2350A 0
+
 // --- BOARD SPECIFIC ---
 #define PIMORONI_PGA2350_PSRAM_CS_PIN 47

@ -76,7 +79,7 @@
 #define PICO_FLASH_SPI_CLKDIV 2
 #endif

-// pico_cmake_set_default PICO_FLASH_SIZE_BYTES = (16 * 1024 * 1024)
+pico_board_cmake_set_default(PICO_FLASH_SIZE_BYTES, (16 * 1024 * 1024))
 #ifndef PICO_FLASH_SIZE_BYTES
 #define PICO_FLASH_SIZE_BYTES (16 * 1024 * 1024)
 #endif
@ -85,7 +88,7 @@
 // no PICO_VBUS_PIN
 // no PICO_VSYS_PIN

-// pico_cmake_set_default PICO_RP2350_A2_SUPPORTED = 1
+pico_board_cmake_set_default(PICO_RP2350_A2_SUPPORTED, 1)
 #ifndef PICO_RP2350_A2_SUPPORTED
 #define PICO_RP2350_A2_SUPPORTED 1
 #endif
--- a/src/boards/include/boards/pimoroni_pico_plus2_rp2350.h
+++ b/src/boards/include/boards/pimoroni_pico_plus2_rp2350.h
@ -11,14 +11,17 @@

 // This header may be included by other board headers as "boards/pimoroni_pico_plus2_rp2350.h"

-// pico_cmake_set PICO_PLATFORM=rp2350
-
 #ifndef _BOARDS_PIMORONI_PICO_PLUS2_RP2350_H
 #define _BOARDS_PIMORONI_PICO_PLUS2_RP2350_H

+pico_board_cmake_set(PICO_PLATFORM, rp2350)
+
 // For board detection
 #define PIMORONI_PICO_PLUS2_RP2350

+// --- RP2350 VARIANT ---
+#define PICO_RP2350A 0
+
 // --- BOARD SPECIFIC ---
 #define SPCE_SPI 0
 #define SPCE_TX_MISO_PIN 32
@ -83,7 +86,7 @@
 #define PICO_FLASH_SPI_CLKDIV 2
 #endif

-// pico_cmake_set_default PICO_FLASH_SIZE_BYTES = (16 * 1024 * 1024)
+pico_board_cmake_set_default(PICO_FLASH_SIZE_BYTES, (16 * 1024 * 1024))
 #ifndef PICO_FLASH_SIZE_BYTES
 #define PICO_FLASH_SIZE_BYTES (16 * 1024 * 1024)
 #endif
@ -99,7 +102,7 @@
 #define PICO_VSYS_PIN 43
 #endif

-// pico_cmake_set_default PICO_RP2350_A2_SUPPORTED = 1
+pico_board_cmake_set_default(PICO_RP2350_A2_SUPPORTED, 1)
 #ifndef PICO_RP2350_A2_SUPPORTED
 #define PICO_RP2350_A2_SUPPORTED 1
 #endif
--- a/src/boards/include/boards/pimoroni_pico_plus2_w_rp2350.h
+++ b/src/boards/include/boards/pimoroni_pico_plus2_w_rp2350.h
@ -11,15 +11,18 @@

 // This header may be included by other board headers as "boards/pimoroni_pico_plus2_w_rp2350.h"

-// pico_cmake_set PICO_PLATFORM=rp2350
-// pico_cmake_set PICO_CYW43_SUPPORTED = 1
-
 #ifndef _BOARDS_PIMORONI_PICO_PLUS2_W_RP2350_H
 #define _BOARDS_PIMORONI_PICO_PLUS2_W_RP2350_H

+pico_board_cmake_set(PICO_PLATFORM, rp2350)
+pico_board_cmake_set(PICO_CYW43_SUPPORTED, 1)
+
 // For board detection
 #define PIMORONI_PICO_PLUS2_W_RP2350

+// --- RP2350 VARIANT ---
+#define PICO_RP2350A 0
+
 // --- BOARD SPECIFIC ---
 #define PIMORONI_PICO_PLUS2_W_USER_SW_PIN 45
 #define PIMORONI_PICO_PLUS2_W_PSRAM_CS_PIN 47
@ -75,7 +78,7 @@
 #define PICO_FLASH_SPI_CLKDIV 2
 #endif

-// pico_cmake_set_default PICO_FLASH_SIZE_BYTES = (16 * 1024 * 1024)
+pico_board_cmake_set_default(PICO_FLASH_SIZE_BYTES, (16 * 1024 * 1024))
 #ifndef PICO_FLASH_SIZE_BYTES
 #define PICO_FLASH_SIZE_BYTES (16 * 1024 * 1024)
 #endif
@ -86,7 +89,7 @@
 #define PICO_VSYS_PIN 43
 #endif

-// pico_cmake_set_default PICO_RP2350_A2_SUPPORTED = 1
+pico_board_cmake_set_default(PICO_RP2350_A2_SUPPORTED, 1)
 #ifndef PICO_RP2350_A2_SUPPORTED
 #define PICO_RP2350_A2_SUPPORTED 1
 #endif
--- a/src/boards/include/boards/pimoroni_picolipo_16mb.h
+++ b/src/boards/include/boards/pimoroni_picolipo_16mb.h
@ -9,11 +9,11 @@
 //       SHOULD ONLY CONSIST OF PREPROCESSOR DIRECTIVES
 // -----------------------------------------------------

-// pico_cmake_set PICO_PLATFORM=rp2040
-
 #ifndef _BOARDS_PIMORONI_PICOLIPO_16MB_H
 #define _BOARDS_PIMORONI_PICOLIPO_16MB_H

+pico_board_cmake_set(PICO_PLATFORM, rp2040)
+
 // For board detection
 #define PIMORONI_PICOLIPO_16MB

@ -74,7 +74,7 @@
 #define PICO_FLASH_SPI_CLKDIV 2
 #endif

-// pico_cmake_set_default PICO_FLASH_SIZE_BYTES = (16 * 1024 * 1024)
+pico_board_cmake_set_default(PICO_FLASH_SIZE_BYTES, (16 * 1024 * 1024))
 #ifndef PICO_FLASH_SIZE_BYTES
 #define PICO_FLASH_SIZE_BYTES (16 * 1024 * 1024)
 #endif
--- a/src/boards/include/boards/pimoroni_picolipo_4mb.h
+++ b/src/boards/include/boards/pimoroni_picolipo_4mb.h
@ -9,11 +9,11 @@
 //       SHOULD ONLY CONSIST OF PREPROCESSOR DIRECTIVES
 // -----------------------------------------------------

-// pico_cmake_set PICO_PLATFORM=rp2040
-
 #ifndef _BOARDS_PIMORONI_PICOLIPO_4MB_H
 #define _BOARDS_PIMORONI_PICOLIPO_4MB_H

+pico_board_cmake_set(PICO_PLATFORM, rp2040)
+
 // For board detection
 #define PIMORONI_PICOLIPO_4MB

@ -74,7 +74,7 @@
 #define PICO_FLASH_SPI_CLKDIV 2
 #endif

-// pico_cmake_set_default PICO_FLASH_SIZE_BYTES = (4 * 1024 * 1024)
+pico_board_cmake_set_default(PICO_FLASH_SIZE_BYTES, (4 * 1024 * 1024))
 #ifndef PICO_FLASH_SIZE_BYTES
 #define PICO_FLASH_SIZE_BYTES (4 * 1024 * 1024)
 #endif
--- a/src/boards/include/boards/pimoroni_picosystem.h
+++ b/src/boards/include/boards/pimoroni_picosystem.h
@ -9,11 +9,11 @@
 //       SHOULD ONLY CONSIST OF PREPROCESSOR DIRECTIVES
 // -----------------------------------------------------

-// pico_cmake_set PICO_PLATFORM=rp2040
-
 #ifndef _BOARDS_PIMORONI_PICOSYSTEM_H
 #define _BOARDS_PIMORONI_PICOSYSTEM_H

+pico_board_cmake_set(PICO_PLATFORM, rp2040)
+
 // For board detection
 #define PIMORONI_PICOSYSTEM

@ -91,7 +91,7 @@
 #define PICO_FLASH_SPI_CLKDIV 2
 #endif

-// pico_cmake_set_default PICO_FLASH_SIZE_BYTES = (16 * 1024 * 1024)
+pico_board_cmake_set_default(PICO_FLASH_SIZE_BYTES, (16 * 1024 * 1024))
 #ifndef PICO_FLASH_SIZE_BYTES
 #define PICO_FLASH_SIZE_BYTES (16 * 1024 * 1024)
 #endif
--- a/src/boards/include/boards/pimoroni_plasma2040.h
+++ b/src/boards/include/boards/pimoroni_plasma2040.h
@ -9,11 +9,11 @@
 //       SHOULD ONLY CONSIST OF PREPROCESSOR DIRECTIVES
 // -----------------------------------------------------

-// pico_cmake_set PICO_PLATFORM=rp2040
-
 #ifndef _BOARDS_PIMORONI_PLASMA2040_H
 #define _BOARDS_PIMORONI_PLASMA2040_H

+pico_board_cmake_set(PICO_PLATFORM, rp2040)
+
 // For board detection
 #define PIMORONI_PLASMA2040

@ -83,7 +83,7 @@
 #define PICO_FLASH_SPI_CLKDIV 2
 #endif

-// pico_cmake_set_default PICO_FLASH_SIZE_BYTES = (2 * 1024 * 1024)
+pico_board_cmake_set_default(PICO_FLASH_SIZE_BYTES, (2 * 1024 * 1024))
 #ifndef PICO_FLASH_SIZE_BYTES
 #define PICO_FLASH_SIZE_BYTES (2 * 1024 * 1024)
 #endif
--- a/src/boards/include/boards/pimoroni_plasma2350.h
+++ b/src/boards/include/boards/pimoroni_plasma2350.h
@ -11,11 +11,11 @@

 // This header may be included by other board headers as "boards/pimoroni_plasma2350.h"

-// pico_cmake_set PICO_PLATFORM=rp2350
-
 #ifndef _BOARDS_PIMORONI_PLASMA2350_H
 #define _BOARDS_PIMORONI_PLASMA2350_H

+pico_board_cmake_set(PICO_PLATFORM, rp2350)
+
 // For board detection
 #define PIMORONI_PLASMA2350

@ -104,12 +104,12 @@
 #define PICO_FLASH_SPI_CLKDIV 2
 #endif

-// pico_cmake_set_default PICO_FLASH_SIZE_BYTES = (4 * 1024 * 1024)
+pico_board_cmake_set_default(PICO_FLASH_SIZE_BYTES, (4 * 1024 * 1024))
 #ifndef PICO_FLASH_SIZE_BYTES
 #define PICO_FLASH_SIZE_BYTES (4 * 1024 * 1024)
 #endif

-// pico_cmake_set_default PICO_RP2350_A2_SUPPORTED = 1
+pico_board_cmake_set_default(PICO_RP2350_A2_SUPPORTED, 1)
 #ifndef PICO_RP2350_A2_SUPPORTED
 #define PICO_RP2350_A2_SUPPORTED 1
 #endif
--- a/src/boards/include/boards/pimoroni_servo2040.h
+++ b/src/boards/include/boards/pimoroni_servo2040.h
@ -9,11 +9,11 @@
 //       SHOULD ONLY CONSIST OF PREPROCESSOR DIRECTIVES
 // -----------------------------------------------------

-// pico_cmake_set PICO_PLATFORM=rp2040
-
 #ifndef _BOARDS_PIMORONI_SERVO2040_H
 #define _BOARDS_PIMORONI_SERVO2040_H

+pico_board_cmake_set(PICO_PLATFORM, rp2040)
+
 // For board detection
 #define PIMORONI_SERVO2040

@ -104,7 +104,7 @@
 #define PICO_FLASH_SPI_CLKDIV 2
 #endif

-// pico_cmake_set_default PICO_FLASH_SIZE_BYTES = (2 * 1024 * 1024)
+pico_board_cmake_set_default(PICO_FLASH_SIZE_BYTES, (2 * 1024 * 1024))
 #ifndef PICO_FLASH_SIZE_BYTES
 #define PICO_FLASH_SIZE_BYTES (2 * 1024 * 1024)
 #endif
--- a/src/boards/include/boards/pimoroni_tiny2040.h
+++ b/src/boards/include/boards/pimoroni_tiny2040.h
@ -9,11 +9,11 @@
 //       SHOULD ONLY CONSIST OF PREPROCESSOR DIRECTIVES
 // -----------------------------------------------------

-// pico_cmake_set PICO_PLATFORM=rp2040
-
 #ifndef _BOARDS_PIMORONI_TINY2040_H
 #define _BOARDS_PIMORONI_TINY2040_H

+pico_board_cmake_set(PICO_PLATFORM, rp2040)
+
 // For board detection
 #define PIMORONI_TINY2040
 #define PIMORONI_TINY2040_8MB
@ -92,7 +92,7 @@
 #define PICO_FLASH_SPI_CLKDIV 2
 #endif

-// pico_cmake_set_default PICO_FLASH_SIZE_BYTES = (8 * 1024 * 1024)
+pico_board_cmake_set_default(PICO_FLASH_SIZE_BYTES, (8 * 1024 * 1024))
 #ifndef PICO_FLASH_SIZE_BYTES
 #define PICO_FLASH_SIZE_BYTES (8 * 1024 * 1024)
 #endif
--- a/src/boards/include/boards/pimoroni_tiny2040_2mb.h
+++ b/src/boards/include/boards/pimoroni_tiny2040_2mb.h
@ -9,11 +9,11 @@
 //       SHOULD ONLY CONSIST OF PREPROCESSOR DIRECTIVES
 // -----------------------------------------------------

-// pico_cmake_set PICO_PLATFORM=rp2040
-
 #ifndef _BOARDS_PIMORONI_TINY2040_2MB_H
 #define _BOARDS_PIMORONI_TINY2040_2MB_H

+pico_board_cmake_set(PICO_PLATFORM, rp2040)
+
 // For board detection
 #define PIMORONI_TINY2040_2MB
 #define PIMORONI_TINY2040
@ -92,7 +92,7 @@
 #define PICO_FLASH_SPI_CLKDIV 2
 #endif

-// pico_cmake_set_default PICO_FLASH_SIZE_BYTES = (2 * 1024 * 1024)
+pico_board_cmake_set_default(PICO_FLASH_SIZE_BYTES, (2 * 1024 * 1024))
 #ifndef PICO_FLASH_SIZE_BYTES
 #define PICO_FLASH_SIZE_BYTES (2 * 1024 * 1024)
 #endif
--- a/src/boards/include/boards/pimoroni_tiny2350.h
+++ b/src/boards/include/boards/pimoroni_tiny2350.h
@ -11,11 +11,11 @@

 // This header may be included by other board headers as "boards/pimoroni_tiny2350.h"

-// pico_cmake_set PICO_PLATFORM=rp2350
-
 #ifndef _BOARDS_PIMORONI_TINY2350_H
 #define _BOARDS_PIMORONI_TINY2350_H

+pico_board_cmake_set(PICO_PLATFORM, rp2350)
+
 // For board detection
 #define PIMORONI_TINY2350
 #define PIMORONI_TINY2350_8MB
@ -84,12 +84,12 @@
 #define PICO_FLASH_SPI_CLKDIV 2
 #endif

-// pico_cmake_set_default PICO_FLASH_SIZE_BYTES = (4 * 1024 * 1024)
+pico_board_cmake_set_default(PICO_FLASH_SIZE_BYTES, (4 * 1024 * 1024))
 #ifndef PICO_FLASH_SIZE_BYTES
 #define PICO_FLASH_SIZE_BYTES (4 * 1024 * 1024)
 #endif

-// pico_cmake_set_default PICO_RP2350_A2_SUPPORTED = 1
+pico_board_cmake_set_default(PICO_RP2350_A2_SUPPORTED, 1)
 #ifndef PICO_RP2350_A2_SUPPORTED
 #define PICO_RP2350_A2_SUPPORTED 1
 #endif
--- a/src/boards/include/boards/pololu_3pi_2040_robot.h
+++ b/src/boards/include/boards/pololu_3pi_2040_robot.h
@ -9,18 +9,18 @@
 //       SHOULD ONLY CONSIST OF PREPROCESSOR DIRECTIVES
 // -----------------------------------------------------

-// pico_cmake_set PICO_PLATFORM=rp2040
-
 #ifndef _BOARDS_POLOLU_3PI_2040_ROBOT_H
 #define _BOARDS_POLOLU_3PI_2040_ROBOT_H

+pico_board_cmake_set(PICO_PLATFORM, rp2040)
+
 // For board detection
 #define POLOLU_3PI_2040_ROBOT

 #define PICO_DEFAULT_LED_PIN 25
 #define PICO_BOOT_STAGE2_CHOOSE_W25Q080 1
 #define PICO_FLASH_SPI_CLKDIV 2
-// pico_cmake_set_default PICO_FLASH_SIZE_BYTES = (16 * 1024 * 1024)
+pico_board_cmake_set_default(PICO_FLASH_SIZE_BYTES, (16 * 1024 * 1024))
 #define PICO_FLASH_SIZE_BYTES (16 * 1024 * 1024)

 // All boards have at least the B1 revision
--- a/src/boards/include/boards/pololu_zumo_2040_robot.h
+++ b/src/boards/include/boards/pololu_zumo_2040_robot.h
@ -9,18 +9,18 @@
 //       SHOULD ONLY CONSIST OF PREPROCESSOR DIRECTIVES
 // -----------------------------------------------------

-// pico_cmake_set PICO_PLATFORM=rp2040
-
 #ifndef _BOARDS_POLOLU_ZUMO_2040_ROBOT_H
 #define _BOARDS_POLOLU_ZUMO_2040_ROBOT_H

+pico_board_cmake_set(PICO_PLATFORM, rp2040)
+
 // For board detection
 #define POLOLU_ZUMO_2040_ROBOT

 #define PICO_DEFAULT_LED_PIN 25
 #define PICO_BOOT_STAGE2_CHOOSE_W25Q080 1
 #define PICO_FLASH_SPI_CLKDIV 2
-// pico_cmake_set_default PICO_FLASH_SIZE_BYTES = (16 * 1024 * 1024)
+pico_board_cmake_set_default(PICO_FLASH_SIZE_BYTES, (16 * 1024 * 1024))
 #define PICO_FLASH_SIZE_BYTES (16 * 1024 * 1024)

 // All boards have at least the B1 revision
--- a/src/boards/include/boards/seeed_xiao_rp2040.h
+++ b/src/boards/include/boards/seeed_xiao_rp2040.h
@ -9,11 +9,11 @@
 //       SHOULD ONLY CONSIST OF PREPROCESSOR DIRECTIVES
 // -----------------------------------------------------

-// pico_cmake_set PICO_PLATFORM=rp2040
-
 #ifndef _BOARDS_SEEED_XIAO_RP2040_H
 #define _BOARDS_SEEED_XIAO_RP2040_H

+pico_board_cmake_set(PICO_PLATFORM, rp2040)
+
 // For board detection
 #define SEEED_XIAO_RP2040

@ -90,7 +90,7 @@
 #define PICO_FLASH_SPI_CLKDIV 2
 #endif

-// pico_cmake_set_default PICO_FLASH_SIZE_BYTES = (2 * 1024 * 1024)
+pico_board_cmake_set_default(PICO_FLASH_SIZE_BYTES, (2 * 1024 * 1024))
 #ifndef PICO_FLASH_SIZE_BYTES
 #define PICO_FLASH_SIZE_BYTES (2 * 1024 * 1024)
 #endif
--- a/src/boards/include/boards/seeed_xiao_rp2350.h
+++ b/src/boards/include/boards/seeed_xiao_rp2350.h
@ -9,14 +9,17 @@
 //       SHOULD ONLY CONSIST OF PREPROCESSOR DIRECTIVES
 // -----------------------------------------------------

-// pico_cmake_set PICO_PLATFORM=rp2350
-
 #ifndef _BOARDS_SEEED_XIAO_RP2350_H
 #define _BOARDS_SEEED_XIAO_RP2350_H

+pico_board_cmake_set(PICO_PLATFORM, rp2350)
+
 // For board detection
 #define SEEED_XIAO_RP2350

+// --- RP2350 VARIANT ---
+#define PICO_RP2350A 1
+
 //------------- UART -------------//
 #ifndef PICO_DEFAULT_UART
 #define PICO_DEFAULT_UART 0
@ -137,12 +140,12 @@
 #define PICO_FLASH_SPI_CLKDIV 4
 #endif

-// pico_cmake_set_default PICO_FLASH_SIZE_BYTES = (4 * 1024 * 1024)
+pico_board_cmake_set_default(PICO_FLASH_SIZE_BYTES, (4 * 1024 * 1024))
 #ifndef PICO_FLASH_SIZE_BYTES
 #define PICO_FLASH_SIZE_BYTES (4 * 1024 * 1024)
 #endif

-// pico_cmake_set_default PICO_RP2350_A2_SUPPORTED = 1
+pico_board_cmake_set_default(PICO_RP2350_A2_SUPPORTED, 1)
 #ifndef PICO_RP2350_A2_SUPPORTED
 #define PICO_RP2350_A2_SUPPORTED 1
 #endif
--- a/src/boards/include/boards/solderparty_rp2040_stamp.h
+++ b/src/boards/include/boards/solderparty_rp2040_stamp.h
@ -14,11 +14,11 @@
 //
 // This header may be included by other board headers as "boards/solderparty_rp2040_stamp.h"

-// pico_cmake_set PICO_PLATFORM=rp2040
-
 #ifndef _BOARDS_SOLDERPARTY_RP2040_STAMP_H
 #define _BOARDS_SOLDERPARTY_RP2040_STAMP_H

+pico_board_cmake_set(PICO_PLATFORM, rp2040)
+
 // For board detection
 #define SOLDERPARTY_RP2040_STAMP

@ -73,7 +73,7 @@
 #define PICO_FLASH_SPI_CLKDIV 2
 #endif

-// pico_cmake_set_default PICO_FLASH_SIZE_BYTES = (8 * 1024 * 1024)
+pico_board_cmake_set_default(PICO_FLASH_SIZE_BYTES, (8 * 1024 * 1024))
 #ifndef PICO_FLASH_SIZE_BYTES
 #define PICO_FLASH_SIZE_BYTES (8 * 1024 * 1024)
 #endif
--- a/src/boards/include/boards/solderparty_rp2040_stamp_carrier.h
+++ b/src/boards/include/boards/solderparty_rp2040_stamp_carrier.h
@ -14,11 +14,11 @@
 //
 // This header may be included by other board headers as "boards/solderparty_rp2040_stamp_carrier.h"

-// pico_cmake_set PICO_PLATFORM=rp2040
-
 #ifndef _BOARDS_SOLDERPARTY_RP2040_STAMP_CARRIER_H
 #define _BOARDS_SOLDERPARTY_RP2040_STAMP_CARRIER_H

+pico_board_cmake_set(PICO_PLATFORM, rp2040)
+
 // For board detection
 #define SOLDERPARTY_RP2040_STAMP_CARRIER

--- a/src/boards/include/boards/solderparty_rp2040_stamp_round_carrier.h
+++ b/src/boards/include/boards/solderparty_rp2040_stamp_round_carrier.h
@ -14,11 +14,11 @@
 //
 // This header may be included by other board headers as "boards/solderparty_rp2040_stamp_round_carrier.h"

-// pico_cmake_set PICO_PLATFORM=rp2040
-
 #ifndef _BOARDS_SOLDERPARTY_RP2040_STAMP_ROUND_CARRIER_H
 #define _BOARDS_SOLDERPARTY_RP2040_STAMP_ROUND_CARRIER_H

+pico_board_cmake_set(PICO_PLATFORM, rp2040)
+
 // For board detection
 #define SOLDERPARTY_RP2040_STAMP_ROUND_CARRIER

--- a/src/boards/include/boards/solderparty_rp2350_stamp.h
+++ b/src/boards/include/boards/solderparty_rp2350_stamp.h
@ -11,11 +11,11 @@

 // This header may be included by other board headers as "boards/solderparty_rp2350_stamp.h"

-// pico_cmake_set PICO_PLATFORM=rp2350
-
 #ifndef _BOARDS_SOLDERPARTY_RP2350_STAMP_H
 #define _BOARDS_SOLDERPARTY_RP2350_STAMP_H

+pico_board_cmake_set(PICO_PLATFORM, rp2350)
+
 // For board detection
 #define SOLDERPARTY_RP2350_STAMP

@ -73,12 +73,12 @@
 #define PICO_FLASH_SPI_CLKDIV 2
 #endif

-// pico_cmake_set_default PICO_FLASH_SIZE_BYTES = (16 * 1024 * 1024)
+pico_board_cmake_set_default(PICO_FLASH_SIZE_BYTES, (16 * 1024 * 1024))
 #ifndef PICO_FLASH_SIZE_BYTES
 #define PICO_FLASH_SIZE_BYTES (16 * 1024 * 1024)
 #endif

-// pico_cmake_set_default PICO_RP2350_A2_SUPPORTED = 1
+pico_board_cmake_set_default(PICO_RP2350_A2_SUPPORTED, 1)
 #ifndef PICO_RP2350_A2_SUPPORTED
 #define PICO_RP2350_A2_SUPPORTED 1
 #endif
--- a/src/boards/include/boards/solderparty_rp2350_stamp_xl.h
+++ b/src/boards/include/boards/solderparty_rp2350_stamp_xl.h
@ -11,11 +11,11 @@

 // This header may be included by other board headers as "boards/solderparty_rp2350_stamp_xl.h"

-// pico_cmake_set PICO_PLATFORM=rp2350
-
 #ifndef _BOARDS_SOLDERPARTY_RP2350_STAMP_XL_H
 #define _BOARDS_SOLDERPARTY_RP2350_STAMP_XL_H

+pico_board_cmake_set(PICO_PLATFORM, rp2350)
+
 // For board detection
 #define SOLDERPARTY_RP2350_STAMP_XL

@ -73,12 +73,12 @@
 #define PICO_FLASH_SPI_CLKDIV 2
 #endif

-// pico_cmake_set_default PICO_FLASH_SIZE_BYTES = (16 * 1024 * 1024)
+pico_board_cmake_set_default(PICO_FLASH_SIZE_BYTES, (16 * 1024 * 1024))
 #ifndef PICO_FLASH_SIZE_BYTES
 #define PICO_FLASH_SIZE_BYTES (16 * 1024 * 1024)
 #endif

-// pico_cmake_set_default PICO_RP2350_A2_SUPPORTED = 1
+pico_board_cmake_set_default(PICO_RP2350_A2_SUPPORTED, 1)
 #ifndef PICO_RP2350_A2_SUPPORTED
 #define PICO_RP2350_A2_SUPPORTED 1
 #endif
--- a/src/boards/include/boards/sparkfun_iotnode_lorawan_rp2350.h
+++ b/src/boards/include/boards/sparkfun_iotnode_lorawan_rp2350.h
@ -12,11 +12,11 @@
 //
 // This header may be included by other board headers as "boards/sparkfun_iotnode_lorawan_rp2350.h"

-// pico_cmake_set PICO_PLATFORM=rp2350
-
 #ifndef _BOARDS_SPARKFUN_IOTNODE_LORAWAN_RP2350_H
 #define _BOARDS_SPARKFUN_IOTNODE_LORAWAN_RP2350_H

+pico_board_cmake_set(PICO_PLATFORM, rp2350)
+
 // For board detection
 #define SPARKFUN_IOTNODE_LORAWAN_RP2350

@ -75,12 +75,12 @@
 #define PICO_FLASH_SPI_CLKDIV 2
 #endif

-// pico_cmake_set_default PICO_FLASH_SIZE_BYTES = (16 * 1024 * 1024)
+pico_board_cmake_set_default(PICO_FLASH_SIZE_BYTES, (16 * 1024 * 1024))
 #ifndef PICO_FLASH_SIZE_BYTES
 #define PICO_FLASH_SIZE_BYTES (16 * 1024 * 1024)
 #endif

-// pico_cmake_set_default PICO_RP2350_A2_SUPPORTED = 1
+pico_board_cmake_set_default(PICO_RP2350_A2_SUPPORTED, 1)
 #ifndef PICO_RP2350_A2_SUPPORTED
 #define PICO_RP2350_A2_SUPPORTED 1
 #endif
--- a/src/boards/include/boards/sparkfun_iotredboard_rp2350.h
+++ b/src/boards/include/boards/sparkfun_iotredboard_rp2350.h
@ -0,0 +1,183 @@
+/*
+ * Copyright (c) 2024 Raspberry Pi (Trading) Ltd.
+ *
+ * SPDX-License-Identifier: BSD-3-Clause
+ */
+
+// -----------------------------------------------------
+// NOTE: THIS HEADER IS ALSO INCLUDED BY ASSEMBLER SO
+//       SHOULD ONLY CONSIST OF PREPROCESSOR DIRECTIVES
+// -----------------------------------------------------
+// Board definition for the SparkFun IoT RedBoard - RP2350
+//
+// This header may be included by other board headers as "boards/sparkfun_iotredboard_rp2350.h"
+
+#ifndef _BOARDS_SPARKFUN_IOTREDBOARD_RP2350_H
+#define _BOARDS_SPARKFUN_IOTREDBOARD_RP2350_H
+
+pico_board_cmake_set(PICO_PLATFORM, rp2350)
+pico_board_cmake_set(PICO_CYW43_SUPPORTED, 1)
+
+// For board detection
+#define SPARKFUN_IOTREDBOARD_RP2350
+
+// --- RP2350 VARIANT ---
+#define PICO_RP2350A 0 // 1 for RP2350A, 0 for RP2350B
+
+// --- BOARD SPECIFIC ---
+#define SPARKFUN_IOTREDBOARD_RP2350_USER_SW_PIN 39
+#define SPARKFUN_IOTREDBOARD_RP2350_PSRAM_CS_PIN 47
+
+
+// --- UART ---
+#ifndef PICO_DEFAULT_UART
+#define PICO_DEFAULT_UART 0
+#endif
+#ifndef PICO_DEFAULT_UART_TX_PIN
+#define PICO_DEFAULT_UART_TX_PIN 0
+#endif
+#ifndef PICO_DEFAULT_UART_RX_PIN
+#define PICO_DEFAULT_UART_RX_PIN 1
+#endif
+
+// --- LED ---
+#ifndef PICO_DEFAULT_LED_PIN
+#define PICO_DEFAULT_LED_PIN 25
+#endif
+
+#ifndef PICO_DEFAULT_WS2812_PIN
+#define PICO_DEFAULT_WS2812_PIN 3
+#endif
+
+// --- I2C --- Qwiic connector is on these pins
+#ifndef PICO_DEFAULT_I2C
+#define PICO_DEFAULT_I2C 0
+#endif
+#ifndef PICO_DEFAULT_I2C_SDA_PIN
+#define PICO_DEFAULT_I2C_SDA_PIN 4
+#endif
+#ifndef PICO_DEFAULT_I2C_SCL_PIN
+#define PICO_DEFAULT_I2C_SCL_PIN 5
+#endif
+
+// --- SPI ---
+#ifndef PICO_DEFAULT_SPI
+#define PICO_DEFAULT_SPI 0
+#endif
+#ifndef PICO_DEFAULT_SPI_SCK_PIN
+#define PICO_DEFAULT_SPI_SCK_PIN 22
+#endif
+#ifndef PICO_DEFAULT_SPI_TX_PIN
+#define PICO_DEFAULT_SPI_TX_PIN 23
+#endif
+#ifndef PICO_DEFAULT_SPI_RX_PIN
+#define PICO_DEFAULT_SPI_RX_PIN 20
+#endif
+#ifndef PICO_DEFAULT_SPI_CSN_PIN
+#define PICO_DEFAULT_SPI_CSN_PIN 21
+#endif
+
+// --- FLASH ---
+
+#define PICO_BOOT_STAGE2_CHOOSE_W25Q080 1
+
+#ifndef PICO_FLASH_SPI_CLKDIV
+#define PICO_FLASH_SPI_CLKDIV 2
+#endif
+
+pico_board_cmake_set_default(PICO_FLASH_SIZE_BYTES, (16 * 1024 * 1024))
+#ifndef PICO_FLASH_SIZE_BYTES
+#define PICO_FLASH_SIZE_BYTES (16 * 1024 * 1024)
+#endif
+
+// The IoT RedBoard has an SD Card.
+#ifndef PICO_SD_CLK_PIN
+#define PICO_SD_CLK_PIN 10
+#endif
+#ifndef PICO_SD_CMD_PIN
+#define PICO_SD_CMD_PIN 11
+#endif
+#ifndef PICO_SD_DAT0_PIN
+#define PICO_SD_DAT0_PIN 8
+#endif
+#ifndef PICO_SD_DAT3_PIN
+#define PICO_SD_DAT3_PIN 9 // DAT3 of the SD card is the chip select pin
+#endif
+#ifndef PICO_SD_DAT_PIN_COUNT
+#define PICO_SD_DAT_PIN_COUNT 1
+#endif
+
+// The GPIO Pin used to monitor VSYS. Typically you would use this with ADC.
+// There is an example in adc/read_vsys in pico-examples.
+#ifndef PICO_VSYS_PIN
+#define PICO_VSYS_PIN 46
+#endif
+
+pico_board_cmake_set_default(PICO_RP2350_A2_SUPPORTED, 1)
+#ifndef PICO_RP2350_A2_SUPPORTED
+#define PICO_RP2350_A2_SUPPORTED 1
+#endif
+
+// Bootloader activity LED in double reset mode.
+#ifndef PICO_BOOTSEL_VIA_DOUBLE_RESET_ACTIVITY_LED
+#define PICO_BOOTSEL_VIA_DOUBLE_RESET_ACTIVITY_LED PICO_DEFAULT_LED_PIN
+#endif
+
+// Bootloader activity LED in USB reset mode.
+#ifndef PICO_STDIO_USB_RESET_BOOTSEL_ACTIVITY_LED
+#define PICO_STDIO_USB_RESET_BOOTSEL_ACTIVITY_LED PICO_DEFAULT_LED_PIN
+#endif
+
+// --- CYW43 ---
+
+#ifndef CYW43_WL_GPIO_COUNT
+#define CYW43_WL_GPIO_COUNT 3
+#endif
+
+#ifndef CYW43_WL_GPIO_LED_PIN
+#define CYW43_WL_GPIO_LED_PIN 0
+#endif
+
+// If CYW43_WL_GPIO_VBUS_PIN is defined then a CYW43 GPIO has to be used to read VBUS.
+// This can be passed to cyw43_arch_gpio_get to determine if the device is battery powered.
+// PICO_VBUS_PIN and CYW43_WL_GPIO_VBUS_PIN should not both be defined.
+#ifndef CYW43_WL_GPIO_VBUS_PIN
+#define CYW43_WL_GPIO_VBUS_PIN 2
+#endif
+
+// cyw43 SPI pins can't be changed at runtime
+#ifndef CYW43_PIN_WL_DYNAMIC
+#define CYW43_PIN_WL_DYNAMIC 0
+#endif
+
+// gpio pin to power up the cyw43 chip
+#ifndef CYW43_DEFAULT_PIN_WL_REG_ON
+#define CYW43_DEFAULT_PIN_WL_REG_ON 24u
+#endif
+
+// gpio pin for spi data out to the cyw43 chip
+#ifndef CYW43_DEFAULT_PIN_WL_DATA_OUT
+#define CYW43_DEFAULT_PIN_WL_DATA_OUT 38u
+#endif
+
+// gpio pin for spi data in from the cyw43 chip
+#ifndef CYW43_DEFAULT_PIN_WL_DATA_IN
+#define CYW43_DEFAULT_PIN_WL_DATA_IN 38u
+#endif
+
+// gpio (irq) pin for the irq line from the cyw43 chip
+#ifndef CYW43_DEFAULT_PIN_WL_HOST_WAKE
+#define CYW43_DEFAULT_PIN_WL_HOST_WAKE 38u
+#endif
+
+// gpio pin for the spi clock line to the cyw43 chip
+#ifndef CYW43_DEFAULT_PIN_WL_CLOCK
+#define CYW43_DEFAULT_PIN_WL_CLOCK 37u
+#endif
+
+// gpio pin for the spi chip select to the cyw43 chip
+#ifndef CYW43_DEFAULT_PIN_WL_CS
+#define CYW43_DEFAULT_PIN_WL_CS 36u
+#endif
+
+#endif // _BOARDS_SPARKFUN_IOTREDBOARD_RP2350_H
--- a/src/boards/include/boards/sparkfun_micromod.h
+++ b/src/boards/include/boards/sparkfun_micromod.h
@ -14,11 +14,11 @@
 //
 // This header may be included by other board headers as "boards/sparkfun_micromod.h"

-// pico_cmake_set PICO_PLATFORM=rp2040
-
 #ifndef _BOARDS_SPARKFUN_MICROMOD_H
 #define _BOARDS_SPARKFUN_MICROMOD_H

+pico_board_cmake_set(PICO_PLATFORM, rp2040)
+
 // For board detection
 #define SPARKFUN_MICROMOD

@ -75,7 +75,7 @@
 #define PICO_FLASH_SPI_CLKDIV 2
 #endif

-// pico_cmake_set_default PICO_FLASH_SIZE_BYTES = (16 * 1024 * 1024)
+pico_board_cmake_set_default(PICO_FLASH_SIZE_BYTES, (16 * 1024 * 1024))
 #ifndef PICO_FLASH_SIZE_BYTES
 #define PICO_FLASH_SIZE_BYTES (16 * 1024 * 1024)
 #endif
--- a/src/boards/include/boards/sparkfun_promicro.h
+++ b/src/boards/include/boards/sparkfun_promicro.h
@ -14,11 +14,11 @@
 //
 // This header may be included by other board headers as "boards/sparkfun_promicro.h"

-// pico_cmake_set PICO_PLATFORM=rp2040
-
 #ifndef _BOARDS_SPARKFUN_PROMICRO_H
 #define _BOARDS_SPARKFUN_PROMICRO_H

+pico_board_cmake_set(PICO_PLATFORM, rp2040)
+
 // For board detection
 #define SPARKFUN_PROMICRO

@ -75,7 +75,7 @@
 #endif

 // board has 16M onboard flash
-// pico_cmake_set_default PICO_FLASH_SIZE_BYTES = (16 * 1024 * 1024)
+pico_board_cmake_set_default(PICO_FLASH_SIZE_BYTES, (16 * 1024 * 1024))
 #ifndef PICO_FLASH_SIZE_BYTES
 #define PICO_FLASH_SIZE_BYTES (16 * 1024 * 1024)
 #endif
--- a/src/boards/include/boards/sparkfun_promicro_rp2350.h
+++ b/src/boards/include/boards/sparkfun_promicro_rp2350.h
@ -14,11 +14,11 @@
 //
 // This header may be included by other board headers as "boards/sparkfun_promicro_rp2350.h"

-// pico_cmake_set PICO_PLATFORM=rp2350
-
 #ifndef _BOARDS_SPARKFUN_PROMICRO_RP2350_H
 #define _BOARDS_SPARKFUN_PROMICRO_RP2350_H

+pico_board_cmake_set(PICO_PLATFORM, rp2350)
+
 // For board detection
 #define SPARKFUN_PROMICRO_RP2350

@ -73,7 +73,7 @@
 #endif

 // board has 16M onboard flash
-// pico_cmake_set_default PICO_FLASH_SIZE_BYTES = (16 * 1024 * 1024)
+pico_board_cmake_set_default(PICO_FLASH_SIZE_BYTES, (16 * 1024 * 1024))
 #ifndef PICO_FLASH_SIZE_BYTES
 #define PICO_FLASH_SIZE_BYTES (16 * 1024 * 1024)
 #endif
@ -81,7 +81,7 @@
 // --- RP2350 VARIANT ---
 #define PICO_RP2350A 1

-// pico_cmake_set_default PICO_RP2350_A2_SUPPORTED = 1
+pico_board_cmake_set_default(PICO_RP2350_A2_SUPPORTED, 1)
 #ifndef PICO_RP2350_A2_SUPPORTED
 #define PICO_RP2350_A2_SUPPORTED 1
 #endif
--- a/Show more
+++ b/Show more
Author	SHA1	Message	Date
will-v-pi	a1faacff07	Remove reference to wafer_id (#2512 ) `wafer_id` is not correct, as it is a 64-bit `device_ID` instead of a separate `device_id` and `wafer_id`	2025-06-10 08:49:04 -05:00
Marek Küthe	d7abd66dea	Fix typo (#2508 )	2025-06-09 09:37:20 -05:00
Goran Miskovic	a9146b65ad	fix(async_context_threadsafe_background_execute_sync): prevent use-after-return by removing worker before semaphore release (#2494 ) Ensures the async worker is unregistered from the context before releasing the blocking thread. This prevents the `sync_func_call_t` stack object from being accessed after it goes out of scope, avoiding a use-after-return condition in multicore `async_context_execute_sync()` scenarios. Fixes raspberrypi/pico-sdk#2433 Signed-off-by: Goran Mišković <schkovich@users.noreply.github.com>	2025-06-03 11:06:35 -05:00
will-v-pi	1ae2f0e32c	Don't include the picobin end block when sealing (#2492 ) * Don't include the picobin end block when signing, as picotool will add a new end block anyway * small whitespace fix --------- Co-authored-by: Graham Sanderson <graham.sanderson@raspberrypi.com>	2025-05-30 16:17:46 -05:00
will-v-pi	6841d4d15b	Remove DEPENDS argument from add_custom_command(TARGET functions (#2489 ) This raises a warning with recent CMake versions, and isn't required due to the `pico_add_link_depend` already added for these files Fixes raspberrypi/picotool#235	2025-05-30 08:35:25 -05:00
will-v-pi	6860f0d882	Call enable_interrupts when initialising IRQs (#2491 ) * Call enable_interrupts when initialising IRQs Fixes raspberrypi/pico-examples#584, supercedes raspberrypi/pico-examples#588 * move enable_interrupts to the end though it doesn't make much difference * guard enable_interrupts by !RP2040 as it isn't needed there --------- Co-authored-by: Graham Sanderson <graham.sanderson@raspberrypi.com>	2025-05-30 08:33:04 -05:00
armandomontanez	67f89e44aa	Update Bazel pin, ignore build-* directories (#2461 ) Updates the Bazel pin to 8.1.0 so that build-* directories can be properly ignored.	2025-05-29 08:25:46 -05:00
Graham Sanderson	0722de395c	add new M33 processor exception handlers (#2482 )	2025-05-29 08:18:05 -05:00
will-v-pi	6613aa45a5	Add support for creating self-decrypting binaries (#2315 ) Note: this support is experimental until the next release Co-authored-by: graham sanderson <graham.sanderson@raspberrypi.com>	2025-05-29 08:12:29 -05:00
Andrew Scheller	9fdfe110dc	Remove accidental comment words in stdio.h (#2480 )	2025-05-23 07:15:44 -05:00
Graham Sanderson	c9c38252ec	remove assembler warning if StackSize or HeapSize are explicitly set to zero (#2465 )	2025-05-21 06:57:09 -05:00
Jack Whitham	3515dad632	Fix multicore_lockout features so that the victim core cannot become stuck in an infinite loop if the lockout attempt times out (#2467 ) * Fix issue 2454 flash safe execute lockout The lockout state is controlled by a shared variable. The FIFO is used to begin a lockout and acknowledge it (i.e. multicore_lockout_handshake works as before) but the end of the lockout is now signalled by updating the shared variable. This ensures that timeouts are recognised reliably by the victim core. __wfe and __sev are used to signal updates to the shared variable in order to avoid polling. * Update documentation for multicore_lockout_end functions * Simplification, remove magic number (not required) * Review improvements * Restore use of non-zero magic number	2025-05-20 15:43:06 -05:00
Sergio R. Caprile	47f288b5d6	Add support for wiznet_w5100s_evb_pico2 (#2458 ) * Add support for wiznet_w5100s_evb_pico2 This board has an RP2350 and a smaller 2MB flash Signed-off-by: Sergio R. Caprile <scaprile@gmail.com> * update to new syntax Signed-off-by: Sergio R. Caprile <scaprile@gmail.com> * fix missing definition Signed-off-by: Sergio R. Caprile <scaprile@gmail.com> --------- Signed-off-by: Sergio R. Caprile <scaprile@gmail.com>	2025-05-20 15:41:49 -05:00
will-v-pi	cbd765644b	Minor fixups to compile with TF-M (#2403 ) * Minor fixups to compile with TF-M TF-M requires c99 compatibility, which throws errors at these lines This patch fixes those errors and is currently applied by TF-M when cloning the SDK, but it would be better to get it into the SDK by default so that patch isn't needed * #ifdef only on __STRICT_ANSI__ Also fix devinfo type	2025-05-20 15:41:30 -05:00
Graham Sanderson	8066bee734	give user more control over embedded_start_block.S contents (#2470 )	2025-05-20 15:32:27 -05:00
27Onion Nebell	66540fe88e	Fix pioasm build failure caused by GCC 15 changes (#2448 ) (#2468 )	2025-05-20 15:30:17 -05:00
will-v-pi	14d75c0b78	Add printout of picotool location (#2475 ) This prints out the location of the picotool executable being used For example: * `Using picotool from /usr/local/bin/picotool` for a system install * `Using picotool from /home/name/pico-examples/build/_deps/picotool/picotool` for a picotool fetched by the SDK	2025-05-20 15:29:41 -05:00
Graham Sanderson	550aa09624	fix typo in PICO_RUNTIME_SKIP_INIT_POST_CLOCK_RESETS (was missing INIT) (#2457 )	2025-05-11 20:34:17 -05:00
Michael Brase	792f55628e	Use cyw43_delay_ms() in cyw43_spi_reset() instead of sleep_ms() (#2431 ) Since cyw43_spi_reset() may be executed from an async context, we should use cyw43_delay_ms() instead of sleep_ms(). This is particularly a problem when using the async_context_threadsafe_background backend, because sleep_ms() will assert in an ISR.	2025-05-08 10:26:08 -05:00
Graham Sanderson	799225d550	Add PICO_CRT0_NEAR_CALLS to indicate that crt0 can call runtimine_init/main/exit etc via near calls (#2452 ) --------- Co-authored-by: will-v-pi <108662275+will-v-pi@users.noreply.github.com>	2025-05-07 08:56:40 -05:00
Graham Sanderson	7cdb8eca57	Add PICO_CRT0_NO_RESET_SECTION (#2453 )	2025-05-07 08:56:19 -05:00
Andrew Scheller	0779dfe3eb	Small PICO_CONFIG tweak (#2456 )	2025-05-06 09:14:20 -05:00
Tommy G	25789c433f	Fix wrong value used for lposc_freq_khz_frac and xosc_freq_khz_frac	2025-05-04 14:21:00 -05:00
Andrew Brock	ec25563b82	Fix binary_info compilation in C++ due to out-of-order designated initialisers (#2438 )	2025-05-04 12:57:04 -05:00
Peter Harper	4bbd53371e	Fix sha build issues with mbedtls 3.x (#2447 ) The mbedtls methods have dropped the "_ret" from the function names in mbedtls 3.x. Use the new function names but support the old names if mbedtls 2.x is used.	2025-05-02 08:42:53 -05:00
Peter Harper	0de8847b99	Crashes after calling btstack_cyw43_deinit (#2446 ) You can deinitialise cyw43 and btstack by calling btstack_cyw43_deinit but its pending and timeout workers are not removed which means they can keep running, whcih causes a crash. Add a btstack_run_loop_async_context_deinit method and call this from btstack_cyw43_deinit.	2025-05-01 10:35:29 -05:00
Peter Harper	31fadf42eb	Revert "Add --recursive flag to git submodule cmd (#2416 )" (#2445 ) This reverts commit `5592322465`.	2025-05-01 10:31:35 -05:00
will-v-pi	6e315799f5	Add script to extract CMake function descriptions (#2422 )	2025-04-29 11:09:06 -05:00
Caleb Jamison	333944ac67	Update hellbender_2350A_devboard.h for release version of the board. (#2441 ) * Update hellbender_2350A_devboard.h for release version of the board. * Remove PICO_DEFAULT_SPI_CSN_PIN	2025-04-29 11:05:12 -05:00
Andrew Scheller	082d9f75cd	More board-header checks (followup to #2397 ) (#2442 ) - make the error messages less misleading - suggest replacing the old comment-style syntax with the new macro-style syntax	2025-04-26 12:15:26 -05:00
Andrew Scheller	ae332b3522	Ensure each test has a unique name (followup to #2208 ) (#2443 ) mainly by fixing typos!	2025-04-26 12:13:36 -05:00
Peter Harper	174cafc31a	Add CYW43_WL_GPIO_SMPS_PIN for pico_w and pico2_w (#2410 ) Fixes #2361	2025-04-23 14:02:06 -05:00
Andrew Scheller	eee72cdca7	Fix submodule path typos (#2424 )	2025-04-23 13:58:11 -05:00
Andrew Scheller	8421b451f7	Revert "Make doxygen buildable again (#2423 )" (#2437 ) This reverts commit `65a8907828`.	2025-04-23 13:57:31 -05:00
Graham Sanderson	829c067ee7	add word alignment for rtwopi (#2429 )	2025-04-20 19:25:29 -05:00
Andrew Scheller	65a8907828	Make doxygen buildable again (#2423 ) Remove `\par` doxygen syntax which isn't supported by https://github.com/raspberrypi/doxygentoasciidoc	2025-04-15 08:28:07 -07:00
Graham Sanderson	fed7188e52	Rework use of pico_cmake_set in board headers to make it slightly less magic/confusing (#2397 ) * Rework use of pico_cmake_set in board headers to make it slightly less magic/confusing - prefer "pico_cmake_set(var, value)" over "// pico_cmake_set var = value" - prefer "pico_cmake_set_default(var, value)" over "// pico_cmake_set_default var = value" - move these inside the header include guards as CLion complains Note that the macros are defined in "pico.h" however that is not explicitly included by the board headers; this will probably confuse some VS code syntax highligting, so lets see how it looks - i'd prefer to avoid having to include a header just for this * Update check_board_header.py with the new pico_cmake_set formats * Add brackets back around `PICO_FLASH_SIZE_BYTES` settings The python script checks for an exact match between the #define and the pico_cmake_set_default, so fails without the brackets * Rename to pico_board_cmake_set and pico_board_cmake_set_default * Fix support for old versions --------- Co-authored-by: William Vinnicombe <william.vinnicombe@raspberrypi.com>	2025-04-14 08:50:25 -07:00
Peter Harper	5592322465	Add --recursive flag to git submodule cmd (#2416 ) Update all github workflows because picotool is (properly) using mbedtls in pico-sdk and it now has its own submodules.	2025-04-11 21:35:09 -07:00
David Dyck	1ff632128f	Fix #2413 - Misleading comment about bootloader in rp2350/memmap_copy_to_ram.ld (#2415 )	2025-04-11 09:36:29 -07:00
Peter Harper	6fea77f584	Change BT flash storage default for rp2350 A2 (#2412 ) The workaround for errata RP2350-E10 overwrites the last block in flash. This will overwrite the BT flash storage causing a paired BT connection to fail. Move the default flash storage location to 3 sectors from the end of flash for RP2350 where A2 support is required. This will require existing BT pairings to a Pico device to be removed and readded. Fixes #2322	2025-04-11 09:22:20 -07:00
Peter Harper	1721f9db47	Add some docs for pico_set_lwip_httpd_content (#2411 )	2025-04-11 09:20:49 -07:00
Peter Harper	f674850f0e	Fix DST bug in aon_timer_get_time for rp2040 (#2409 ) If you set the timezone, aon_timer_get_time can wrongly apply a daylight saving time adjustment based on the stack contents. This can make it appear that time has gone backwards. Make sure datetime_to_tm initialises tm_isdst to -1. Fixes #2374	2025-04-11 09:14:26 -07:00
Peter Harper	d47c0c89ce	Update mbedtls, lwip and cyw43-driver (#2405 ) * Update LwIP to 2.2.1 * Update to mbedtls to 3.6.1 * Update lib/cyw43-driver to 1.1.0 * Support using a more recent version of mbedtls altcp_tls_mbedtls.c is not compatible with mbedtls 3.x so use a patched version until this is resolved. * Make sure MBEDTLS_VERSION_MAJOR is visible to LwIP. * Test mbedtls in kitchen sink * Add mbedtls to bazel	2025-04-11 09:14:02 -07:00
Scott Shawcroft	93ea261677	Force inline critical_section_{enter,exit} (#2393 ) Otherwise it may end up in flash when we want it to follow the caller's placement (maybe in RAM.)	2025-04-05 23:43:06 -05:00
Graham Sanderson	950a68f80e	define __force_inline in host compiles (#2396 )	2025-04-04 13:18:28 -05:00
Andrew Scheller	5912699dd0	Lots of small doxygen fixes (#2390 )	2025-04-04 11:39:39 -05:00
will-v-pi	701c1933af	Set default GATT path to CMAKE_CURRENT_LIST_DIR if not specified (#2385 ) This ensures the GATT_PATH variable is set to the calling directory when just a filename is provided with no path Fixes #2366	2025-04-04 11:36:32 -05:00
Andrew Scheller	c88bd53a68	Ensure that all RP2350 board-headers explicitly define PICO_RP2350A (#2370 )	2025-04-04 11:35:42 -05:00
Andrew Scheller	5edf1a0a3c	Fix WindowsCI (again) (#2388 ) Use newer version of ninja	2025-04-04 11:34:30 -05:00
Andrew Scheller	ad0bca9c85	Fix bug in extract_configs.py (#2389 ) This bug was actually introduced by #1845 , but I never noticed until now because it depended on which order the filesystem traversed the directories	2025-04-04 11:33:18 -05:00
Graham Sanderson	f62bc4f5ea	Properly respect setting PICO_DEFAULT_BINARY_TYPE (#2381 ) * Properly respect setting PICO_DEFAULT_BINARY_TYPE (rather than say PICO_NO_FLASH), and add a build error for specifying different types simulataneously * remove dead code	2025-04-03 09:58:41 -05:00
Graham Sanderson	f154f58cf9	unclaim alarm on correct timer in ta_disable_irq_handler (#2382 )	2025-04-03 09:57:59 -05:00
Graham Sanderson	ac3c458e81	move irq_has_handler() so it can be used without shared handlers (#2383 )	2025-04-03 09:57:25 -05:00
will-v-pi	472c781a31	Fix sign conversion error introduced by #2233 (#2392 )	2025-04-02 10:29:29 -05:00
Patrick Plenefisch	bb5b5f96e2	Move unique_id (configurably) earlier in the static init process (#2379 ) This enables using the unique_id in C++ static initializers by default	2025-03-29 12:02:03 -05:00
will-v-pi	a5ba689cb5	Initial commit pulled in a bunch of stuff - see description * Add `PICO_MINIMAL_STORED_VECTOR_TABLE` config replacing (`PICO_NO_STORED_VECTOR_TABLE` which was a lie * Add `PICO_NUM_VTABLE_IRQS`` which allows you to limit the number of IRQs included in both the STORED or RAM vector tables, and make the rest of the SDK behave properly based on that * Because these new variables in `pico_crt0` are circularly dependent somewhat with variables in `hardware_irq` hoist all the interdependent variables into a new `pico_platform_common` which is common to all `rp2` platforms * Move some previously duplicated `pico_platform` code into `pico_platform_common` Net effect: 1. if you set PICO_MINIMAL_STORED_VECTOR_TABLE=1, you get a 4 word VTABLE on Arm.. you still get a RAM vector table with up to PICO_NUM_VTABLE_IRQs (defaults to NUM_IRQs) but everything - including things like `isr_pendsv` point to `__unhandled_user_irq`. 2. PICO_NUM_VTABLE_IRQs (default NUM_IRQS) sets the number of IRQs that have handlers in the VTABLE (this affects the space reserved, and what the irq APIs let you touch - at least as far as invalid_params_if!) 3. If you set PICO_MINIMAL_STORED_VECTOR_TABLE=1 for a no flash binary, then PICO_NUM_VTABLE_IRQs is forced to 0 as there is no reserved space for the handlers. Co-authored-by: graham sanderson <graham.sanderson@raspberrypi.com>	2025-03-26 16:44:21 -05:00
Graham Sanderson	39fafaa434	Add SPARE_IRQs to the SVD (#2271 ) * Add SPARE_IRQ to RP2350 SVD (note not having an `<addresBlock>` or one with a size of zero is not a legal SVD, so including something hopefully harmless * Add SPARE_IRQ definitions to RP2040 intctrl.h, and add assertions on competing #defines as these were called USER_IRQs in the SDK 1.x * Add SPAREIRQ_IRQ to rp2040 assembler, and fix name on rp2350 - this is backwards incompatible, but unlikely used * add SPARE_IRQs to RP2040 svd too	2025-03-25 13:14:28 -05:00
Andrew Scheller	fa94f6448a	Look for PICO_CONFIG: entries in .S files too (#2368 ) (and fix the errors that this found)	2025-03-24 17:28:59 -05:00
Michael Brase	e43b7534ba	Add new stdio_usb_call_chars_available_callback() function (#2300 ) When the user links in tinyUSB directly, the pico_stdio_usb library disables some of its functionality, including its built-in background processing thread. The user can implement their own background thread in order to continue using the stdio functionality, except that there is no wey to trigger the registered chars_available_callback. This commit adds a new `stdio_usb_run_chars_available_callback()` method to allow user's background threads to run the callback.	2025-03-22 18:47:40 -05:00
will-v-pi	f81851a2cb	Throw a warning when using the example signing/encryption keys (#2352 ) * Raise a warning when using the example signing/encryption keys This is automatically disabled for pico-examples, and can be manually disabled by setting PICO_ALLOW_EXAMPLE_KEYS	2025-03-22 18:22:37 -05:00
will-v-pi	bbb94e51f9	Add rom_pick_ab_update_partition function (#2182 )	2025-03-22 17:59:05 -05:00
Michael Brase	332eb5345b	Add new feature defines to pico_stdio_usb (#2296 ) This change adds the following to pico_stdio_usb: - `PICO_STDIO_USB_ENABLE_IRQ_BACKGROUND_TASK` - `PICO_STDIO_USB_ENABLE_TINYUSB_INIT` - `PICO_STDIO_USB_USE_DEFAULT_DESCRIPTORS` These defines replace some ifdefs that were previously gated by the `LIB_TINYUSB_DEVICE` define and will allow finer grained control. All of these defines default to 1 if LIB_TINYUSB_DEVICE is not defined and 0 if LIB_TINYUSB_DEVICE is defined, which should preserve the old behavior.	2025-03-22 12:49:58 -05:00
David Dyck	005759d791	Fix #2253 cybt_printf by wrapping with NDEBUG (#2323 ) Observe that src/rp2_common/pico_cyw43_driver/cybt_shared_bus/cybt_shared_bus_driver.c wraps the definition of cybt_printf with #ifndef NDEBUG Apply this to src/rp2_common/pico_cyw43_driver/cybt_shared_bus/cybt_shared_bus.c Co-authored-by: David Dyck <david.dyck@checksum.com>	2025-03-19 16:16:43 -05:00
Andrew Scheller	645b33c31f	Update hellbender_0001.h (#2359 ) Replace the incorrect `#define PICO_RP2350B 1` with the correct `#define PICO_RP2350A 0` Fixes #2286	2025-03-19 11:03:53 -05:00
will-v-pi	3241bdc2f5	Fix PICO_PREVIOUS_PLATFORM error (#2357 ) `INTERNAL` should be the type of the variable, not placed at the end of the `set` invocation - it implies `FORCE`	2025-03-18 14:18:37 -05:00
Graham Sanderson	ba936d3049	pico_lwip_arch is actually what depends on pico_rand (#2303 )	2025-03-18 14:06:40 -05:00
Andrew Scheller	7d0f44b8b7	Fix tools/build_all_headers.py to cope with chip-specific headers (#2292 )	2025-03-18 13:43:03 -05:00
Graham Sanderson	a995b975ec	Missed doc change in #850 (#2302 )	2025-03-18 13:41:43 -05:00
Michael Brase	26e7dc5c48	Add Bazel label flag for overriding tusb_config.h (#2264 ) This adds `//bazel/config:PICO_TINYUSB_CONFIG`, which is used to select which tusb_config.h gets linked into the tinyUSB port. This defaults to the tusb_config.h from the pico_stdio_usb (same as before), but allows Bazel users to override this config with their own.	2025-03-18 13:41:14 -05:00
Christopher Chamberlain	6d8588d62c	Adjust generated name to match pio_mov_status_type (#2324 ) The enum pio_mov_status_type expects the member name to be STATUS_IRQ_SET.	2025-03-18 13:39:38 -05:00
David Dyck	6a56480879	Remove FIXME delete comment (#2341 ) Fixes #2337 per @kilograham	2025-03-18 13:39:10 -05:00
Andrew Scheller	3751bc5f98	Check for the misuse of '#define PICO_RP2350B' in board headers (#2290 )	2025-03-18 13:31:21 -05:00
Damien George	cc1ac399ed	Remove assignment of cyw43 last_size/header/backplane_window variables (#2306 ) They are never used by the cyw43-driver code, because `F1_OVERFLOW_CHANGE` is disabled. Signed-off-by: Damien George <damien@micropython.org>	2025-03-18 13:28:15 -05:00
gsboylan	a45e1e46f5	Add board file for Eelectronicparts Pico Mini in 2,4,8,16MB variants (#2346 ) Store page and pinout diagrams are here: https://www.eelectronicparts.com/products/rp2040-pro-mini-pico-development-board-for-raspberry-pi-dual-core-mciro-python	2025-03-18 13:27:07 -05:00
Dryw Wade	4f31ef1761	Add SparkFun XRP Controller header (#2347 )	2025-03-18 13:22:27 -05:00
eightycc	ab12d556cd	Fix use of PICO_RP2040 macro. (#2356 )	2025-03-18 10:08:11 -05:00
Graham Sanderson	b1676c18a3	fix return type of enable/disable interrupt methods... add host versions for completeness (#2310 )	2025-03-09 14:39:21 -05:00
Alex Brudner	dd1f48335b	Add upcoming sparkfun board (#2329 )	2025-03-05 10:46:07 -06:00
Andrew Scheller	26ab4be834	Fix misleading error messages in spin_lock.h (#2326 ) (looks like this was a copy-paste mistake)	2025-03-03 11:21:16 -06:00
graham sanderson	c7ff325fb3	Merge branch 'master' into develop to pick up doc fix	2025-02-19 16:33:42 -06:00
graham sanderson	c871e759c6	start 2.1.2-develop	2025-02-18 19:46:23 -06:00
 @ -1 +1 @@
 .2.1
 .1.0