Merge branch 'develop' of https://github.com/raspberrypi/pico-sdk into adafruit-fruit-jam

Author: dhalbert

.bazelignore

@@ -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

.bazelrc

@@ -1 +1 @@
-7.2.1
+8.1.0

.bazelversion

@@ -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>

.github/workflows/choco_packages.config

@@ -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

.github/workflows/cmake.yml

@@ -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,18 +106,25 @@ 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",
 )
 
 # TODO: Provide lwip as a proper Bazel module.
 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",

MODULE.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",
+    ],
+)

REPO.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,27 @@ 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",
+)
+
+# PICO_BAZEL_CONFIG: PICO_COMPILATION_NO_OPT_ARGS, Makes the opt compilation mode a no-op so custom optimization arguments can be injected via the --copt flag instead, type=bool, default=0, group=build
+bool_flag(
+    name = "PICO_COMPILATION_NO_OPT_ARGS",
+    build_setting_default = False,
+)
+
+# PICO_BAZEL_CONFIG: PICO_COMPILATION_NO_DEBUG_ARGS, Makes the debug compilation mode a no-op so custom debug arguments can be injected via the --copt flag instead, type=bool, default=0, group=build
+bool_flag(
+    name = "PICO_COMPILATION_NO_DEBUG_ARGS",
+    build_setting_default = False,
+)
+
+# PICO_BAZEL_CONFIG: PICO_COMPILATION_NO_FASTBUILD_ARGS, Makes the fastbuild compilation mode a no-op so custom fastbuild arguments can be injected via the --copt flag instead, type=bool, default=0, group=build
+bool_flag(
+    name = "PICO_COMPILATION_NO_FASTBUILD_ARGS",
+    build_setting_default = False,
+)

bazel/config/BUILD.bazel

@@ -252,3 +252,24 @@ 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",
+)
+
+config_setting(
+    name = "pico_compilation_no_opt_args_set",
+    flag_values = {"//bazel/config:PICO_COMPILATION_NO_OPT_ARGS": "True"},
+)
+
+config_setting(
+    name = "pico_compilation_no_debug_args_set",
+    flag_values = {"//bazel/config:PICO_COMPILATION_NO_DEBUG_ARGS": "True"},
+)
+
+config_setting(
+    name = "pico_compilation_no_fastbuild_args_set",
+    flag_values = {"//bazel/config:PICO_COMPILATION_NO_FASTBUILD_ARGS": "True"},
+)

bazel/constraint/BUILD.bazel

@@ -89,15 +89,46 @@ cc_args(
 )
 
 cc_args(
-    name = "opt_debug_args",
+    name = "debug_args",
     actions = [
         "@rules_cc//cc/toolchains/actions:compile_actions",
         "@rules_cc//cc/toolchains/actions:link_actions",
     ],
-    args = [
-        "-Og",  # TODO: Make this configurable.
-        "-g3",
+    args = select({
+        "//bazel/constraint:pico_compilation_no_debug_args_set": [],
+        "//conditions:default": [
+            "-Og",
+            "-g3",
+        ],
+    })
+)
+
+cc_args(
+    name = "opt_args",
+    actions = [
+        "@rules_cc//cc/toolchains/actions:compile_actions",
+        "@rules_cc//cc/toolchains/actions:link_actions",
+    ],
+    args = select({
+        "//bazel/constraint:pico_compilation_no_opt_args_set": [],
+        "//conditions:default": [
+            "-O2",
+            "-DNDEBUG",
+        ],
+    })
+)
+
+cc_args(
+    name = "fastbuild_args",
+    actions = [
+        "@rules_cc//cc/toolchains/actions:compile_actions",
+        "@rules_cc//cc/toolchains/actions:link_actions",
     ],
+    args = select({
+        "//bazel/constraint:pico_compilation_no_fastbuild_args_set": [],
+        # The conditions default are kept as nothing here, The bazel docs default are -gmlt -Wl,-S.
+        "//conditions:default": [],
+    })
 )
 
 configurable_toolchain_feature(
@@ -132,18 +163,25 @@ configurable_toolchain_feature(
     linkopts = ["-Wl,-z,max-page-size=4096"],
 )
 
-# TODO: Make this shim unnecessary.
-cc_args_list(
-    name = "all_opt_debug_args",
-    args = [":opt_debug_args"],
-)
 
 cc_feature(
-    name = "override_debug",
-    args = [":all_opt_debug_args"],
+    name = "dbg",
+    args = [":debug_args"],
     overrides = "@rules_cc//cc/toolchains/features:dbg",
 )
 
+cc_feature(
+    name = "opt",
+    args = [":opt_args"],
+    overrides = "@rules_cc//cc/toolchains/features:opt",
+)
+
+cc_feature(
+    name = "fastbuild",
+    args = [":fastbuild_args"],
+    overrides = "@rules_cc//cc/toolchains/features:fastbuild",
+)
+
 HOSTS = (
     ("linux", "x86_64"),
     ("linux", "aarch64"),
@@ -180,7 +218,9 @@ _HOST_CPU_CONSTRAINTS = {
     tags = ["manual"],  # Don't try to build this in wildcard builds.
     known_features = [
         "@rules_cc//cc/toolchains/args:experimental_replace_legacy_action_config_features",
-        "@pico-sdk//bazel/toolchain:override_debug",
+        "@pico-sdk//bazel/toolchain:dbg",
+        "@pico-sdk//bazel/toolchain:opt",
+        "@pico-sdk//bazel/toolchain:fastbuild",
         "@pico-sdk//bazel/toolchain:gc_sections",
         "@pico-sdk//bazel/toolchain:cxx_no_exceptions",
         "@pico-sdk//bazel/toolchain:cxx_no_rtti",
@@ -189,7 +229,6 @@ _HOST_CPU_CONSTRAINTS = {
     ],
     enabled_features = [
         "@rules_cc//cc/toolchains/args:experimental_replace_legacy_action_config_features",
-        "@pico-sdk//bazel/toolchain:override_debug",
     ] + select({
         "//bazel/constraint:pico_no_gc_sections_enabled": [],
         "//conditions:default": [":gc_sections"],
@@ -232,7 +271,9 @@ _HOST_CPU_CONSTRAINTS = {
     tags = ["manual"],  # Don't try to build this in wildcard builds.
     known_features = [
         "@rules_cc//cc/toolchains/args:experimental_replace_legacy_action_config_features",
-        "@pico-sdk//bazel/toolchain:override_debug",
+        "@pico-sdk//bazel/toolchain:dbg",
+        "@pico-sdk//bazel/toolchain:opt",
+        "@pico-sdk//bazel/toolchain:fastbuild",
         "@pico-sdk//bazel/toolchain:gc_sections",
         "@pico-sdk//bazel/toolchain:cxx_no_exceptions",
         "@pico-sdk//bazel/toolchain:cxx_no_rtti",
@@ -241,7 +282,6 @@ _HOST_CPU_CONSTRAINTS = {
     ],
     enabled_features = [
         "@rules_cc//cc/toolchains/args:experimental_replace_legacy_action_config_features",
-        "@pico-sdk//bazel/toolchain:override_debug",
     ] + select({
         "//bazel/constraint:pico_no_gc_sections_enabled": [],
         "//conditions:default": [":gc_sections"],