Initial Pico 2 W Bazel support

Improves compatibility with Pico W and Pico 2 W by fixing issues that
prevented correct linking of wireless libraries.

Author: armandomontanez

bazel/config/BUILD.bazel

@@ -245,13 +245,31 @@ string_flag(
 # PICO_BAZEL_CONFIG: PICO_BTSTACK_CONFIG, [Bazel only] The cc_library that provides btstack_config.h, default=//bazel:empty_cc_lib, group=wireless
 label_flag(
     name = "PICO_BTSTACK_CONFIG",
-    build_setting_default = "//bazel:empty_cc_lib",
+    build_setting_default = "//bazel:incompatible_cc_lib",
+)
+
+# PICO_BAZEL_CONFIG: PICO_BT_ENABLE_BLE, [Bazel only] Whether or not to link in BLE portions of the btstack as part of //src/rp2_common/pico_btstack. Also defines ENABLE_BLE=1, type=bool, default=False, group=wireless
+bool_flag(
+    name = "PICO_BT_ENABLE_BLE",
+    build_setting_default = False,
+)
+
+# PICO_BAZEL_CONFIG: PICO_BT_ENABLE_CLASSIC, [Bazel only] Whether or not to link in classic BT portions of the btstack as part of //src/rp2_common/pico_btstack. Also defines ENABLE_CLASSIC=1, type=bool, default=False, group=wireless
+bool_flag(
+    name = "PICO_BT_ENABLE_CLASSIC",
+    build_setting_default = False,
+)
+
+# PICO_BAZEL_CONFIG: PICO_BT_ENABLE_MESH, [Bazel only] Whether or not to link in mesh BT portions of the btstack as part of //src/rp2_common/pico_btstack. Also defines ENABLE_MESH=1, type=bool, default=False, group=wireless
+bool_flag(
+    name = "PICO_BT_ENABLE_MESH",
+    build_setting_default = False,
 )
 
 # PICO_BAZEL_CONFIG: PICO_LWIP_CONFIG, [Bazel only] The cc_library that provides lwipopts.h, default=//bazel:empty_cc_lib, group=wireless
 label_flag(
     name = "PICO_LWIP_CONFIG",
-    build_setting_default = "//bazel:empty_cc_lib",
+    build_setting_default = "//bazel:incompatible_cc_lib",
 )
 
 # PICO_BAZEL_CONFIG: PICO_FREERTOS_LIB, [Bazel only] The cc_library that provides FreeRTOS, default=//bazel:empty_cc_lib, group=wireless

bazel/constraint/BUILD.bazel

@@ -48,6 +48,11 @@ config_setting(
     flag_values = {"//bazel/config:PICO_BOARD": "pico_w"},
 )
 
+config_setting(
+    name = "is_pico2_w",
+    flag_values = {"//bazel/config:PICO_BOARD": "pico2_w"},
+)
+
 config_setting(
     name = "pico_toolchain_clang_enabled",
     flag_values = {"//bazel/config:PICO_TOOLCHAIN": "clang"},
@@ -199,13 +204,18 @@ config_setting(
 )
 
 config_setting(
-    name = "pico_btstack_config_unset",
-    flag_values = {"//bazel/config:PICO_BTSTACK_CONFIG": "//bazel:empty_cc_lib"},
+    name = "pico_bt_enable_ble_enabled",
+    flag_values = {"//bazel/config:PICO_BT_ENABLE_BLE": "True"},
+)
+
+config_setting(
+    name = "pico_bt_enable_classic_enabled",
+    flag_values = {"//bazel/config:PICO_BT_ENABLE_CLASSIC": "True"},
 )
 
 config_setting(
-    name = "pico_lwip_config_unset",
-    flag_values = {"//bazel/config:PICO_LWIP_CONFIG": "//bazel:empty_cc_lib"},
+    name = "pico_bt_enable_mesh_enabled",
+    flag_values = {"//bazel/config:PICO_BT_ENABLE_MESH": "True"},
 )
 
 config_setting(

bazel/defs.bzl

@@ -88,6 +88,7 @@ def compatible_with_pico_w():
     return select({
         "@pico-sdk//bazel/constraint:cyw43_wireless": [],
         "@pico-sdk//bazel/constraint:is_pico_w": [],
+        "@pico-sdk//bazel/constraint:is_pico2_w": [],
         "//conditions:default": ["@platforms//:incompatible"],
     })
 

bazel/util/transition.bzl

@@ -1,3 +1,9 @@
+def _normalize_flag_value(val):
+    """Converts flag values to transition-safe primitives."""
+    if type(val) == "label":
+        return str(val)
+    return val
+
 def declare_transtion(attrs, flag_overrides = None, append_to_flags = None, executable = True):
     """A helper that drastically simplifies declaration of a transition.
 
@@ -31,7 +37,7 @@ def declare_transtion(attrs, flag_overrides = None, append_to_flags = None, exec
         final_overrides = {}
         if flag_overrides != None:
             final_overrides = {
-                key: str(getattr(attrs, value))
+                key: _normalize_flag_value(getattr(attrs, value))
                 for key, value in flag_overrides.items()
             }
         if append_to_flags != None:
@@ -108,6 +114,8 @@ kitchen_sink_test_binary = declare_transtion(
     attrs = {
         "bt_stack_config": attr.label(mandatory = True),
         "lwip_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
         # a transition is in use.
         "_allowlist_function_transition": attr.label(
@@ -117,6 +125,8 @@ kitchen_sink_test_binary = declare_transtion(
     flag_overrides = {
         "@pico-sdk//bazel/config:PICO_BTSTACK_CONFIG": "bt_stack_config",
         "@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",
     },
 )
 

src/rp2_common/pico_btstack/BUILD.bazel

@@ -2,6 +2,27 @@ load("//bazel:defs.bzl", "compatible_with_pico_w", "incompatible_with_config")
 
 package(default_visibility = ["//visibility:public"])
 
+# Prefer using this target to link in all the enabled bt modules, as it will
+# link the appropriate libraries and set the appropraite defines based on the
+# following flags:
+#
+#   --@pico-sdk//bazel/constraint:PICO_BT_ENABLE_BLE
+#   --@pico-sdk//bazel/constraint:PICO_BT_ENABLE_CLASSIC
+#   --@pico-sdk//bazel/constraint:PICO_BT_ENABLE_MESH
+cc_library(
+    name = "pico_btstack",
+    deps = ["pico_btstack_base"] + select({
+        "//bazel/constraint:pico_bt_enable_ble_enabled": [":pico_btstack_ble"],
+        "//conditions:default": [],
+    }) + select({
+        "//bazel/constraint:pico_bt_enable_classic_enabled": [":pico_btstack_classic"],
+        "//conditions:default": [],
+    }) + select({
+        "//bazel/constraint:pico_bt_enable_mesh_enabled": [":pico_btstack_mesh"],
+        "//conditions:default": [],
+    }),
+)
+
 # Prefer these aliases to directly referencing @btstack, as it's possible that
 # name may change.
 alias(
@@ -19,6 +40,11 @@ alias(
     actual = "@btstack//:pico_btstack_classic",
 )
 
+alias(
+    name = "pico_btstack_mesh",
+    actual = "@btstack//:pico_btstack_classic",
+)
+
 alias(
     name = "pico_btstack_sbc_encoder",
     actual = "@btstack//:pico_btstack_classic",
@@ -63,10 +89,9 @@ cc_library(
 cc_library(
     name = "pico_btstack_stdin",
     srcs = ["btstack_stdin_pico.c"],
-    target_compatible_with = incompatible_with_config(
-        "//bazel/constraint:pico_btstack_config_unset",
-    ) + compatible_with_pico_w(),
+    target_compatible_with = compatible_with_pico_w(),
     deps = [
+        "//bazel/config:PICO_BTSTACK_CONFIG",
         "//src/rp2_common:pico_platform",
         "//src/rp2_common/pico_stdio",
     ],