Skip to content

Commit 70c473c

Browse files
DejinChenDejinChen
authored
[ESP32]: Remove the same configs as defaults (project-chip#36940)
* ESP32: Remove the same configs as defaults * resolve comments
1 parent 17ad72e commit 70c473c

28 files changed

+46
-669
lines changed

‎.github/workflows/examples-esp32.yaml

+5-5
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@ jobs:
9393
mv scripts/codegen.py.renamed scripts/codegen.py
9494
mv scripts/tools/zap/generate.py.renamed scripts/tools/zap/generate.py
9595
- name: Build example All Clusters App(Target:ESP32C3)
96-
run: scripts/examples/esp_example.sh all-clusters-app sdkconfig.defaults.esp32c3 esp32c3
96+
run: scripts/examples/esp_example.sh all-clusters-app sdkconfig.defaults esp32c3
9797
- name: Build example All Clusters App(Target:ESP32)
9898
run: |
9999
./scripts/run_in_build_env.sh \
@@ -114,10 +114,10 @@ jobs:
114114
/tmp/bloat_reports/
115115
116116
- name: Build example Lighting App (Target:ESP32H2)
117-
run: scripts/examples/esp_example.sh lighting-app sdkconfig.defaults.esp32h2 esp32h2
117+
run: scripts/examples/esp_example.sh lighting-app sdkconfig.defaults esp32h2
118118

119119
- name: Build example Lighting App (Target:ESP32C6)
120-
run: scripts/examples/esp_example.sh lighting-app sdkconfig.defaults.esp32c6 esp32c6
120+
run: scripts/examples/esp_example.sh lighting-app sdkconfig.defaults esp32c6
121121

122122
- name: Uploading Size Reports
123123
uses: ./.github/actions/upload-size-reports
@@ -163,7 +163,7 @@ jobs:
163163
run: scripts/examples/esp_example.sh ota-provider-app sdkconfig.defaults
164164

165165
- name: Build example Light Switch App (Target:ESP32C3)
166-
run: scripts/examples/esp_example.sh light-switch-app sdkconfig.defaults.esp32c3 esp32c3
166+
run: scripts/examples/esp_example.sh light-switch-app sdkconfig.defaults esp32c3
167167

168168
- name: Build example Lighting App (external platform)
169169
run: scripts/examples/esp_example.sh lighting-app sdkconfig.ext_plat.defaults
@@ -178,4 +178,4 @@ jobs:
178178
run: scripts/examples/esp_example.sh pigweed-app sdkconfig.defaults
179179

180180
- name: Build example Lock App (Target:ESP32C6)
181-
run: scripts/examples/esp_example.sh lock-app sdkconfig.defaults.esp32c6 esp32c6
181+
run: scripts/examples/esp_example.sh lock-app sdkconfig.defaults esp32c6

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

+3-8
Original file line numberDiff line numberDiff line change
@@ -19,14 +19,6 @@
1919
# Some useful defaults for the demo app configuration.
2020
#
2121

22-
23-
# Default to 921600 baud when flashing and monitoring device
24-
CONFIG_ESPTOOLPY_BAUD_921600B=y
25-
CONFIG_ESPTOOLPY_BAUD=921600
26-
CONFIG_ESPTOOLPY_COMPRESSED=y
27-
CONFIG_ESPTOOLPY_MONITOR_BAUD_115200B=y
28-
CONFIG_ESPTOOLPY_MONITOR_BAUD=115200
29-
3022
#enable BT
3123
CONFIG_BT_ENABLED=y
3224
CONFIG_BT_NIMBLE_ENABLED=y
@@ -74,3 +66,6 @@ CONFIG_FREERTOS_PLACE_FUNCTIONS_INTO_FLASH=y
7466
CONFIG_LWIP_IPV6_NUM_ADDRESSES=6
7567

7668
CONFIG_MAX_GROUP_ENDPOINTS_PER_FABRIC=3
69+
70+
# Enable OTA Requestor
71+
CONFIG_ENABLE_OTA_REQUESTOR=y

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

-54
Original file line numberDiff line numberDiff line change
@@ -1,55 +1 @@
1-
#
2-
# Copyright (c) 2020 Project CHIP Authors
3-
# Copyright (c) 2018 Nest Labs, Inc.
4-
# All rights reserved.
5-
#
6-
# Licensed under the Apache License, Version 2.0 (the "License");
7-
# you may not use this file except in compliance with the License.
8-
# You may obtain a copy of the License at
9-
#
10-
# http://www.apache.org/licenses/LICENSE-2.0
11-
#
12-
# Unless required by applicable law or agreed to in writing, software
13-
# distributed under the License is distributed on an "AS IS" BASIS,
14-
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
15-
# See the License for the specific language governing permissions and
16-
# limitations under the License.
17-
#
18-
# Description:
19-
# CI uses this to select the ESP32C3-DevKitM.
20-
#
211
CONFIG_IDF_TARGET="esp32c3"
22-
CONFIG_IDF_TARGET_ESP32C3=y
23-
CONFIG_DEVICE_TYPE_ESP32_C3_DEVKITM=y
24-
25-
# Default to 921600 baud when flashing and monitoring device
26-
CONFIG_ESPTOOLPY_BAUD_921600B=y
27-
CONFIG_ESPTOOLPY_BAUD=921600
28-
CONFIG_ESPTOOLPY_COMPRESSED=y
29-
CONFIG_ESPTOOLPY_MONITOR_BAUD_115200B=y
30-
CONFIG_ESPTOOLPY_MONITOR_BAUD=115200
31-
32-
#enable BT
33-
CONFIG_BT_ENABLED=y
34-
CONFIG_BT_NIMBLE_ENABLED=y
35-
36-
#enable lwip ipv6 autoconfig
37-
CONFIG_LWIP_IPV6_AUTOCONFIG=y
38-
39-
# Use a custom partition table
40-
CONFIG_PARTITION_TABLE_CUSTOM=y
41-
CONFIG_PARTITION_TABLE_CUSTOM_FILENAME="partitions.csv"
42-
43-
#enable lwIP route hooks
44-
CONFIG_LWIP_HOOK_IP6_ROUTE_DEFAULT=y
45-
CONFIG_LWIP_HOOK_ND6_GET_GW_DEFAULT=y
46-
47-
# Serial Flasher config
48-
CONFIG_ESPTOOLPY_FLASHSIZE_4MB=y
49-
CONFIG_ESPTOOLPY_FLASHSIZE="4MB"
50-
51-
# Enable HKDF in mbedtls
52-
CONFIG_MBEDTLS_HKDF_C=y
53-
54-
# Move functions from IRAM to flash
55-
CONFIG_FREERTOS_PLACE_FUNCTIONS_INTO_FLASH=y

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

-62
Original file line numberDiff line numberDiff line change
@@ -1,63 +1 @@
11
CONFIG_IDF_TARGET="esp32c6"
2-
3-
# Default to 921600 baud when flashing and monitoring device
4-
CONFIG_ESPTOOLPY_BAUD_921600B=y
5-
CONFIG_ESPTOOLPY_BAUD=921600
6-
CONFIG_ESPTOOLPY_COMPRESSED=y
7-
CONFIG_ESPTOOLPY_FLASHMODE_QIO=y
8-
CONFIG_ESPTOOLPY_FLASHFREQ_40M=y
9-
CONFIG_ESPTOOLPY_FLASHFREQ="40m"
10-
CONFIG_ESPTOOLPY_MONITOR_BAUD_115200B=y
11-
CONFIG_ESPTOOLPY_MONITOR_BAUD=115200
12-
13-
# libsodium
14-
CONFIG_LIBSODIUM_USE_MBEDTLS_SHA=y
15-
16-
17-
# NIMBLE
18-
CONFIG_BT_ENABLED=y
19-
CONFIG_BT_NIMBLE_ENABLED=y
20-
CONFIG_BT_NIMBLE_EXT_ADV=n
21-
CONFIG_BT_NIMBLE_HCI_EVT_BUF_SIZE=70
22-
CONFIG_USE_BLE_ONLY_FOR_COMMISSIONING=y
23-
24-
# Disable OpenThread
25-
CONFIG_OPENTHREAD_ENABLED=n
26-
27-
# Disable lwip ipv6 autoconfig
28-
CONFIG_LWIP_IPV6_AUTOCONFIG=y
29-
30-
# Use a custom partition table
31-
CONFIG_PARTITION_TABLE_CUSTOM=y
32-
CONFIG_PARTITION_TABLE_CUSTOM_FILENAME="partitions.csv"
33-
34-
# LwIP config for OpenThread
35-
CONFIG_LWIP_IPV6_NUM_ADDRESSES=8
36-
CONFIG_LWIP_MULTICAST_PING=y
37-
38-
# mbedTLS
39-
CONFIG_MBEDTLS_HARDWARE_AES=n
40-
CONFIG_MBEDTLS_HARDWARE_MPI=n
41-
CONFIG_MBEDTLS_HARDWARE_SHA=n
42-
CONFIG_MBEDTLS_HARDWARE_ECC=y
43-
CONFIG_MBEDTLS_CMAC_C=y
44-
CONFIG_MBEDTLS_KEY_EXCHANGE_ECJPAKE=y
45-
CONFIG_MBEDTLS_ECJPAKE_C=y
46-
47-
# MDNS platform
48-
CONFIG_USE_MINIMAL_MDNS=y
49-
CONFIG_ENABLE_EXTENDED_DISCOVERY=y
50-
51-
# FreeRTOS should use legacy API
52-
CONFIG_FREERTOS_ENABLE_BACKWARD_COMPATIBILITY=y
53-
54-
# Wi-Fi Settings
55-
CONFIG_ENABLE_WIFI_STATION=y
56-
# Enable this to avoid implicit declaration of function 'esp_send_assoc_resp'
57-
CONFIG_ESP_WIFI_SOFTAP_SUPPORT=y
58-
59-
# Enable OTA Requestor
60-
CONFIG_ENABLE_OTA_REQUESTOR=y
61-
62-
# Enable chip shell
63-
CONFIG_ENABLE_CHIP_SHELL=y

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

+1-55
Original file line numberDiff line numberDiff line change
@@ -1,26 +1,4 @@
11
CONFIG_IDF_TARGET="esp32h2"
2-
CONFIG_IDF_TARGET_ESP32H2_BETA_VERSION_2=y
3-
4-
# Default to 921600 baud when flashing and monitoring device
5-
CONFIG_ESPTOOLPY_BAUD_921600B=y
6-
CONFIG_ESPTOOLPY_BAUD=921600
7-
CONFIG_ESPTOOLPY_COMPRESSED=y
8-
CONFIG_ESPTOOLPY_FLASHMODE_QIO=y
9-
CONFIG_ESPTOOLPY_FLASHFREQ_40M=y
10-
CONFIG_ESPTOOLPY_FLASHFREQ="40m"
11-
CONFIG_ESPTOOLPY_MONITOR_BAUD_115200B=y
12-
CONFIG_ESPTOOLPY_MONITOR_BAUD=115200
13-
14-
# libsodium
15-
CONFIG_LIBSODIUM_USE_MBEDTLS_SHA=y
16-
17-
18-
# NIMBLE
19-
CONFIG_BT_ENABLED=y
20-
CONFIG_BT_NIMBLE_ENABLED=y
21-
CONFIG_BT_NIMBLE_EXT_ADV=n
22-
CONFIG_BT_NIMBLE_HCI_EVT_BUF_SIZE=70
23-
CONFIG_USE_BLE_ONLY_FOR_COMMISSIONING=n
242

253
# Enable OpenThread
264
CONFIG_OPENTHREAD_ENABLED=y
@@ -33,45 +11,13 @@ CONFIG_OPENTHREAD_DNS_CLIENT=y
3311
# Disable lwip ipv6 autoconfig
3412
CONFIG_LWIP_IPV6_AUTOCONFIG=n
3513

36-
# Use a custom partition table
37-
CONFIG_PARTITION_TABLE_CUSTOM=y
38-
CONFIG_PARTITION_TABLE_CUSTOM_FILENAME="partitions.csv"
39-
4014
# LwIP config for OpenThread
4115
CONFIG_LWIP_IPV6_NUM_ADDRESSES=8
4216
CONFIG_LWIP_MULTICAST_PING=y
4317

44-
# mbedTLS
45-
CONFIG_MBEDTLS_HARDWARE_AES=n
46-
CONFIG_MBEDTLS_HARDWARE_MPI=n
47-
CONFIG_MBEDTLS_HARDWARE_SHA=n
48-
CONFIG_MBEDTLS_HARDWARE_ECC=y
49-
CONFIG_MBEDTLS_ATCA_HW_ECDSA_SIGN=n
50-
CONFIG_MBEDTLS_ATCA_HW_ECDSA_VERIFY=n
51-
CONFIG_MBEDTLS_CMAC_C=y
52-
CONFIG_MBEDTLS_SSL_PROTO_DTLS=y
53-
CONFIG_MBEDTLS_KEY_EXCHANGE_ECJPAKE=y
54-
55-
# rtc clk for ble
56-
# CONFIG_ESP32H2_RTC_CLK_SRC_EXT_CRYS=y
57-
5818
# MDNS platform
5919
CONFIG_USE_MINIMAL_MDNS=n
6020
CONFIG_ENABLE_EXTENDED_DISCOVERY=y
6121

62-
# FreeRTOS should use legacy API
63-
CONFIG_FREERTOS_ENABLE_BACKWARD_COMPATIBILITY=y
64-
65-
# Disable STA and AP for ESP32H2
22+
# Disable STA for ESP32H2
6623
CONFIG_ENABLE_WIFI_STATION=n
67-
# Enable this to avoid implicit declaration of function 'esp_send_assoc_resp'
68-
CONFIG_ESP_WIFI_SOFTAP_SUPPORT=y
69-
70-
# Enable OTA Requestor
71-
CONFIG_ENABLE_OTA_REQUESTOR=y
72-
73-
# Enable chip shell
74-
CONFIG_ENABLE_CHIP_SHELL=y
75-
76-
# Enable HKDF in mbedtls
77-
CONFIG_MBEDTLS_HKDF_C=y

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

-23
Original file line numberDiff line numberDiff line change
@@ -1,35 +1,12 @@
11
CONFIG_IDF_TARGET="esp32p4"
22

3-
# Flash size and partition
4-
CONFIG_ESPTOOLPY_FLASHSIZE_4MB=y
5-
CONFIG_PARTITION_TABLE_CUSTOM=y
6-
CONFIG_PARTITION_TABLE_CUSTOM_FILENAME="partitions.csv"
7-
83
# Enable BLE Host but use remote controller
9-
CONFIG_BT_ENABLED=y
10-
CONFIG_BT_NIMBLE_ENABLED=y
114
CONFIG_BT_NIMBLE_TRANSPORT_UART=n
125
CONFIG_ESP_ENABLE_BT=y
136

147
# Increase main task stack size
158
CONFIG_ESP_MAIN_TASK_STACK_SIZE=4096
169

17-
# Disable Wi-Fi Soft AP
18-
CONFIG_ESP_WIFI_SOFTAP_SUPPORT=n
19-
20-
# LwIP
21-
CONFIG_LWIP_IPV6_AUTOCONFIG=y
22-
CONFIG_LWIP_IPV6_NUM_ADDRESSES=6
23-
24-
# mbedtls
25-
CONFIG_MBEDTLS_HKDF_C=y
26-
27-
# Matter shell
28-
CONFIG_ENABLE_CHIP_SHELL=y
29-
30-
# OTA requestor
31-
CONFIG_ENABLE_OTA_REQUESTOR=y
32-
3310
# Do not deinit BLE after commissioning
3411
CONFIG_USE_BLE_ONLY_FOR_COMMISSIONING=n
3512

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

-8
Original file line numberDiff line numberDiff line change
@@ -19,14 +19,6 @@
1919
# Some useful defaults for the demo app configuration.
2020
#
2121

22-
23-
# Default to 921600 baud when flashing and monitoring device
24-
CONFIG_ESPTOOLPY_BAUD_921600B=y
25-
CONFIG_ESPTOOLPY_BAUD=921600
26-
CONFIG_ESPTOOLPY_COMPRESSED=y
27-
CONFIG_ESPTOOLPY_MONITOR_BAUD_115200B=y
28-
CONFIG_ESPTOOLPY_MONITOR_BAUD=115200
29-
3022
#enable BT
3123
CONFIG_BT_ENABLED=y
3224
CONFIG_BT_NIMBLE_ENABLED=y

‎examples/bridge-app/esp32/sdkconfig.defaults

-7
Original file line numberDiff line numberDiff line change
@@ -19,13 +19,6 @@
1919
# Some useful defaults for the demo app configuration.
2020
#
2121

22-
# Default to 921600 baud when flashing and monitoring device
23-
CONFIG_ESPTOOLPY_BAUD_921600B=y
24-
CONFIG_ESPTOOLPY_BAUD=921600
25-
CONFIG_ESPTOOLPY_COMPRESSED=y
26-
CONFIG_ESPTOOLPY_MONITOR_BAUD_115200B=y
27-
CONFIG_ESPTOOLPY_MONITOR_BAUD=115200
28-
2922
#enable BT
3023
CONFIG_BT_ENABLED=y
3124
CONFIG_BT_NIMBLE_ENABLED=y

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

+3-7
Original file line numberDiff line numberDiff line change
@@ -18,13 +18,6 @@
1818
# Some useful defaults for the demo app configuration.
1919
#
2020

21-
# Default to 921600 baud when flashing and monitoring device
22-
CONFIG_ESPTOOLPY_BAUD_921600B=y
23-
CONFIG_ESPTOOLPY_BAUD=921600
24-
CONFIG_ESPTOOLPY_COMPRESSED=y
25-
CONFIG_ESPTOOLPY_MONITOR_BAUD_115200B=y
26-
CONFIG_ESPTOOLPY_MONITOR_BAUD=115200
27-
2821
#enable BT
2922
CONFIG_BT_ENABLED=y
3023
CONFIG_BT_NIMBLE_ENABLED=y
@@ -85,3 +78,6 @@ CONFIG_CHIP_DEVICE_CONFIG_ENABLE_ENERGY_REPORTING_TRIGGER=y
8578

8679
# Ensure kPowerForecastReporting (PFR) is set in the DeviceEnergyManagement::Feature attribute. Note cannot set PFR and SFR.
8780
CONFIG_DEM_SUPPORT_POWER_FORECAST_REPORTING=y
81+
82+
# Enable OTA Requestor
83+
CONFIG_ENABLE_OTA_REQUESTOR=y

0 commit comments

Comments
 (0)