From f77679324d1a8bdab2d2d5dbda8608702218b8bf Mon Sep 17 00:00:00 2001 From: Kamil Kasperczyk Date: Wed, 15 Mar 2023 13:04:44 +0100 Subject: [PATCH] Revert "[nrf fromtree] [nrfconnect] Disable selected BLE features and RTT (#24227)" This reverts commit a1fbffa8eb1eb8437e07061aaa0eeff44e48f4d3. --- config/nrfconnect/chip-module/Kconfig.defaults | 12 ------------ examples/all-clusters-app/nrfconnect/prj.conf | 3 --- examples/all-clusters-app/nrfconnect/prj_dfu.conf | 3 +-- .../all-clusters-app/nrfconnect/prj_release.conf | 1 - .../all-clusters-minimal-app/nrfconnect/prj.conf | 3 --- .../all-clusters-minimal-app/nrfconnect/prj_dfu.conf | 3 +-- .../nrfconnect/prj_release.conf | 1 - examples/light-switch-app/nrfconnect/prj.conf | 3 --- examples/light-switch-app/nrfconnect/prj_no_dfu.conf | 3 --- .../light-switch-app/nrfconnect/prj_release.conf | 1 - examples/lighting-app/nrfconnect/prj.conf | 3 --- examples/lighting-app/nrfconnect/prj_no_dfu.conf | 3 --- examples/lighting-app/nrfconnect/prj_release.conf | 1 - examples/lock-app/nrfconnect/prj.conf | 3 --- examples/lock-app/nrfconnect/prj_no_dfu.conf | 3 --- examples/lock-app/nrfconnect/prj_release.conf | 1 - examples/pump-app/nrfconnect/prj.conf | 6 +++--- examples/pump-app/nrfconnect/prj_no_dfu.conf | 3 --- examples/pump-app/nrfconnect/prj_release.conf | 1 - examples/pump-controller-app/nrfconnect/prj.conf | 3 --- .../pump-controller-app/nrfconnect/prj_no_dfu.conf | 3 --- .../pump-controller-app/nrfconnect/prj_release.conf | 1 - examples/window-app/nrfconnect/prj.conf | 3 --- examples/window-app/nrfconnect/prj_no_dfu.conf | 3 --- examples/window-app/nrfconnect/prj_release.conf | 1 - 25 files changed, 5 insertions(+), 66 deletions(-) diff --git a/config/nrfconnect/chip-module/Kconfig.defaults b/config/nrfconnect/chip-module/Kconfig.defaults index eeea42fa2b6cdf..b90850eedd3099 100644 --- a/config/nrfconnect/chip-module/Kconfig.defaults +++ b/config/nrfconnect/chip-module/Kconfig.defaults @@ -131,18 +131,6 @@ config BT_BUF_ACL_TX_SIZE config BT_RX_STACK_SIZE default 1200 -config BT_CTLR_ECDH - bool - default n - -config BT_CTLR_LE_ENC - bool - default n - -config BT_DEVICE_NAME_GATT_WRITABLE - bool - default n - # Enable NFC support config CHIP_NFC_COMMISSIONING diff --git a/examples/all-clusters-app/nrfconnect/prj.conf b/examples/all-clusters-app/nrfconnect/prj.conf index 51d5dd89c68a5f..ee2bee67b64ce4 100644 --- a/examples/all-clusters-app/nrfconnect/prj.conf +++ b/examples/all-clusters-app/nrfconnect/prj.conf @@ -36,9 +36,6 @@ CONFIG_THREAD_NAME=y CONFIG_MPU_STACK_GUARD=y CONFIG_RESET_ON_FATAL_ERROR=n -# Reduce application size -CONFIG_USE_SEGGER_RTT=n - # Disable OTA requestor CONFIG_CHIP_OTA_REQUESTOR=n diff --git a/examples/all-clusters-app/nrfconnect/prj_dfu.conf b/examples/all-clusters-app/nrfconnect/prj_dfu.conf index c0d47e635ed406..b91bf3fa8298a6 100644 --- a/examples/all-clusters-app/nrfconnect/prj_dfu.conf +++ b/examples/all-clusters-app/nrfconnect/prj_dfu.conf @@ -35,8 +35,7 @@ CONFIG_THREAD_NAME=y CONFIG_MPU_STACK_GUARD=y CONFIG_RESET_ON_FATAL_ERROR=n -# Reduce application size -CONFIG_USE_SEGGER_RTT=n +# reduce application size by disabling including assertions in the output file. CONFIG_ASSERT_VERBOSE=n CONFIG_ASSERT_NO_FILE_INFO=y CONFIG_ASSERT_NO_COND_INFO=y diff --git a/examples/all-clusters-app/nrfconnect/prj_release.conf b/examples/all-clusters-app/nrfconnect/prj_release.conf index b229f68b308b9d..5816426f0fc09e 100644 --- a/examples/all-clusters-app/nrfconnect/prj_release.conf +++ b/examples/all-clusters-app/nrfconnect/prj_release.conf @@ -35,7 +35,6 @@ CONFIG_BT_DEVICE_NAME="AllClusters" CONFIG_RESET_ON_FATAL_ERROR=y # Disable all debug features -CONFIG_USE_SEGGER_RTT=n CONFIG_SHELL=n CONFIG_OPENTHREAD_SHELL=n CONFIG_CONSOLE=n diff --git a/examples/all-clusters-minimal-app/nrfconnect/prj.conf b/examples/all-clusters-minimal-app/nrfconnect/prj.conf index c33baaa8d79761..2c2c8d2fc81c28 100644 --- a/examples/all-clusters-minimal-app/nrfconnect/prj.conf +++ b/examples/all-clusters-minimal-app/nrfconnect/prj.conf @@ -36,9 +36,6 @@ CONFIG_THREAD_NAME=y CONFIG_MPU_STACK_GUARD=y CONFIG_RESET_ON_FATAL_ERROR=n -# Reduce application size -CONFIG_USE_SEGGER_RTT=n - # Disable OTA requestor CONFIG_CHIP_OTA_REQUESTOR=n diff --git a/examples/all-clusters-minimal-app/nrfconnect/prj_dfu.conf b/examples/all-clusters-minimal-app/nrfconnect/prj_dfu.conf index 6effabf6914a9b..292d7a086d4e89 100644 --- a/examples/all-clusters-minimal-app/nrfconnect/prj_dfu.conf +++ b/examples/all-clusters-minimal-app/nrfconnect/prj_dfu.conf @@ -36,8 +36,7 @@ CONFIG_THREAD_NAME=y CONFIG_MPU_STACK_GUARD=y CONFIG_RESET_ON_FATAL_ERROR=n -# Reduce application size -CONFIG_USE_SEGGER_RTT=n +# reduce application size by disabling including assertions in the output file. CONFIG_ASSERT_VERBOSE=n CONFIG_ASSERT_NO_FILE_INFO=y CONFIG_ASSERT_NO_COND_INFO=y diff --git a/examples/all-clusters-minimal-app/nrfconnect/prj_release.conf b/examples/all-clusters-minimal-app/nrfconnect/prj_release.conf index 8029f55a1e31f4..33cd3f38589653 100644 --- a/examples/all-clusters-minimal-app/nrfconnect/prj_release.conf +++ b/examples/all-clusters-minimal-app/nrfconnect/prj_release.conf @@ -35,7 +35,6 @@ CONFIG_BT_DEVICE_NAME="AllClusters" CONFIG_RESET_ON_FATAL_ERROR=y # Disable all debug features -CONFIG_USE_SEGGER_RTT=n CONFIG_SHELL=n CONFIG_OPENTHREAD_SHELL=n CONFIG_CONSOLE=n diff --git a/examples/light-switch-app/nrfconnect/prj.conf b/examples/light-switch-app/nrfconnect/prj.conf index 23fa257975fe64..19f3cb266a6abc 100644 --- a/examples/light-switch-app/nrfconnect/prj.conf +++ b/examples/light-switch-app/nrfconnect/prj.conf @@ -38,6 +38,3 @@ CONFIG_BT_DEVICE_NAME="MatterSwitch" CONFIG_THREAD_NAME=y CONFIG_MPU_STACK_GUARD=y CONFIG_RESET_ON_FATAL_ERROR=n - -# Reduce application size -CONFIG_USE_SEGGER_RTT=n diff --git a/examples/light-switch-app/nrfconnect/prj_no_dfu.conf b/examples/light-switch-app/nrfconnect/prj_no_dfu.conf index 145cb9b50f835e..27475ce596444c 100644 --- a/examples/light-switch-app/nrfconnect/prj_no_dfu.conf +++ b/examples/light-switch-app/nrfconnect/prj_no_dfu.conf @@ -39,9 +39,6 @@ CONFIG_THREAD_NAME=y CONFIG_MPU_STACK_GUARD=y CONFIG_RESET_ON_FATAL_ERROR=n -# Reduce application size -CONFIG_USE_SEGGER_RTT=n - # Disable Matter OTA DFU CONFIG_CHIP_OTA_REQUESTOR=n diff --git a/examples/light-switch-app/nrfconnect/prj_release.conf b/examples/light-switch-app/nrfconnect/prj_release.conf index 520a280b1e18ab..a55449c991b17c 100644 --- a/examples/light-switch-app/nrfconnect/prj_release.conf +++ b/examples/light-switch-app/nrfconnect/prj_release.conf @@ -41,7 +41,6 @@ CONFIG_RESET_ON_FATAL_ERROR=y CONFIG_PM_DEVICE=y # Disable all debug features -CONFIG_USE_SEGGER_RTT=n CONFIG_SHELL=n CONFIG_OPENTHREAD_SHELL=n CONFIG_CONSOLE=n diff --git a/examples/lighting-app/nrfconnect/prj.conf b/examples/lighting-app/nrfconnect/prj.conf index ad67f13edf08e3..1a796988571cf5 100644 --- a/examples/lighting-app/nrfconnect/prj.conf +++ b/examples/lighting-app/nrfconnect/prj.conf @@ -46,6 +46,3 @@ CONFIG_IEEE802154_NRF5_RX_STACK_SIZE=1024 CONFIG_THREAD_NAME=y CONFIG_MPU_STACK_GUARD=y CONFIG_RESET_ON_FATAL_ERROR=n - -# Reduce application size -CONFIG_USE_SEGGER_RTT=n diff --git a/examples/lighting-app/nrfconnect/prj_no_dfu.conf b/examples/lighting-app/nrfconnect/prj_no_dfu.conf index a2d0392c98b5a9..7fc72e8fcbd704 100644 --- a/examples/lighting-app/nrfconnect/prj_no_dfu.conf +++ b/examples/lighting-app/nrfconnect/prj_no_dfu.conf @@ -43,9 +43,6 @@ CONFIG_THREAD_NAME=y CONFIG_MPU_STACK_GUARD=y CONFIG_RESET_ON_FATAL_ERROR=n -# Reduce application size -CONFIG_USE_SEGGER_RTT=n - # Stack size settings CONFIG_IEEE802154_NRF5_RX_STACK_SIZE=1024 diff --git a/examples/lighting-app/nrfconnect/prj_release.conf b/examples/lighting-app/nrfconnect/prj_release.conf index 762b6d44f919c7..5ff25156b6861b 100644 --- a/examples/lighting-app/nrfconnect/prj_release.conf +++ b/examples/lighting-app/nrfconnect/prj_release.conf @@ -45,7 +45,6 @@ CONFIG_RESET_ON_FATAL_ERROR=y CONFIG_IEEE802154_NRF5_RX_STACK_SIZE=1024 # Disable all debug features -CONFIG_USE_SEGGER_RTT=n CONFIG_SHELL=n CONFIG_OPENTHREAD_SHELL=n CONFIG_CONSOLE=n diff --git a/examples/lock-app/nrfconnect/prj.conf b/examples/lock-app/nrfconnect/prj.conf index 6b4864a2a486b7..676ae5a05f2599 100644 --- a/examples/lock-app/nrfconnect/prj.conf +++ b/examples/lock-app/nrfconnect/prj.conf @@ -35,6 +35,3 @@ CONFIG_BT_DEVICE_NAME="MatterLock" CONFIG_THREAD_NAME=y CONFIG_MPU_STACK_GUARD=y CONFIG_RESET_ON_FATAL_ERROR=n - -# Reduce application size -CONFIG_USE_SEGGER_RTT=n diff --git a/examples/lock-app/nrfconnect/prj_no_dfu.conf b/examples/lock-app/nrfconnect/prj_no_dfu.conf index a53431aa2dd9d7..839f839fc2e74f 100644 --- a/examples/lock-app/nrfconnect/prj_no_dfu.conf +++ b/examples/lock-app/nrfconnect/prj_no_dfu.conf @@ -36,9 +36,6 @@ CONFIG_THREAD_NAME=y CONFIG_MPU_STACK_GUARD=y CONFIG_RESET_ON_FATAL_ERROR=n -# Reduce application size -CONFIG_USE_SEGGER_RTT=n - # Disable Matter OTA DFU CONFIG_CHIP_OTA_REQUESTOR=n diff --git a/examples/lock-app/nrfconnect/prj_release.conf b/examples/lock-app/nrfconnect/prj_release.conf index ba830806523ded..b41ed9ede98909 100644 --- a/examples/lock-app/nrfconnect/prj_release.conf +++ b/examples/lock-app/nrfconnect/prj_release.conf @@ -38,7 +38,6 @@ CONFIG_RESET_ON_FATAL_ERROR=y CONFIG_PM_DEVICE=y # Disable all debug features -CONFIG_USE_SEGGER_RTT=n CONFIG_SHELL=n CONFIG_OPENTHREAD_SHELL=n CONFIG_CONSOLE=n diff --git a/examples/pump-app/nrfconnect/prj.conf b/examples/pump-app/nrfconnect/prj.conf index 3013e7d7aec421..3195f884e65720 100644 --- a/examples/pump-app/nrfconnect/prj.conf +++ b/examples/pump-app/nrfconnect/prj.conf @@ -14,6 +14,9 @@ # limitations under the License. # +CONFIG_CHIP=y +CONFIG_STD_CPP14=y + # This sample uses Kconfig.defaults to set options common for all # samples. This file should contain only options specific for this sample # or overrides of default values. @@ -35,6 +38,3 @@ CONFIG_BT_DEVICE_NAME="MatterPump" CONFIG_THREAD_NAME=y CONFIG_MPU_STACK_GUARD=y CONFIG_RESET_ON_FATAL_ERROR=n - -# Reduce application size -CONFIG_USE_SEGGER_RTT=n diff --git a/examples/pump-app/nrfconnect/prj_no_dfu.conf b/examples/pump-app/nrfconnect/prj_no_dfu.conf index a0d3f8b1a879c2..67c31871ce797f 100644 --- a/examples/pump-app/nrfconnect/prj_no_dfu.conf +++ b/examples/pump-app/nrfconnect/prj_no_dfu.conf @@ -36,9 +36,6 @@ CONFIG_THREAD_NAME=y CONFIG_MPU_STACK_GUARD=y CONFIG_RESET_ON_FATAL_ERROR=n -# Reduce application size -CONFIG_USE_SEGGER_RTT=n - # Disable Matter OTA DFU CONFIG_CHIP_OTA_REQUESTOR=n diff --git a/examples/pump-app/nrfconnect/prj_release.conf b/examples/pump-app/nrfconnect/prj_release.conf index 540c77354fa82f..adb09f72ef3db2 100644 --- a/examples/pump-app/nrfconnect/prj_release.conf +++ b/examples/pump-app/nrfconnect/prj_release.conf @@ -38,7 +38,6 @@ CONFIG_RESET_ON_FATAL_ERROR=y CONFIG_PM_DEVICE=y # Disable all debug features -CONFIG_USE_SEGGER_RTT=n CONFIG_SHELL=n CONFIG_OPENTHREAD_SHELL=n CONFIG_CONSOLE=n diff --git a/examples/pump-controller-app/nrfconnect/prj.conf b/examples/pump-controller-app/nrfconnect/prj.conf index 5b9c2baff8ee9e..4a38ec1177c699 100644 --- a/examples/pump-controller-app/nrfconnect/prj.conf +++ b/examples/pump-controller-app/nrfconnect/prj.conf @@ -35,6 +35,3 @@ CONFIG_BT_DEVICE_NAME="MatterPumpCtrl" CONFIG_THREAD_NAME=y CONFIG_MPU_STACK_GUARD=y CONFIG_RESET_ON_FATAL_ERROR=n - -# Reduce application size -CONFIG_USE_SEGGER_RTT=n diff --git a/examples/pump-controller-app/nrfconnect/prj_no_dfu.conf b/examples/pump-controller-app/nrfconnect/prj_no_dfu.conf index d6632fe9172638..dba7042ad82864 100644 --- a/examples/pump-controller-app/nrfconnect/prj_no_dfu.conf +++ b/examples/pump-controller-app/nrfconnect/prj_no_dfu.conf @@ -37,9 +37,6 @@ CONFIG_THREAD_NAME=y CONFIG_MPU_STACK_GUARD=y CONFIG_RESET_ON_FATAL_ERROR=n -# Reduce application size -CONFIG_USE_SEGGER_RTT=n - # Disable Matter OTA DFU CONFIG_CHIP_OTA_REQUESTOR=n diff --git a/examples/pump-controller-app/nrfconnect/prj_release.conf b/examples/pump-controller-app/nrfconnect/prj_release.conf index fc3b092b655c8f..88ea95c777e1a1 100644 --- a/examples/pump-controller-app/nrfconnect/prj_release.conf +++ b/examples/pump-controller-app/nrfconnect/prj_release.conf @@ -39,7 +39,6 @@ CONFIG_RESET_ON_FATAL_ERROR=y CONFIG_PM_DEVICE=y # Disable all debug features -CONFIG_USE_SEGGER_RTT=n CONFIG_SHELL=n CONFIG_OPENTHREAD_SHELL=n CONFIG_CONSOLE=n diff --git a/examples/window-app/nrfconnect/prj.conf b/examples/window-app/nrfconnect/prj.conf index 3dc711bce86098..a284009a305d99 100644 --- a/examples/window-app/nrfconnect/prj.conf +++ b/examples/window-app/nrfconnect/prj.conf @@ -46,6 +46,3 @@ CONFIG_IEEE802154_NRF5_RX_STACK_SIZE=1024 CONFIG_THREAD_NAME=y CONFIG_MPU_STACK_GUARD=y CONFIG_RESET_ON_FATAL_ERROR=n - -# Reduce application size -CONFIG_USE_SEGGER_RTT=n diff --git a/examples/window-app/nrfconnect/prj_no_dfu.conf b/examples/window-app/nrfconnect/prj_no_dfu.conf index d2da9b1a184eaa..3f55608bc1357e 100644 --- a/examples/window-app/nrfconnect/prj_no_dfu.conf +++ b/examples/window-app/nrfconnect/prj_no_dfu.conf @@ -52,9 +52,6 @@ CONFIG_THREAD_NAME=y CONFIG_MPU_STACK_GUARD=y CONFIG_RESET_ON_FATAL_ERROR=n -# Reduce application size -CONFIG_USE_SEGGER_RTT=n - # Disable Matter OTA DFU CONFIG_CHIP_OTA_REQUESTOR=n diff --git a/examples/window-app/nrfconnect/prj_release.conf b/examples/window-app/nrfconnect/prj_release.conf index 336eb9ea95169f..c801e2f86bb9a7 100644 --- a/examples/window-app/nrfconnect/prj_release.conf +++ b/examples/window-app/nrfconnect/prj_release.conf @@ -54,7 +54,6 @@ CONFIG_IEEE802154_NRF5_RX_STACK_SIZE=1024 CONFIG_PM_DEVICE=y # Disable all debug features -CONFIG_USE_SEGGER_RTT=n CONFIG_SHELL=n CONFIG_OPENTHREAD_SHELL=n CONFIG_CONSOLE=n