Merge branch 'examples/remove_same_configs' into 'main'

examples: Remove the same configs as the default See merge request app-frameworks/esp-matter!987
espressif · Dec 27, 2024 · cfb11d5 · cfb11d5
2 parents 5b84c67 + 7868b2a
commit cfb11d5
Show file tree

Hide file tree

Showing 82 changed files with 151 additions and 1,663 deletions.
diff --git a/examples/all_device_types_app/sdkconfig.defaults b/examples/all_device_types_app/sdkconfig.defaults
@@ -1,9 +1,3 @@
-# Default to 921600 baud when flashing and monitoring device
-CONFIG_ESPTOOLPY_BAUD_921600B=y
-CONFIG_ESPTOOLPY_BAUD=921600
-CONFIG_ESPTOOLPY_COMPRESSED=y
-CONFIG_ESPTOOLPY_MONITOR_BAUD_115200B=y
-CONFIG_ESPTOOLPY_MONITOR_BAUD=115200
 CONFIG_ESPTOOLPY_FLASHSIZE_4MB=y
 
 #enable BT
@@ -35,8 +29,11 @@ CONFIG_BUTTON_LONG_PRESS_TIME_MS=5000
 # disable softap by default
 CONFIG_ESP_WIFI_SOFTAP_SUPPORT=n
 
-# Disable DS Peripheral
-CONFIG_ESP_SECURE_CERT_DS_PERIPHERAL=n
+# Remove this after `ENABLE_WIFI_AP` config has been deleted from chip component
+CONFIG_ENABLE_WIFI_AP=n
+
+# Enable OTA Requestor
+CONFIG_ENABLE_OTA_REQUESTOR=y
 
 # Enable HKDF in mbedtls
 CONFIG_MBEDTLS_HKDF_C=y

diff --git a/examples/all_device_types_app/sdkconfig.defaults.esp32c2 b/examples/all_device_types_app/sdkconfig.defaults.esp32c2
@@ -3,10 +3,6 @@ CONFIG_COMPILER_OPTIMIZATION_SIZE=y
 CONFIG_COMPILER_SAVE_RESTORE_LIBCALLS=y
 CONFIG_COMPILER_OPTIMIZATION_ASSERTIONS_DISABLE=y
 
-# Bluetooth
-CONFIG_BT_ENABLED=y
-CONFIG_BT_NIMBLE_ENABLED=y
-
 ## NimBLE Options
 CONFIG_BT_NIMBLE_MAX_CONNECTIONS=1
 CONFIG_BT_NIMBLE_MAX_BONDS=2
@@ -25,7 +21,6 @@ CONFIG_BT_NIMBLE_MSYS_2_BLOCK_SIZE=320
 CONFIG_BT_NIMBLE_ACL_BUF_COUNT=5
 CONFIG_BT_NIMBLE_HCI_EVT_HI_BUF_COUNT=5
 CONFIG_BT_NIMBLE_HCI_EVT_LO_BUF_COUNT=3
-CONFIG_BT_NIMBLE_ENABLE_CONN_REATTEMPT=n
 
 ## Controller Options
 CONFIG_BT_LE_CONTROLLER_TASK_STACK_SIZE=3072

diff --git a/examples/all_device_types_app/sdkconfig.defaults.esp32c6 b/examples/all_device_types_app/sdkconfig.defaults.esp32c6
@@ -1,52 +1 @@
 CONFIG_IDF_TARGET="esp32c6"
-
-# libsodium
-CONFIG_LIBSODIUM_USE_MBEDTLS_SHA=y
-
-# NIMBLE
-CONFIG_BT_ENABLED=y
-CONFIG_BT_NIMBLE_ENABLED=y
-CONFIG_BT_NIMBLE_EXT_ADV=n
-CONFIG_BT_NIMBLE_HCI_EVT_BUF_SIZE=70
-CONFIG_USE_BLE_ONLY_FOR_COMMISSIONING=y
-
-# FreeRTOS should use legacy API
-CONFIG_FREERTOS_ENABLE_BACKWARD_COMPATIBILITY=y
-
-# Disable lwip ipv6 autoconfig
-CONFIG_LWIP_IPV6_AUTOCONFIG=y
-
-# Use a custom partition table
-CONFIG_PARTITION_TABLE_CUSTOM=y
-CONFIG_PARTITION_TABLE_CUSTOM_FILENAME="partitions.csv"
-
-# Use minimal mDNS
-CONFIG_USE_MINIMAL_MDNS=y
-CONFIG_ENABLE_EXTENDED_DISCOVERY=y
-
-# Enable OTA Requestor
-CONFIG_ENABLE_OTA_REQUESTOR=y
-
-# Disable AP
-CONFIG_ENABLE_WIFI_STATION=y
-CONFIG_ENABLE_WIFI_AP=n
-
-# Button
-CONFIG_BUTTON_PERIOD_TIME_MS=20
-CONFIG_BUTTON_LONG_PRESS_TIME_MS=5000
-
-# Enable chip shell
-CONFIG_ENABLE_CHIP_SHELL=y
-
-# ESP32-C6-DevKitM-1 Settings
-# Buttons
-CONFIG_BSP_BUTTONS_NUM=1
-CONFIG_BSP_BUTTON_1_TYPE_GPIO=y
-CONFIG_BSP_BUTTON_1_GPIO=9
-CONFIG_BSP_BUTTON_1_LEVEL=0
-# LEDs
-CONFIG_BSP_LEDS_NUM=1
-CONFIG_BSP_LED_TYPE_RGB=y
-CONFIG_BSP_LED_RGB_GPIO=8
-CONFIG_BSP_LED_RGB_BACKEND_RMT=y
-
diff --git a/examples/all_device_types_app/sdkconfig.defaults.esp32h2 b/examples/all_device_types_app/sdkconfig.defaults.esp32h2
@@ -1,58 +1,24 @@
 CONFIG_IDF_TARGET="esp32h2"
 
-# libsodium
-CONFIG_LIBSODIUM_USE_MBEDTLS_SHA=y
-
-# NIMBLE
-CONFIG_BT_ENABLED=y
-CONFIG_BT_NIMBLE_ENABLED=y
-CONFIG_BT_NIMBLE_EXT_ADV=n
-CONFIG_BT_NIMBLE_HCI_EVT_BUF_SIZE=70
-CONFIG_USE_BLE_ONLY_FOR_COMMISSIONING=n
-
-# FreeRTOS should use legacy API
-CONFIG_FREERTOS_ENABLE_BACKWARD_COMPATIBILITY=y
-
 # Enable OpenThread
 CONFIG_OPENTHREAD_ENABLED=y
 CONFIG_OPENTHREAD_SRP_CLIENT=y
-CONFIG_OPENTHREAD_DNS_CLIENT=y
 CONFIG_OPENTHREAD_LOG_LEVEL_DYNAMIC=n
 CONFIG_OPENTHREAD_LOG_LEVEL_NOTE=y
 CONFIG_OPENTHREAD_CLI=n
 
-
 # Disable lwip ipv6 autoconfig
 CONFIG_LWIP_IPV6_AUTOCONFIG=n
 
-# Use a custom partition table
-CONFIG_PARTITION_TABLE_CUSTOM=y
-CONFIG_PARTITION_TABLE_CUSTOM_FILENAME="partitions_thread.csv"
-
 # LwIP config for OpenThread
 CONFIG_LWIP_IPV6_NUM_ADDRESSES=8
 CONFIG_LWIP_MULTICAST_PING=y
 
 # MDNS platform
 CONFIG_USE_MINIMAL_MDNS=n
-CONFIG_ENABLE_EXTENDED_DISCOVERY=y
 
-# Enable OTA Requestor
-CONFIG_ENABLE_OTA_REQUESTOR=y
-
-# Disable STA and AP for ESP32H2
+# Disable STA
 CONFIG_ENABLE_WIFI_STATION=n
-CONFIG_ENABLE_WIFI_AP=n
-
-# Button
-CONFIG_BUTTON_PERIOD_TIME_MS=20
-CONFIG_BUTTON_LONG_PRESS_TIME_MS=5000
-
-# Enable chip shell
-CONFIG_ENABLE_CHIP_SHELL=y
-
-# Enable DS Peripheral
-CONFIG_ESP_SECURE_CERT_DS_PERIPHERAL=y
 
 # Disable persist subscriptions
 CONFIG_ENABLE_PERSIST_SUBSCRIPTIONS=n

diff --git a/examples/bridge_apps/blemesh_bridge/sdkconfig.defaults b/examples/bridge_apps/blemesh_bridge/sdkconfig.defaults
@@ -1,9 +1,3 @@
-# Default to 921600 baud when flashing and monitoring device
-CONFIG_ESPTOOLPY_BAUD_921600B=y
-CONFIG_ESPTOOLPY_BAUD=921600
-CONFIG_ESPTOOLPY_COMPRESSED=y
-CONFIG_ESPTOOLPY_MONITOR_BAUD_115200B=y
-CONFIG_ESPTOOLPY_MONITOR_BAUD=115200
 CONFIG_ESPTOOLPY_FLASHSIZE_4MB=y
 
 # Enable BT
@@ -53,9 +47,6 @@ CONFIG_ESP_TASK_WDT_CHECK_IDLE_TASK_CPU1=n
 # disable softap by default
 CONFIG_ESP_WIFI_SOFTAP_SUPPORT=n
 
-# Disable DS Peripheral
-CONFIG_ESP_SECURE_CERT_DS_PERIPHERAL=n
-
 # Enable HKDF in mbedtls
 CONFIG_MBEDTLS_HKDF_C=y
 

diff --git a/examples/bridge_apps/bridge_cli/sdkconfig.defaults b/examples/bridge_apps/bridge_cli/sdkconfig.defaults
@@ -1,9 +1,3 @@
-# Default to 921600 baud when flashing and monitoring device
-CONFIG_ESPTOOLPY_BAUD_921600B=y
-CONFIG_ESPTOOLPY_BAUD=921600
-CONFIG_ESPTOOLPY_COMPRESSED=y
-CONFIG_ESPTOOLPY_MONITOR_BAUD_115200B=y
-CONFIG_ESPTOOLPY_MONITOR_BAUD=115200
 CONFIG_ESPTOOLPY_FLASHSIZE_4MB=y
 
 #enable BT
@@ -31,9 +25,6 @@ CONFIG_LWIP_HOOK_ND6_GET_GW_DEFAULT=y
 # disable softap by default
 CONFIG_ESP_WIFI_SOFTAP_SUPPORT=n
 
-# Disable DS Peripheral
-CONFIG_ESP_SECURE_CERT_DS_PERIPHERAL=n
-
 # Enable HKDF in mbedtls
 CONFIG_MBEDTLS_HKDF_C=y
 

diff --git a/examples/bridge_apps/esp-now_bridge_light/sdkconfig.defaults b/examples/bridge_apps/esp-now_bridge_light/sdkconfig.defaults
@@ -1,9 +1,3 @@
-# Default to 921600 baud when flashing and monitoring device
-CONFIG_ESPTOOLPY_BAUD_921600B=y
-CONFIG_ESPTOOLPY_BAUD=921600
-CONFIG_ESPTOOLPY_COMPRESSED=y
-CONFIG_ESPTOOLPY_MONITOR_BAUD_115200B=y
-CONFIG_ESPTOOLPY_MONITOR_BAUD=115200
 CONFIG_ESPTOOLPY_FLASHSIZE_4MB=y
 
 #enable BT
@@ -32,9 +26,6 @@ CONFIG_BUTTON_LONG_PRESS_TIME_MS=5000
 # disable softap by default
 CONFIG_ESP_WIFI_SOFTAP_SUPPORT=n
 
-# Disable DS Peripheral
-CONFIG_ESP_SECURE_CERT_DS_PERIPHERAL=n
-
 # ESP-NOW Control Configuration
 CONFIG_ESPNOW_CONTROL_AUTO_CHANNEL_SENDING=y
 CONFIG_ESPNOW_CONTROL_RETRANSMISSION_TIMES=5

diff --git a/examples/bridge_apps/zigbee_bridge/sdkconfig.defaults b/examples/bridge_apps/zigbee_bridge/sdkconfig.defaults
@@ -1,9 +1,3 @@
-# Default to 921600 baud when flashing and monitoring device
-CONFIG_ESPTOOLPY_BAUD_921600B=y
-CONFIG_ESPTOOLPY_BAUD=921600
-CONFIG_ESPTOOLPY_COMPRESSED=y
-CONFIG_ESPTOOLPY_MONITOR_BAUD_115200B=y
-CONFIG_ESPTOOLPY_MONITOR_BAUD=115200
 CONFIG_ESPTOOLPY_FLASHSIZE_4MB=y
 
 # Enable BT
@@ -38,9 +32,6 @@ CONFIG_ZB_ENABLED=y
 CONFIG_ZB_ZCZR=y
 CONFIG_ZB_RADIO_MACSPLIT_UART=y
 
-# Disable DS Peripheral
-CONFIG_ESP_SECURE_CERT_DS_PERIPHERAL=n
-
 # Enable HKDF in mbedtls
 CONFIG_MBEDTLS_HKDF_C=y
 

diff --git a/examples/bridge_apps/zigbee_bridge/sdkconfig.defaults.esp32s3 b/examples/bridge_apps/zigbee_bridge/sdkconfig.defaults.esp32s3
@@ -1,37 +1,6 @@
-# Default to 921600 baud when flashing and monitoring device
-CONFIG_ESPTOOLPY_BAUD_921600B=y
-CONFIG_ESPTOOLPY_BAUD=921600
-CONFIG_ESPTOOLPY_COMPRESSED=y
-CONFIG_ESPTOOLPY_MONITOR_BAUD_115200B=y
-CONFIG_ESPTOOLPY_MONITOR_BAUD=115200
-CONFIG_ESPTOOLPY_FLASHSIZE_4MB=y
-
-#enable BT
-CONFIG_BT_ENABLED=y
-CONFIG_BT_NIMBLE_ENABLED=y
-CONFIG_BT_NIMBLE_TASK_STACK_SIZE=5120
-
-#enable lwip ipv6 autoconfig
-CONFIG_LWIP_IPV6_AUTOCONFIG=y
-
-# Use a custom partition table
-CONFIG_PARTITION_TABLE_CUSTOM=y
-CONFIG_PARTITION_TABLE_CUSTOM_FILENAME="partitions.csv"
-
-# Enable chip shell
-CONFIG_ENABLE_CHIP_SHELL=y
-
-#enable lwIP route hooks
-CONFIG_LWIP_HOOK_IP6_ROUTE_DEFAULT=y
-CONFIG_LWIP_HOOK_ND6_GET_GW_DEFAULT=y
-
-# Watchdog
-CONFIG_ESP_TASK_WDT_CHECK_IDLE_TASK_CPU0=n
-CONFIG_ESP_TASK_WDT_CHECK_IDLE_TASK_CPU1=n
+CONFIG_IDF_TARGET="esp32s3"
 
 # Zboss
-CONFIG_ZB_ENABLED=y
-CONFIG_ZB_ZCZR=y
 CONFIG_ZB_HOST=y
 
 # System event stack size

diff --git a/examples/controller/sdkconfig.defaults b/examples/controller/sdkconfig.defaults
@@ -1,9 +1,3 @@
-# Default to 921600 baud when flashing and monitoring device
-CONFIG_ESPTOOLPY_BAUD_921600B=y
-CONFIG_ESPTOOLPY_BAUD=921600
-CONFIG_ESPTOOLPY_COMPRESSED=y
-CONFIG_ESPTOOLPY_MONITOR_BAUD_115200B=y
-CONFIG_ESPTOOLPY_MONITOR_BAUD=115200
 CONFIG_ESPTOOLPY_FLASHSIZE_4MB=y
 
 #enable BT

diff --git a/examples/controller/sdkconfig.defaults.otbr b/examples/controller/sdkconfig.defaults.otbr
@@ -1,5 +1,3 @@
-# Default to 115200 baud when monitoring device
-CONFIG_ESPTOOLPY_MONITOR_BAUD=115200
 CONFIG_ESPTOOLPY_FLASHSIZE_4MB=y
 
 # Enable Openthread Border Router
@@ -29,14 +27,9 @@ CONFIG_PARTITION_TABLE_CUSTOM=y
 CONFIG_PARTITION_TABLE_CUSTOM_FILENAME="partitions_br.csv"
 
 # mbedTLS
-CONFIG_MBEDTLS_HARDWARE_AES=y
-CONFIG_MBEDTLS_HARDWARE_MPI=y
-CONFIG_MBEDTLS_HARDWARE_SHA=y
-CONFIG_MBEDTLS_CMAC_C=y
 CONFIG_MBEDTLS_KEY_EXCHANGE_ECJPAKE=y
 CONFIG_MBEDTLS_ECJPAKE_C=y
 CONFIG_MBEDTLS_SSL_PROTO_DTLS=y
-CONFIG_MBEDTLS_HKDF_C=y
 
 # MDNS platform
 CONFIG_USE_MINIMAL_MDNS=n

diff --git a/examples/door_lock/sdkconfig.defaults b/examples/door_lock/sdkconfig.defaults
@@ -1,9 +1,3 @@
-# Default to 921600 baud when flashing and monitoring device
-CONFIG_ESPTOOLPY_BAUD_921600B=y
-CONFIG_ESPTOOLPY_BAUD=921600
-CONFIG_ESPTOOLPY_COMPRESSED=y
-CONFIG_ESPTOOLPY_MONITOR_BAUD_115200B=y
-CONFIG_ESPTOOLPY_MONITOR_BAUD=115200
 CONFIG_ESPTOOLPY_FLASHSIZE_4MB=y
 
 #enable BT
@@ -35,15 +29,17 @@ CONFIG_BUTTON_LONG_PRESS_TIME_MS=5000
 # disable softap by default
 CONFIG_ESP_WIFI_SOFTAP_SUPPORT=n
 
-# Disable DS Peripheral
-CONFIG_ESP_SECURE_CERT_DS_PERIPHERAL=n
+# Enable OTA Requestor
+CONFIG_ENABLE_OTA_REQUESTOR=y
 
 # Use compact attribute storage mode
 CONFIG_ESP_MATTER_NVS_USE_COMPACT_ATTR_STORAGE=y
 
 # Enable HKDF in mbedtls
 CONFIG_MBEDTLS_HKDF_C=y
 
+CONFIG_ENABLE_WIFI_AP=n
+
 # Increase LwIP IPv6 address number to 6 (MAX_FABRIC + 1)
 # unique local addresses for fabrics(MAX_FABRIC), a link local address(1)
 CONFIG_LWIP_IPV6_NUM_ADDRESSES=6

diff --git a/examples/door_lock/sdkconfig.defaults.esp32c2 b/examples/door_lock/sdkconfig.defaults.esp32c2
@@ -1,12 +1,10 @@
+CONFIG_IDF_TARGET="esp32c2"
+
 # Compiler options
 CONFIG_COMPILER_OPTIMIZATION_SIZE=y
 CONFIG_COMPILER_SAVE_RESTORE_LIBCALLS=y
 CONFIG_COMPILER_OPTIMIZATION_ASSERTIONS_DISABLE=y
 
-# Bluetooth
-CONFIG_BT_ENABLED=y
-CONFIG_BT_NIMBLE_ENABLED=y
-
 ## NimBLE Options
 CONFIG_BT_NIMBLE_MAX_CONNECTIONS=1
 CONFIG_BT_NIMBLE_MAX_BONDS=2

diff --git a/examples/door_lock/sdkconfig.defaults.esp32c3 b/examples/door_lock/sdkconfig.defaults.esp32c3
@@ -1,12 +1,5 @@
 CONFIG_IDF_TARGET="esp32c3"
 
-# Enable OTA Requestor
-CONFIG_ENABLE_OTA_REQUESTOR=y
-
-# Disable AP
-CONFIG_ENABLE_WIFI_STATION=y
-CONFIG_ENABLE_WIFI_AP=n
-
 # ESP32-C3-DevKitC-02 Settings
 # Buttons
 CONFIG_BSP_BUTTONS_NUM=1