ESP32: Remove the same configs as defaults

.github/workflows/examples-esp32.yaml

@@ -93,7 +93,7 @@ jobs:
                   mv scripts/codegen.py.renamed scripts/codegen.py
                   mv scripts/tools/zap/generate.py.renamed scripts/tools/zap/generate.py
             - name: Build example All Clusters App(Target:ESP32C3)
-              run: scripts/examples/esp_example.sh all-clusters-app sdkconfig.defaults.esp32c3 esp32c3
+              run: scripts/examples/esp_example.sh all-clusters-app sdkconfig.defaults esp32c3
             - name: Build example All Clusters App(Target:ESP32)
               run: |
                   ./scripts/run_in_build_env.sh \
@@ -114,10 +114,10 @@ jobs:
                      /tmp/bloat_reports/
 
             - name: Build example Lighting App (Target:ESP32H2)
-              run: scripts/examples/esp_example.sh lighting-app sdkconfig.defaults.esp32h2 esp32h2
+              run: scripts/examples/esp_example.sh lighting-app sdkconfig.defaults esp32h2
 
             - name: Build example Lighting App (Target:ESP32C6)
-              run: scripts/examples/esp_example.sh lighting-app sdkconfig.defaults.esp32c6 esp32c6
+              run: scripts/examples/esp_example.sh lighting-app sdkconfig.defaults esp32c6
 
             - name: Uploading Size Reports
               uses: ./.github/actions/upload-size-reports
@@ -163,7 +163,7 @@ jobs:
               run: scripts/examples/esp_example.sh ota-provider-app sdkconfig.defaults
 
             - name: Build example Light Switch App (Target:ESP32C3)
-              run: scripts/examples/esp_example.sh light-switch-app sdkconfig.defaults.esp32c3 esp32c3
+              run: scripts/examples/esp_example.sh light-switch-app sdkconfig.defaults esp32c3
 
             - name: Build example Lighting App (external platform)
               run: scripts/examples/esp_example.sh lighting-app sdkconfig.ext_plat.defaults
@@ -178,4 +178,4 @@ jobs:
               run: scripts/examples/esp_example.sh pigweed-app sdkconfig.defaults
 
             - name: Build example Lock App (Target:ESP32C6)
-              run: scripts/examples/esp_example.sh lock-app sdkconfig.defaults.esp32c6 esp32c6
+              run: scripts/examples/esp_example.sh lock-app sdkconfig.defaults esp32c6

examples/all-clusters-app/esp32/sdkconfig.defaults

@@ -19,14 +19,6 @@
 #      Some useful defaults for the demo app configuration.
 #
 
-
-# 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
-
 #enable BT
 CONFIG_BT_ENABLED=y
 CONFIG_BT_NIMBLE_ENABLED=y
@@ -74,3 +66,6 @@ CONFIG_FREERTOS_PLACE_FUNCTIONS_INTO_FLASH=y
 CONFIG_LWIP_IPV6_NUM_ADDRESSES=6
 
 CONFIG_MAX_GROUP_ENDPOINTS_PER_FABRIC=3
+
+# Enable OTA Requestor
+CONFIG_ENABLE_OTA_REQUESTOR=y

examples/all-clusters-app/esp32/sdkconfig.defaults.esp32c3

@@ -1,55 +1 @@
-#
-#    Copyright (c) 2020 Project CHIP Authors
-#    Copyright (c) 2018 Nest Labs, Inc.
-#    All rights reserved.
-#
-#    Licensed under the Apache License, Version 2.0 (the "License");
-#    you may not use this file except in compliance with the License.
-#    You may obtain a copy of the License at
-#
-#        http://www.apache.org/licenses/LICENSE-2.0
-#
-#    Unless required by applicable law or agreed to in writing, software
-#    distributed under the License is distributed on an "AS IS" BASIS,
-#    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-#    See the License for the specific language governing permissions and
-#    limitations under the License.
-#
-#    Description:
-#      CI uses this to select the ESP32C3-DevKitM.
-#
 CONFIG_IDF_TARGET="esp32c3"
-CONFIG_IDF_TARGET_ESP32C3=y
-CONFIG_DEVICE_TYPE_ESP32_C3_DEVKITM=y
-
-# 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
-
-#enable BT
-CONFIG_BT_ENABLED=y
-CONFIG_BT_NIMBLE_ENABLED=y
-
-#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 lwIP route hooks
-CONFIG_LWIP_HOOK_IP6_ROUTE_DEFAULT=y
-CONFIG_LWIP_HOOK_ND6_GET_GW_DEFAULT=y
-
-# Serial Flasher config
-CONFIG_ESPTOOLPY_FLASHSIZE_4MB=y
-CONFIG_ESPTOOLPY_FLASHSIZE="4MB"
-
-# Enable HKDF in mbedtls
-CONFIG_MBEDTLS_HKDF_C=y
-
-# Move functions from IRAM to flash
-CONFIG_FREERTOS_PLACE_FUNCTIONS_INTO_FLASH=y

examples/all-clusters-app/esp32/sdkconfig.defaults.esp32c6

@@ -1,63 +1 @@
 CONFIG_IDF_TARGET="esp32c6"
-
-# Default to 921600 baud when flashing and monitoring device
-CONFIG_ESPTOOLPY_BAUD_921600B=y
-CONFIG_ESPTOOLPY_BAUD=921600
-CONFIG_ESPTOOLPY_COMPRESSED=y
-CONFIG_ESPTOOLPY_FLASHMODE_QIO=y
-CONFIG_ESPTOOLPY_FLASHFREQ_40M=y
-CONFIG_ESPTOOLPY_FLASHFREQ="40m"
-CONFIG_ESPTOOLPY_MONITOR_BAUD_115200B=y
-CONFIG_ESPTOOLPY_MONITOR_BAUD=115200
-
-# 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
-
-# Disable OpenThread
-CONFIG_OPENTHREAD_ENABLED=n
-
-# 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"
-
-# LwIP config for OpenThread
-CONFIG_LWIP_IPV6_NUM_ADDRESSES=8
-CONFIG_LWIP_MULTICAST_PING=y
-
-# mbedTLS
-CONFIG_MBEDTLS_HARDWARE_AES=n
-CONFIG_MBEDTLS_HARDWARE_MPI=n
-CONFIG_MBEDTLS_HARDWARE_SHA=n
-CONFIG_MBEDTLS_HARDWARE_ECC=y
-CONFIG_MBEDTLS_CMAC_C=y
-CONFIG_MBEDTLS_KEY_EXCHANGE_ECJPAKE=y
-CONFIG_MBEDTLS_ECJPAKE_C=y
-
-# MDNS platform
-CONFIG_USE_MINIMAL_MDNS=y
-CONFIG_ENABLE_EXTENDED_DISCOVERY=y
-
-# FreeRTOS should use legacy API
-CONFIG_FREERTOS_ENABLE_BACKWARD_COMPATIBILITY=y
-
-# Wi-Fi Settings
-CONFIG_ENABLE_WIFI_STATION=y
-# Enable this to avoid implicit declaration of function 'esp_send_assoc_resp'
-CONFIG_ESP_WIFI_SOFTAP_SUPPORT=y
-
-# Enable OTA Requestor
-CONFIG_ENABLE_OTA_REQUESTOR=y
-
-# Enable chip shell
-CONFIG_ENABLE_CHIP_SHELL=y

examples/all-clusters-app/esp32/sdkconfig.defaults.esp32h2

@@ -1,26 +1,4 @@
 CONFIG_IDF_TARGET="esp32h2"
-CONFIG_IDF_TARGET_ESP32H2_BETA_VERSION_2=y
-
-# Default to 921600 baud when flashing and monitoring device
-CONFIG_ESPTOOLPY_BAUD_921600B=y
-CONFIG_ESPTOOLPY_BAUD=921600
-CONFIG_ESPTOOLPY_COMPRESSED=y
-CONFIG_ESPTOOLPY_FLASHMODE_QIO=y
-CONFIG_ESPTOOLPY_FLASHFREQ_40M=y
-CONFIG_ESPTOOLPY_FLASHFREQ="40m"
-CONFIG_ESPTOOLPY_MONITOR_BAUD_115200B=y
-CONFIG_ESPTOOLPY_MONITOR_BAUD=115200
-
-# 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
 
 # Enable OpenThread
 CONFIG_OPENTHREAD_ENABLED=y
@@ -33,45 +11,13 @@ CONFIG_OPENTHREAD_DNS_CLIENT=y
 # 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.csv"
-
 # LwIP config for OpenThread
 CONFIG_LWIP_IPV6_NUM_ADDRESSES=8
 CONFIG_LWIP_MULTICAST_PING=y
 
-# mbedTLS
-CONFIG_MBEDTLS_HARDWARE_AES=n
-CONFIG_MBEDTLS_HARDWARE_MPI=n
-CONFIG_MBEDTLS_HARDWARE_SHA=n
-CONFIG_MBEDTLS_HARDWARE_ECC=y
-CONFIG_MBEDTLS_ATCA_HW_ECDSA_SIGN=n
-CONFIG_MBEDTLS_ATCA_HW_ECDSA_VERIFY=n
-CONFIG_MBEDTLS_CMAC_C=y
-CONFIG_MBEDTLS_SSL_PROTO_DTLS=y
-CONFIG_MBEDTLS_KEY_EXCHANGE_ECJPAKE=y
-
-# rtc clk for ble
-# CONFIG_ESP32H2_RTC_CLK_SRC_EXT_CRYS=y
-
 # MDNS platform
 CONFIG_USE_MINIMAL_MDNS=n
 CONFIG_ENABLE_EXTENDED_DISCOVERY=y
 
-# FreeRTOS should use legacy API
-CONFIG_FREERTOS_ENABLE_BACKWARD_COMPATIBILITY=y
-
-# Disable STA and AP for ESP32H2
+# Disable STA for ESP32H2
 CONFIG_ENABLE_WIFI_STATION=n
-# Enable this to avoid implicit declaration of function 'esp_send_assoc_resp'
-CONFIG_ESP_WIFI_SOFTAP_SUPPORT=y
-
-# Enable OTA Requestor
-CONFIG_ENABLE_OTA_REQUESTOR=y
-
-# Enable chip shell
-CONFIG_ENABLE_CHIP_SHELL=y
-
-# Enable HKDF in mbedtls
-CONFIG_MBEDTLS_HKDF_C=y

examples/all-clusters-app/esp32/sdkconfig.defaults.esp32p4

@@ -1,35 +1,12 @@
 CONFIG_IDF_TARGET="esp32p4"
 
-# Flash size and partition
-CONFIG_ESPTOOLPY_FLASHSIZE_4MB=y
-CONFIG_PARTITION_TABLE_CUSTOM=y
-CONFIG_PARTITION_TABLE_CUSTOM_FILENAME="partitions.csv"
-
 # Enable BLE Host but use remote controller
-CONFIG_BT_ENABLED=y
-CONFIG_BT_NIMBLE_ENABLED=y
 CONFIG_BT_NIMBLE_TRANSPORT_UART=n
 CONFIG_ESP_ENABLE_BT=y
 
 # Increase main task stack size
 CONFIG_ESP_MAIN_TASK_STACK_SIZE=4096
 
-# Disable Wi-Fi Soft AP
-CONFIG_ESP_WIFI_SOFTAP_SUPPORT=n
-
-# LwIP
-CONFIG_LWIP_IPV6_AUTOCONFIG=y
-CONFIG_LWIP_IPV6_NUM_ADDRESSES=6
-
-# mbedtls
-CONFIG_MBEDTLS_HKDF_C=y
-
-# Matter shell
-CONFIG_ENABLE_CHIP_SHELL=y
-
-# OTA requestor
-CONFIG_ENABLE_OTA_REQUESTOR=y
-
 # Do not deinit BLE after commissioning
 CONFIG_USE_BLE_ONLY_FOR_COMMISSIONING=n
 

examples/all-clusters-minimal-app/esp32/sdkconfig.defaults

@@ -19,14 +19,6 @@
 #      Some useful defaults for the demo app configuration.
 #
 
-
-# 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
-
 #enable BT
 CONFIG_BT_ENABLED=y
 CONFIG_BT_NIMBLE_ENABLED=y

examples/bridge-app/esp32/sdkconfig.defaults

@@ -19,13 +19,6 @@
 #      Some useful defaults for the demo app configuration.
 #
 
-# 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
-
 #enable BT
 CONFIG_BT_ENABLED=y
 CONFIG_BT_NIMBLE_ENABLED=y

examples/energy-management-app/esp32/sdkconfig.defaults

@@ -18,13 +18,6 @@
 #      Some useful defaults for the demo app configuration.
 #
 
-# 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
-
 #enable BT
 CONFIG_BT_ENABLED=y
 CONFIG_BT_NIMBLE_ENABLED=y
@@ -85,3 +78,6 @@ CONFIG_CHIP_DEVICE_CONFIG_ENABLE_ENERGY_REPORTING_TRIGGER=y
 
 # Ensure kPowerForecastReporting (PFR) is set in the DeviceEnergyManagement::Feature attribute. Note cannot set PFR and SFR.
 CONFIG_DEM_SUPPORT_POWER_FORECAST_REPORTING=y
+
+# Enable OTA Requestor
+CONFIG_ENABLE_OTA_REQUESTOR=y