From d41acf49b6b3e991caa57e08f03ea51dc0d66670 Mon Sep 17 00:00:00 2001 From: Marek Pieta Date: Tue, 18 Feb 2025 14:04:16 +0100 Subject: [PATCH] applications: nrf_desktop: Fix Kconfig warning for SW Split LL The CONFIG_BT_CTLR_OPTIMIZE_FOR_SIZE option cannot be used together with LTO. Remove assignment from configuration to prevent Kconfig build warnings. Jira: NCSDK-31777 Signed-off-by: Marek Pieta --- .../configuration/nrf52810dmouse_nrf52810/prj.conf | 4 ---- .../configuration/nrf52810dmouse_nrf52810/prj_release.conf | 4 ---- .../configuration/nrf52820dongle_nrf52820/prj.conf | 4 ---- .../configuration/nrf52820dongle_nrf52820/prj_release.conf | 4 ---- .../nrf_desktop/configuration/nrf52833dk_nrf52820/prj.conf | 4 ---- .../configuration/nrf52833dk_nrf52820/prj_release.conf | 4 ---- .../configuration/nrf52833dk_nrf52833/prj_dongle_small.conf | 4 ---- 7 files changed, 28 deletions(-) diff --git a/applications/nrf_desktop/configuration/nrf52810dmouse_nrf52810/prj.conf b/applications/nrf_desktop/configuration/nrf52810dmouse_nrf52810/prj.conf index e7bbdeb19cbc..5c296e7c39e0 100644 --- a/applications/nrf_desktop/configuration/nrf52810dmouse_nrf52810/prj.conf +++ b/applications/nrf_desktop/configuration/nrf52810dmouse_nrf52810/prj.conf @@ -103,10 +103,6 @@ CONFIG_BT_MAX_PAIRED=2 CONFIG_BT_ID_MAX=3 CONFIG_BT_LL_SW_SPLIT=y -# Optimize Bluetooth controller for size to reduce memory consumption -CONFIG_BT_CTLR_ADVANCED_FEATURES=y -CONFIG_BT_CTLR_OPTIMIZE_FOR_SIZE=y - CONFIG_BT_ATT_TX_COUNT=4 CONFIG_BT_CONN_TX_MAX=4 # Reduce memory footprint diff --git a/applications/nrf_desktop/configuration/nrf52810dmouse_nrf52810/prj_release.conf b/applications/nrf_desktop/configuration/nrf52810dmouse_nrf52810/prj_release.conf index 27bd6996b4c1..9ff945ac00a3 100644 --- a/applications/nrf_desktop/configuration/nrf52810dmouse_nrf52810/prj_release.conf +++ b/applications/nrf_desktop/configuration/nrf52810dmouse_nrf52810/prj_release.conf @@ -98,10 +98,6 @@ CONFIG_BT_MAX_PAIRED=2 CONFIG_BT_ID_MAX=3 CONFIG_BT_LL_SW_SPLIT=y -# Optimize Bluetooth controller for size to reduce memory consumption -CONFIG_BT_CTLR_ADVANCED_FEATURES=y -CONFIG_BT_CTLR_OPTIMIZE_FOR_SIZE=y - CONFIG_BT_ATT_TX_COUNT=4 CONFIG_BT_CONN_TX_MAX=4 # Reduce memory footprint diff --git a/applications/nrf_desktop/configuration/nrf52820dongle_nrf52820/prj.conf b/applications/nrf_desktop/configuration/nrf52820dongle_nrf52820/prj.conf index 4006cbfecb0e..e2dd6e2775dd 100644 --- a/applications/nrf_desktop/configuration/nrf52820dongle_nrf52820/prj.conf +++ b/applications/nrf_desktop/configuration/nrf52820dongle_nrf52820/prj.conf @@ -75,10 +75,6 @@ CONFIG_USB_NRFX_EVT_QUEUE_SIZE=16 CONFIG_BT_PRIVACY=y CONFIG_BT_LL_SW_SPLIT=y -# Optimize Bluetooth controller for size to reduce memory consumption -CONFIG_BT_CTLR_ADVANCED_FEATURES=y -CONFIG_BT_CTLR_OPTIMIZE_FOR_SIZE=y - CONFIG_BT_BUF_ACL_TX_SIZE=35 CONFIG_BT_CTLR_DATA_LENGTH_MAX=35 CONFIG_BT_ATT_TX_COUNT=6 diff --git a/applications/nrf_desktop/configuration/nrf52820dongle_nrf52820/prj_release.conf b/applications/nrf_desktop/configuration/nrf52820dongle_nrf52820/prj_release.conf index 299d9942c9e1..49aebcb0fbfe 100644 --- a/applications/nrf_desktop/configuration/nrf52820dongle_nrf52820/prj_release.conf +++ b/applications/nrf_desktop/configuration/nrf52820dongle_nrf52820/prj_release.conf @@ -74,10 +74,6 @@ CONFIG_USB_NRFX_EVT_QUEUE_SIZE=30 CONFIG_BT_PRIVACY=y CONFIG_BT_LL_SW_SPLIT=y -# Optimize Bluetooth controller for size to reduce memory consumption -CONFIG_BT_CTLR_ADVANCED_FEATURES=y -CONFIG_BT_CTLR_OPTIMIZE_FOR_SIZE=y - CONFIG_BT_BUF_ACL_TX_SIZE=35 CONFIG_BT_CTLR_DATA_LENGTH_MAX=35 CONFIG_BT_ATT_TX_COUNT=6 diff --git a/applications/nrf_desktop/configuration/nrf52833dk_nrf52820/prj.conf b/applications/nrf_desktop/configuration/nrf52833dk_nrf52820/prj.conf index 21b40ffdca4e..ec2b89bce61a 100644 --- a/applications/nrf_desktop/configuration/nrf52833dk_nrf52820/prj.conf +++ b/applications/nrf_desktop/configuration/nrf52833dk_nrf52820/prj.conf @@ -76,10 +76,6 @@ CONFIG_USB_NRFX_EVT_QUEUE_SIZE=16 CONFIG_BT_PRIVACY=y CONFIG_BT_LL_SW_SPLIT=y -# Optimize Bluetooth controller for size to reduce memory consumption -CONFIG_BT_CTLR_ADVANCED_FEATURES=y -CONFIG_BT_CTLR_OPTIMIZE_FOR_SIZE=y - CONFIG_BT_BUF_ACL_TX_SIZE=35 CONFIG_BT_CTLR_DATA_LENGTH_MAX=35 CONFIG_BT_ATT_TX_COUNT=6 diff --git a/applications/nrf_desktop/configuration/nrf52833dk_nrf52820/prj_release.conf b/applications/nrf_desktop/configuration/nrf52833dk_nrf52820/prj_release.conf index 021ed40f3170..5378fc305aaf 100644 --- a/applications/nrf_desktop/configuration/nrf52833dk_nrf52820/prj_release.conf +++ b/applications/nrf_desktop/configuration/nrf52833dk_nrf52820/prj_release.conf @@ -75,10 +75,6 @@ CONFIG_USB_NRFX_EVT_QUEUE_SIZE=30 CONFIG_BT_PRIVACY=y CONFIG_BT_LL_SW_SPLIT=y -# Optimize Bluetooth controller for size to reduce memory consumption -CONFIG_BT_CTLR_ADVANCED_FEATURES=y -CONFIG_BT_CTLR_OPTIMIZE_FOR_SIZE=y - CONFIG_BT_BUF_ACL_TX_SIZE=35 CONFIG_BT_CTLR_DATA_LENGTH_MAX=35 CONFIG_BT_ATT_TX_COUNT=6 diff --git a/applications/nrf_desktop/configuration/nrf52833dk_nrf52833/prj_dongle_small.conf b/applications/nrf_desktop/configuration/nrf52833dk_nrf52833/prj_dongle_small.conf index 54296fdcbfb5..bfb3a479b6a2 100644 --- a/applications/nrf_desktop/configuration/nrf52833dk_nrf52833/prj_dongle_small.conf +++ b/applications/nrf_desktop/configuration/nrf52833dk_nrf52833/prj_dongle_small.conf @@ -81,10 +81,6 @@ CONFIG_USB_NRFX_EVT_QUEUE_SIZE=16 CONFIG_BT_PRIVACY=y CONFIG_BT_LL_SW_SPLIT=y -# Optimize Bluetooth controller for size to reduce memory consumption -CONFIG_BT_CTLR_ADVANCED_FEATURES=y -CONFIG_BT_CTLR_OPTIMIZE_FOR_SIZE=y - CONFIG_BT_BUF_ACL_TX_SIZE=35 CONFIG_BT_CTLR_DATA_LENGTH_MAX=35 CONFIG_BT_ATT_TX_COUNT=6