soc: nxp: mcxw: Isolate MCXW7xx-specific config from MCXW2xx
Both MCXW2xx and MCXW7xx now share the same SoC family
(CONFIG_SOC_FAMILY_MCXW).
Isolate mcxw7xx-specific module/code from mcxw2xx.
Signed-off-by: Yassine El Aissaoui <yassine.elaissaoui@nxp.com>
diff --git a/modules/hal_nxp/mcux/mcux-sdk-ng/components/components.cmake b/modules/hal_nxp/mcux/mcux-sdk-ng/components/components.cmake
index 94cb217e..1940ba9 100644
--- a/modules/hal_nxp/mcux/mcux-sdk-ng/components/components.cmake
+++ b/modules/hal_nxp/mcux/mcux-sdk-ng/components/components.cmake
@@ -30,14 +30,14 @@
set(CONFIG_MCUX_COMPONENT_driver.gdma ON)
set(CONFIG_MCUX_COMPONENT_component.wireless_imu_adapter ON)
set(CONFIG_MCUX_PRJSEG_component.osa_interface.osa_macro_used ON)
- elseif(CONFIG_SOC_FAMILY_MCXW)
+ elseif(CONFIG_SOC_SERIES_MCXW7XX)
set(CONFIG_MCUX_COMPONENT_component.lists ON)
set(CONFIG_MCUX_COMPONENT_component.rpmsg_adapter ON)
zephyr_compile_definitions(HAL_RPMSG_SELECT_ROLE=0U)
endif()
endif()
-if(CONFIG_SOC_FAMILY_MCXW AND CONFIG_IEEE802154)
+if(CONFIG_SOC_SERIES_MCXW7XX AND CONFIG_IEEE802154)
set(CONFIG_MCUX_COMPONENT_driver.spc ON)
set(CONFIG_MCUX_COMPONENT_component.lists ON)
set(CONFIG_USE_component_osa_zephyr ON)
@@ -51,7 +51,7 @@
endif()
# Component definitions
-if(CONFIG_NXP_RF_IMU AND CONFIG_SOC_FAMILY_MCXW)
+if(CONFIG_NXP_RF_IMU AND CONFIG_SOC_SERIES_MCXW7XX)
zephyr_compile_definitions(HAL_RPMSG_SELECT_ROLE=0U)
endif()
diff --git a/modules/hal_nxp/mcux/mcux-sdk-ng/drivers/drivers.cmake b/modules/hal_nxp/mcux/mcux-sdk-ng/drivers/drivers.cmake
index 455c982..e1ecc7c 100644
--- a/modules/hal_nxp/mcux/mcux-sdk-ng/drivers/drivers.cmake
+++ b/modules/hal_nxp/mcux/mcux-sdk-ng/drivers/drivers.cmake
@@ -185,7 +185,7 @@
set(CONFIG_MCUX_COMPONENT_driver.mcx_spc ON)
endif()
-if(CONFIG_BT_NXP AND CONFIG_SOC_FAMILY_MCXW OR CONFIG_IEEE802154_MCXW)
+if(CONFIG_BT_NXP AND CONFIG_SOC_SERIES_MCXW7XX OR CONFIG_IEEE802154_MCXW)
set(CONFIG_MCUX_COMPONENT_driver.spc ON)
endif()
diff --git a/soc/nxp/mcx/mcxw/Kconfig.defconfig b/soc/nxp/mcx/mcxw/Kconfig.defconfig
index 903fdf4..43bbb47 100644
--- a/soc/nxp/mcx/mcxw/Kconfig.defconfig
+++ b/soc/nxp/mcx/mcxw/Kconfig.defconfig
@@ -8,52 +8,4 @@
config CORTEX_M_SYSTICK
default n if MCUX_LPTMR_TIMER
-if BT
-
-config MAIN_STACK_SIZE
- default 2560
-
-config BT_LONG_WQ_STACK_SIZE
- default 2560
-
-config SYSTEM_WORKQUEUE_STACK_SIZE
- default 2048
-
-config BT_BUF_EVT_RX_COUNT
- default 16
-
-config BT_BUF_ACL_TX_COUNT
- default 12 if SOC_MCXW727C
- default 8 if SOC_MCXW716C
-
-if SHELL
-
-config SHELL_STACK_SIZE
- default 4096
-
-endif # SHELL
-
-# Include intercore messaging component
-config NXP_RF_IMU
- default y
-
-# Set the controller's public identity using NXP vendor command
-config BT_HCI_SET_PUBLIC_ADDR
- default y
-
-# HCI RX buffers are received in ISR context. RX messages
-# need to be queued and processed by a dedicated thread
-config HCI_NXP_RX_THREAD
- default y
-
-endif # BT
-
-if IEEE802154
-
-# Include intercore messaging component
-config NXP_RF_IMU
- default y
-
-endif # IEEE802154
-
endif # SOC_FAMILY_MCXW
diff --git a/soc/nxp/mcx/mcxw/mcxw7xx/Kconfig.defconfig b/soc/nxp/mcx/mcxw/mcxw7xx/Kconfig.defconfig
index 83c4905..3e1c266 100644
--- a/soc/nxp/mcx/mcxw/mcxw7xx/Kconfig.defconfig
+++ b/soc/nxp/mcx/mcxw/mcxw7xx/Kconfig.defconfig
@@ -14,4 +14,52 @@
config MCUX_FLASH_K4_API
default y
+if BT
+
+config MAIN_STACK_SIZE
+ default 2560
+
+config BT_LONG_WQ_STACK_SIZE
+ default 2560
+
+config SYSTEM_WORKQUEUE_STACK_SIZE
+ default 2048
+
+config BT_BUF_EVT_RX_COUNT
+ default 16
+
+config BT_BUF_ACL_TX_COUNT
+ default 12 if SOC_MCXW727C
+ default 8 if SOC_MCXW716C
+
+if SHELL
+
+config SHELL_STACK_SIZE
+ default 4096
+
+endif # SHELL
+
+# Include intercore messaging component
+config NXP_RF_IMU
+ default y
+
+# Set the controller's public identity using NXP vendor command
+config BT_HCI_SET_PUBLIC_ADDR
+ default y
+
+# HCI RX buffers are received in ISR context. RX messages
+# need to be queued and processed by a dedicated thread
+config HCI_NXP_RX_THREAD
+ default y
+
+endif # BT
+
+if IEEE802154
+
+# Include intercore messaging component
+config NXP_RF_IMU
+ default y
+
+endif # IEEE802154
+
endif
