From 1cbd663c72ae3219c24b7d120b8ebc663499ef54 Mon Sep 17 00:00:00 2001 From: Gang Li Date: Wed, 11 Dec 2024 03:56:52 +0100 Subject: [PATCH] soc: rw6xx: Enable NXP_MONOLITHIC_IEEE802154 Enable monolithic build for IEEE802154 Signed-off-by: Gang Li --- modules/Kconfig.mcux | 6 ++++++ soc/nxp/rw/Kconfig.defconfig | 7 +++++-- soc/nxp/rw/firmwares.ld | 5 ++++- 3 files changed, 15 insertions(+), 3 deletions(-) diff --git a/modules/Kconfig.mcux b/modules/Kconfig.mcux index 87489810741adf..0e6424347d34d7 100644 --- a/modules/Kconfig.mcux +++ b/modules/Kconfig.mcux @@ -388,6 +388,12 @@ config NXP_MONOLITHIC_BT If enabled, the BT firmware used by the device will be linked with the application directly. +config NXP_MONOLITHIC_IEEE802154 + bool "IEEE802154 firmware monolithic build" + help + If enabled, the IEEE802154 firmware used by the device will be linked + with the application directly. + config NXP_RF_IMU bool "Include RF_IMU adapter for intercore messaging" select EVENTS diff --git a/soc/nxp/rw/Kconfig.defconfig b/soc/nxp/rw/Kconfig.defconfig index ed5d5d4c0577ba..f42bd7b97cf5f3 100644 --- a/soc/nxp/rw/Kconfig.defconfig +++ b/soc/nxp/rw/Kconfig.defconfig @@ -33,10 +33,13 @@ endif # BT config NXP_MONOLITHIC_WIFI default y if WIFI +config NXP_MONOLITHIC_IEEE802154 + default y if IEEE802154 + config NXP_FW_LOADER - default y if (BT || WIFI) + default y if (BT || WIFI || IEEE802154) config NXP_RF_IMU - default y if (BT || WIFI) + default y if (BT || WIFI || IEEE802154) endif # SOC_SERIES_RW6XX diff --git a/soc/nxp/rw/firmwares.ld b/soc/nxp/rw/firmwares.ld index 98953c71435304..b4673cae384e4b 100644 --- a/soc/nxp/rw/firmwares.ld +++ b/soc/nxp/rw/firmwares.ld @@ -15,7 +15,10 @@ KEEP(*(.fw_cpu1)) . += 4; #endif -#if defined(CONFIG_NXP_MONOLITHIC_BT) +#if defined(CONFIG_NXP_MONOLITHIC_IEEE802154) +. = ALIGN(4); +KEEP(*(.fw_cpu2_combo)) +#elif defined(CONFIG_NXP_MONOLITHIC_BT) . = ALIGN(4); KEEP(*(.fw_cpu2_ble)) #endif