bluetooth-fw: select controller via Kconfig and use wscript_build

jplexer · claude · jplexer · commit 9ac0d91b5f7e · 2026-06-02T16:05:09.000+02:00
Move the Bluetooth controller selection out of the root wscript and the
--bt_controller option into a Kconfig choice (BT_FW_NIMBLE / BT_FW_QEMU /
BT_FW_STUB), defaulted from the SoC. The nimble options/defines
(BT_REQUIRE_EARLY_BONDINGS and the GH3X2X tuning service) also move into
Kconfig.

With controller selection and those defines now expressed in Kconfig, the
bluetooth-fw wscripts no longer need options/configure, so convert the
parent and the qemu/stub/nimble controllers to bare-body wscript_build.

The --bt_controller override is replaced by
--kconfig-override CONFIG_BT_FW_&lt;X&gt;=y. The unused BT_CONTROLLER_NRF52 and
BT_CONTROLLER_QEMU defines are dropped, and BT_CONTROLLER_SF32LB52 becomes
CONFIG_SOC_SF32LB52.

Co-Authored-By: Claude Opus 4.8 (1M context) &lt;noreply@anthropic.com&gt;
Signed-off-by: Joshua Jun &lt;lets@throw.rocks&gt;
diff --git a/src/Kconfig b/src/Kconfig
@@ -2,3 +2,4 @@
 # SPDX-License-Identifier: Apache-2.0
 
 rsource "fw/Kconfig"
+rsource "bluetooth-fw/Kconfig"
diff --git a/src/bluetooth-fw/Kconfig b/src/bluetooth-fw/Kconfig
@@ -0,0 +1,32 @@
+# SPDX-FileCopyrightText: 2026 Core Devices LLC
+# SPDX-License-Identifier: Apache-2.0
+
+menu "Bluetooth"
+
+choice BT_FW
+    prompt "Bluetooth backend"
+    default BT_FW_STUB
+    help
+      Which Bluetooth backend implementation to build. The default is
+      derived from the SoC (see each src/fw/soc/<soc>/Kconfig.defconfig);
+      the stub is the fallback when no SoC default applies.
+
+config BT_FW_NIMBLE
+    bool "NimBLE"
+
+config BT_FW_QEMU
+    bool "QEMU transport"
+
+config BT_FW_STUB
+    bool "Stub (no backend)"
+
+endchoice
+
+config GH3X2X_TUNING_SERVICE_ENABLED
+    bool "GH3X2X tuning service"
+    depends on HRM_GH3X2X
+    help
+      Build the GH3X2X heart-rate sensor tuning GATT service, used to
+      tune the sensor over BLE. Off by default.
+
+endmenu
diff --git a/src/bluetooth-fw/nimble/init.c b/src/bluetooth-fw/nimble/init.c
@@ -27,7 +27,7 @@ static const uint32_t s_bt_stack_start_stop_timeout_ms = 10000;
 
 extern void pebble_pairing_service_init(void);
 extern void nimble_discover_init(void);
-#ifdef BT_CONTROLLER_SF32LB52
+#ifdef CONFIG_SOC_SF32LB52
 extern void ble_transport_ll_wake_lcpu(void);
 #endif
 
@@ -59,7 +59,7 @@ static void prv_sync_cb(void) {
 
 static void prv_reset_cb(int reason) {
   PBL_LOG_D_WRN(LOG_DOMAIN_BT, "NimBLE host reset (reason: 0x%04x)", (uint16_t)reason);
-#ifdef BT_CONTROLLER_SF32LB52
+#ifdef CONFIG_SOC_SF32LB52
   // Controller stopped answering HCI. Keep the LCPU reachable and crash so the
   // coredump captures LCPU RAM; the reboot cold-recovers the controller.
   ble_transport_ll_wake_lcpu();
@@ -148,14 +148,14 @@ bool bt_driver_start(BTDriverConfig *config) {
   pebble_pairing_service_init();
   ble_svc_bas_init();
 
-#ifdef GH3X2X_TUNING_SERVICE_ENABLED
+#ifdef CONFIG_GH3X2X_TUNING_SERVICE_ENABLED
   gh3x2x_tuning_service_init();
 #endif
 
   ble_hs_sched_start();
   f_rc = xSemaphoreTake(s_host_started, milliseconds_to_ticks(s_bt_stack_start_stop_timeout_ms));
   if (f_rc != pdTRUE) {
-#ifdef BT_CONTROLLER_SF32LB52
+#ifdef CONFIG_SOC_SF32LB52
     // Keep the LCPU reachable so the coredump captures its RAM.
     ble_transport_ll_wake_lcpu();
 #endif
diff --git a/src/bluetooth-fw/nimble/wscript b/src/bluetooth-fw/nimble/wscript
diff --git a/src/bluetooth-fw/nimble/wscript_build b/src/bluetooth-fw/nimble/wscript_build
@@ -0,0 +1,18 @@
+excludes = []
+if not bld.env.CONFIG_GH3X2X_TUNING_SERVICE_ENABLED:
+    excludes.extend(['gh3x2x_tuning_service.c'])
+
+driver_source = bld.path.ant_glob(['*.c'], excl=excludes)
+
+bld.objects(
+    source=driver_source,
+    target='bt_driver',
+    use=[
+      'nimble',
+      'freertos',
+      'fw_includes',
+      'pbl_includes',
+    ],
+)
+
+# vim:filetype=python
diff --git a/src/bluetooth-fw/qemu/wscript b/src/bluetooth-fw/qemu/wscript
diff --git a/src/bluetooth-fw/qemu/wscript_build b/src/bluetooth-fw/qemu/wscript_build
@@ -0,0 +1,13 @@
+from resources.types.resource_definition import ResourceDefinition
+from resources.types.resource_object import ResourceObject
+
+sources = bld.path.ant_glob('**/*.c')
+bld.stlib(source=sources,
+          target='bt_driver',
+          use=[
+            'fw_includes',
+            'freertos',
+            'pbl_includes',
+          ])
+
+# vim:filetype=python
diff --git a/src/bluetooth-fw/stub/wscript b/src/bluetooth-fw/stub/wscript
diff --git a/src/bluetooth-fw/stub/wscript_build b/src/bluetooth-fw/stub/wscript_build
@@ -0,0 +1,13 @@
+from resources.types.resource_definition import ResourceDefinition
+from resources.types.resource_object import ResourceObject
+
+sources = bld.path.ant_glob('**/*.c')
+bld.stlib(source=sources,
+          target='bt_driver',
+          use=[
+            'fw_includes',
+            'freertos',
+            'pbl_includes',
+          ])
+
+# vim:filetype=python
diff --git a/src/bluetooth-fw/wscript b/src/bluetooth-fw/wscript
diff --git a/src/bluetooth-fw/wscript_build b/src/bluetooth-fw/wscript_build
@@ -0,0 +1,10 @@
+if bld.env.CONFIG_BT_FW_NIMBLE:
+    controller = 'nimble'
+elif bld.env.CONFIG_BT_FW_STUB:
+    controller = 'stub'
+else:
+    controller = 'qemu'
+
+bld.recurse(controller)
+
+# vim:filetype=python
diff --git a/src/fw/drivers/hrm/gh3x2x.c b/src/fw/drivers/hrm/gh3x2x.c
@@ -169,7 +169,7 @@ void gh3x2x_wear_evt_notify(bool is_wear) {
   HRM->state->is_wear = is_wear;
 }
 
-#ifdef GH3X2X_TUNING_SERVICE_ENABLED
+#ifdef CONFIG_GH3X2X_TUNING_SERVICE_ENABLED
 void gh3x2x_timer_init(uint32_t period_ms) {
   if (HRM) {
     HRM->state->timer_period_ms = period_ms;
diff --git a/src/fw/services/bluetooth/bluetooth_ctl.c b/src/fw/services/bluetooth/bluetooth_ctl.c
@@ -72,18 +72,16 @@ static void prv_comm_start(void) {
   PBL_LOG_INFO("BLE HRM sharing prefs: is_enabled=%u",
           config->is_hrm_supported_and_enabled);
 #endif
-#ifdef BT_REQUIRE_EARLY_BONDINGS
+  // Register existing bondings before bringing the connection up: NimBLE
+  // restores them before the link is established. The other backends use
+  // no-op bonding handlers, so doing it early is harmless for them too.
   bt_persistent_storage_register_existing_ble_bondings();
-#endif
 
   s_comm_is_running = bt_driver_start(config);
   kernel_free(config);
 
   if (s_comm_is_running) {
     bt_local_addr_init();
-#ifndef BT_REQUIRE_EARLY_BONDINGS
-    bt_persistent_storage_register_existing_ble_bondings();
-#endif
     gap_le_init();
     bt_local_id_configure_driver();
 #if defined(CONFIG_HRM) && !defined(RECOVERY_FW)
diff --git a/src/fw/soc/nrf/Kconfig.defconfig b/src/fw/soc/nrf/Kconfig.defconfig
@@ -0,0 +1,10 @@
+# SPDX-FileCopyrightText: 2026 Core Devices LLC
+# SPDX-License-Identifier: Apache-2.0
+
+if SOC_NRF52
+
+choice BT_FW
+    default BT_FW_NIMBLE
+endchoice
+
+endif # SOC_NRF52
diff --git a/src/fw/soc/qemu/Kconfig.defconfig b/src/fw/soc/qemu/Kconfig.defconfig
@@ -0,0 +1,10 @@
+# SPDX-FileCopyrightText: 2026 Core Devices LLC
+# SPDX-License-Identifier: Apache-2.0
+
+if SOC_QEMU
+
+choice BT_FW
+    default BT_FW_QEMU
+endchoice
+
+endif # SOC_QEMU
diff --git a/src/fw/soc/sf32lb/Kconfig.defconfig b/src/fw/soc/sf32lb/Kconfig.defconfig
@@ -6,4 +6,8 @@ if SOC_SF32LB52
 config MMAP_RESOURCES
     default y
 
+choice BT_FW
+    default BT_FW_NIMBLE
+endchoice
+
 endif # SOC_SF32LB52
diff --git a/third_party/nimble/wscript_build b/third_party/nimble/wscript_build
@@ -56,7 +56,7 @@ nimble_use =[
     'freertos',
 ]
 
-if bld.env.bt_controller == 'nrf52':
+if bld.env.CONFIG_SOC_NRF52:
     nimble_sources += bld.path.ant_glob([
         'mynewt-nimble/nimble/controller/src/*.c',
         'mynewt-nimble/nimble/drivers/nrf5x/src/*.c',
@@ -82,7 +82,7 @@ if bld.env.bt_controller == 'nrf52':
 
     nimble_use.append('hal_nordic')
 
-elif bld.env.bt_controller == 'sf32lb52':
+elif bld.env.CONFIG_SOC_SF32LB52:
     nimble_sources += [
         'transport/hci_sf32lb52.c',
         '../nonfree/pebbleos-nonfree/sf32lb52/lcpu_52x.c',
diff --git a/third_party/wscript_build b/third_party/wscript_build
@@ -14,7 +14,7 @@ if bld.env.CONFIG_HAL_NORDIC:
 if bld.env.CONFIG_HAL_SIFLI:
     bld.recurse('hal_sifli')
 
-if bld.env.bt_controller in ('nrf52', 'sf32lb52'):
+if bld.env.CONFIG_BT_FW_NIMBLE:
     bld.recurse('nimble')
 
 if bld.env.CONFIG_BOARD_FAMILY_ASTERIX:
diff --git a/wscript b/wscript
@@ -94,7 +94,6 @@ def options(opt):
     opt.load('show_configure', tooldir='waftools')
     opt.load('kconfig', tooldir='waftools')
     opt.recurse('tests')
-    opt.recurse('src/bluetooth-fw')
     opt.recurse('src/fw')
     opt.recurse('src/idl')
     opt.recurse('sdk')
@@ -304,8 +303,6 @@ def configure(conf):
     else:
         conf.env.JS_ENGINE = 'none'
 
-    bt_board = None
-
     if not conf.options.runner:
         conf.env.RUNNER = RUNNERS.get(conf.options.board, [None])[0]
     else:
@@ -381,24 +378,6 @@ def configure(conf):
 
     handle_configure_options(conf)
 
-
-    if bt_board is None:
-        bt_board = conf.env.BOARD
-    # Select BT controller based on configuration:
-    if conf.env.CONFIG_QEMU:
-        conf.env.bt_controller = 'qemu'
-        conf.env.append_value('DEFINES', ['BT_CONTROLLER_QEMU'])
-    elif conf.env.CONFIG_BOARD_FAMILY_ASTERIX:
-        conf.env.bt_controller = 'nrf52'
-        conf.env.append_value('DEFINES', ['BT_CONTROLLER_NRF52'])
-    elif conf.env.CONFIG_BOARD_FAMILY_OBELIX or conf.env.CONFIG_BOARD_FAMILY_GETAFIX:
-        conf.env.bt_controller = 'sf32lb52'
-        conf.env.append_value('DEFINES', ['BT_CONTROLLER_SF32LB52'])
-    else:
-        conf.env.bt_controller = 'stub'
-
-    conf.recurse('src/bluetooth-fw')
-
     Logs.pprint('CYAN', 'Configuring arm_firmware environment')
     conf.setenv('', base_env)
     conf.load('pebble_arm_gcc', tooldir='waftools')

Original file line number	Diff line number	Diff line change
`@@ -2,3 +2,4 @@`
`2`	`2`	`# SPDX-License-Identifier: Apache-2.0`
`3`	`3`
`4`	`4`	`rsource "fw/Kconfig"`
	`5`	`+rsource "bluetooth-fw/Kconfig"`