From 6e7f86ce865eb0fe7050766539bc9f6891c0c3a2 Mon Sep 17 00:00:00 2001 From: Declan Snyder Date: Mon, 12 Aug 2024 15:14:57 -0500 Subject: [PATCH] soc: nxp: Move connectivity defaults to common Move default of monolithic and fw loader, options, etc to the common kconfig files rather than defaulting in soc file. Signed-off-by: Declan Snyder --- drivers/bluetooth/hci/Kconfig.nxp | 19 +++++++++++++++++++ soc/nxp/rw/Kconfig.defconfig | 18 ++---------------- 2 files changed, 21 insertions(+), 16 deletions(-) diff --git a/drivers/bluetooth/hci/Kconfig.nxp b/drivers/bluetooth/hci/Kconfig.nxp index 65bbc3067e7..5ba557efbc2 100644 --- a/drivers/bluetooth/hci/Kconfig.nxp +++ b/drivers/bluetooth/hci/Kconfig.nxp @@ -23,6 +23,25 @@ config HCI_NXP_SET_CAL_DATA_ANNEX100 If enabled, the Host will send calibration data annex 100 to the BLE Controller during HCI init. +if BT_NXP + +config BT_DIS_MANUF + default "NXP" + +config BT_HCI_ACL_FLOW_CONTROL + default n + +config BT_BUF_EVT_DISCARDABLE_SIZE + default 84 + +config HEAP_MEM_POOL_SIZE + default 256 + +config FLASH + default y + +endif # BT_NXP + if BT_H4_NXP_CTLR config BT_NXP_NW612 diff --git a/soc/nxp/rw/Kconfig.defconfig b/soc/nxp/rw/Kconfig.defconfig index 5354f455914..3d9f891734a 100644 --- a/soc/nxp/rw/Kconfig.defconfig +++ b/soc/nxp/rw/Kconfig.defconfig @@ -9,6 +9,7 @@ config ROM_START_OFFSET config NUM_IRQS default 129 + if MCUX_OS_TIMER config SYS_CLOCK_HW_CYCLES_PER_SEC @@ -25,35 +26,20 @@ endif # CORTEX_M_SYSTICK if BT -config FLASH +config NXP_MONOLITHIC_BT default y -config BT_DIS_MANUF - default "NXP" - -config BT_BUF_EVT_DISCARDABLE_SIZE - default 84 - -config BT_HCI_ACL_FLOW_CONTROL - default n - config HCI_NXP_ENABLE_AUTO_SLEEP default y config HCI_NXP_SET_CAL_DATA default y -config HEAP_MEM_POOL_SIZE - default 256 - endif # BT config NXP_MONOLITHIC_WIFI default y if WIFI -config NXP_MONOLITHIC_BT - default y if BT - config NXP_FW_LOADER default y if (BT || WIFI)