[nrf fromtree] [nrfconnect] Disable selected BLE features and RTT (pr…

…oject-chip#24227) Disable encryption and EC in BLE controller, and JLink RTT in all nRF Connect examples. BLE changes save over 5.5kB of flash and almost 2kB of RAM. Disabling RTT saves over 1kB of RAM, additionally. Signed-off-by: Damian Krolik <[email protected]> Signed-off-by: Damian Krolik <[email protected]> (cherry picked from commit 99a8de7)
Damian-Nordic · Feb 21, 2023 · a1fbffa · a1fbffa
1 parent f229a83
commit a1fbffa
Show file tree

Hide file tree

Showing 25 changed files with 66 additions and 5 deletions.
diff --git a/config/nrfconnect/chip-module/Kconfig.defaults b/config/nrfconnect/chip-module/Kconfig.defaults
@@ -131,6 +131,18 @@ 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,6 +36,9 @@ 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,7 +35,8 @@ CONFIG_THREAD_NAME=y
 CONFIG_MPU_STACK_GUARD=y
 CONFIG_RESET_ON_FATAL_ERROR=n
 
-# reduce application size by disabling including assertions in the output file.
+# Reduce application size
+CONFIG_USE_SEGGER_RTT=n
 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,6 +35,7 @@ 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,6 +36,9 @@ 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,7 +36,8 @@ CONFIG_THREAD_NAME=y
 CONFIG_MPU_STACK_GUARD=y
 CONFIG_RESET_ON_FATAL_ERROR=n
 
-# reduce application size by disabling including assertions in the output file.
+# Reduce application size
+CONFIG_USE_SEGGER_RTT=n
 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,6 +35,7 @@ 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,3 +38,6 @@ 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,6 +39,9 @@ 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,6 +41,7 @@ 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,3 +46,6 @@ 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,6 +43,9 @@ 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,6 +45,7 @@ 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,3 +35,6 @@ 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,6 +36,9 @@ 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,6 +38,7 @@ 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,9 +14,6 @@
 #    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.
@@ -38,3 +35,6 @@ 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,6 +36,9 @@ 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,6 +38,7 @@ 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,3 +35,6 @@ 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,6 +37,9 @@ 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,6 +39,7 @@ 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,3 +46,6 @@ 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,6 +52,9 @@ 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,6 +54,7 @@ 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