From 5dfd41e51a86c75d156241b7566ad4c1c1dce2d5 Mon Sep 17 00:00:00 2001 From: Axel Le Bourhis Date: Thu, 5 Dec 2024 15:07:00 +0100 Subject: [PATCH] nxp: combine MONOLITHIC_BT and MONOLITHIC_IEEE802154 Combine BLE and 802.15.4 monolithic build under a single config to make it less error prone. The choice between a BLE/802.15.4 combo firmware and a BLE only firmware is done depending on the Soc (like RW610 vs RW612). Signed-off-by: Axel Le Bourhis --- modules/Kconfig.mcux | 12 ++++++------ samples/bluetooth/central_ht/sample.yaml | 2 +- samples/bluetooth/peripheral_ht/sample.yaml | 2 +- soc/nxp/rw/Kconfig | 2 +- soc/nxp/rw/Kconfig.defconfig | 6 +++--- soc/nxp/rw/firmwares.ld | 4 ++-- tests/bluetooth/tester/testcase.yaml | 2 +- west.yml | 2 +- 8 files changed, 16 insertions(+), 16 deletions(-) diff --git a/modules/Kconfig.mcux b/modules/Kconfig.mcux index 87489810741adf..47cb9743eb81d6 100644 --- a/modules/Kconfig.mcux +++ b/modules/Kconfig.mcux @@ -364,10 +364,10 @@ config HAS_MCUX_XBARA help Set if the XBARA module is present on the SoC. -config HAS_NXP_MONOLITHIC_BT +config HAS_NXP_MONOLITHIC_NBU bool help - Set if the platform supports the monolithic build for BT applications. + Set if the platform supports the monolithic build for BT/15.4 applications. config NXP_FW_LOADER bool "Include firmware loader component" @@ -381,11 +381,11 @@ config NXP_MONOLITHIC_WIFI If enabled, the WiFi firmware used by the device will be linked with the application directly. -config NXP_MONOLITHIC_BT - bool "BT firmware monolithic build" - depends on HAS_NXP_MONOLITHIC_BT +config NXP_MONOLITHIC_NBU + bool "Narrowband Unit (BT/15.4) firmware monolithic build" + depends on HAS_NXP_MONOLITHIC_NBU help - If enabled, the BT firmware used by the device will be linked with the + If enabled, the NBU firmware used by the device will be linked with the application directly. config NXP_RF_IMU diff --git a/samples/bluetooth/central_ht/sample.yaml b/samples/bluetooth/central_ht/sample.yaml index b145c5262230bd..2219cac36739fa 100644 --- a/samples/bluetooth/central_ht/sample.yaml +++ b/samples/bluetooth/central_ht/sample.yaml @@ -19,4 +19,4 @@ tests: - rd_rw612_bga - frdm_rw612 extra_configs: - - CONFIG_NXP_MONOLITHIC_BT=n + - CONFIG_NXP_MONOLITHIC_NBU=n diff --git a/samples/bluetooth/peripheral_ht/sample.yaml b/samples/bluetooth/peripheral_ht/sample.yaml index 1e77988bde1cf3..0c3557d96a6a54 100644 --- a/samples/bluetooth/peripheral_ht/sample.yaml +++ b/samples/bluetooth/peripheral_ht/sample.yaml @@ -31,4 +31,4 @@ tests: - rd_rw612_bga - frdm_rw612 extra_configs: - - CONFIG_NXP_MONOLITHIC_BT=n + - CONFIG_NXP_MONOLITHIC_NBU=n diff --git a/soc/nxp/rw/Kconfig b/soc/nxp/rw/Kconfig index 194fa94bbbd978..cb6d009bbca84f 100644 --- a/soc/nxp/rw/Kconfig +++ b/soc/nxp/rw/Kconfig @@ -17,7 +17,7 @@ config SOC_SERIES_RW6XX select HAS_MCUX_FLEXCOMM select HAS_MCUX_CACHE select HAS_PM - select HAS_NXP_MONOLITHIC_BT + select HAS_NXP_MONOLITHIC_NBU select SOC_EARLY_INIT_HOOK if SOC_SERIES_RW6XX diff --git a/soc/nxp/rw/Kconfig.defconfig b/soc/nxp/rw/Kconfig.defconfig index ed5d5d4c0577ba..5ce76e44f5adca 100644 --- a/soc/nxp/rw/Kconfig.defconfig +++ b/soc/nxp/rw/Kconfig.defconfig @@ -14,10 +14,10 @@ config SYS_CLOCK_HW_CYCLES_PER_SEC default 1000000 if MCUX_OS_TIMER default 260000000 if CORTEX_M_SYSTICK -if BT +config NXP_MONOLITHIC_NBU + default y if (BT || IEEE802154) -config NXP_MONOLITHIC_BT - default y +if BT config HCI_NXP_ENABLE_AUTO_SLEEP default y diff --git a/soc/nxp/rw/firmwares.ld b/soc/nxp/rw/firmwares.ld index 98953c71435304..fdb9fcf9d86dc5 100644 --- a/soc/nxp/rw/firmwares.ld +++ b/soc/nxp/rw/firmwares.ld @@ -15,7 +15,7 @@ KEEP(*(.fw_cpu1)) . += 4; #endif -#if defined(CONFIG_NXP_MONOLITHIC_BT) +#if defined(CONFIG_NXP_MONOLITHIC_NBU) . = ALIGN(4); -KEEP(*(.fw_cpu2_ble)) +KEEP(*(.fw_cpu2)) #endif diff --git a/tests/bluetooth/tester/testcase.yaml b/tests/bluetooth/tester/testcase.yaml index 45bf841facc6e3..7a389a122f5e0f 100644 --- a/tests/bluetooth/tester/testcase.yaml +++ b/tests/bluetooth/tester/testcase.yaml @@ -15,7 +15,7 @@ tests: - rd_rw612_bga - frdm_rw612 extra_configs: - - CONFIG_NXP_MONOLITHIC_BT=n + - CONFIG_NXP_MONOLITHIC_NBU=n bluetooth.general.tester_le_audio: build_only: true platform_allow: diff --git a/west.yml b/west.yml index 478daa6931b9c3..00570dd7924cec 100644 --- a/west.yml +++ b/west.yml @@ -199,7 +199,7 @@ manifest: groups: - hal - name: hal_nxp - revision: 97855e494cad74d567c1937b22e0930584ab7025 + revision: c9f73c70d921b3fdea0c646bd76a2a4f5a23e7f0 path: modules/hal/nxp groups: - hal