Revert "[nrf fromtree] [nrfconnect] Disable selected BLE features and…

… RTT (project-chip#24227)" This reverts commit a1fbffa.
Damian-Nordic · Mar 15, 2023 · f776793 · f776793
1 parent 9865937
commit f776793
Show file tree

Hide file tree

Showing 25 changed files with 5 additions and 66 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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