Skip to content

Commit 4f2af3f

Browse files
committed
Fix Configurations for common, esp32, and esp32s3
1 parent 81f7e4b commit 4f2af3f

File tree

3 files changed

+89
-138
lines changed

3 files changed

+89
-138
lines changed

configs/defconfig.common

Lines changed: 74 additions & 92 deletions
Original file line numberDiff line numberDiff line change
@@ -1,110 +1,104 @@
1+
# CONFIG_LWIP_DEBUG=y
2+
# CONFIG_LWIP_DEBUG_ESP_LOG is not set
3+
# CONFIG_LWIP_TCP_DEBUG=y
4+
# CONFIG_MBEDTLS_DEBUG=y
5+
CONFIG_LWIP_TCPIP_CORE_LOCKING=y
6+
CONFIG_MBEDTLS_ASYMMETRIC_CONTENT_LEN=y
7+
CONFIG_MBEDTLS_SSL_IN_CONTENT_LEN=8192
8+
# CONFIG_MBEDTLS_SSL_OUT_CONTENT_LEN is not set (default 4096)
9+
CONFIG_MBEDTLS_SSL_MAX_CONTENT_LEN=8192
10+
CONFIG_MBEDTLS_SSL_VARIABLE_BUFFER_LENGTH=y
11+
112
CONFIG_AUTOSTART_ARDUINO=y
213
# CONFIG_WS2812_LED_ENABLE is not set
3-
CONFIG_APP_BUILD_TYPE_APP_2NDBOOT=y
4-
CONFIG_APP_REPRODUCIBLE_BUILD=y
5-
CONFIG_COMPILER_HIDE_PATHS_MACROS=y
6-
CONFIG_APP_EXCLUDE_PROJECT_VER_VAR=y
7-
CONFIG_APP_EXCLUDE_PROJECT_NAME_VAR=y
8-
# CONFIG_APP_COMPILE_TIME_DATE is not set
9-
CONFIG_BOOTLOADER_LOG_LEVEL_NONE=y
10-
CONFIG_BOOT_ROM_LOG_ALWAYS_OFF=y
11-
CONFIG_BOOTLOADER_SKIP_VALIDATE_ALWAYS=y
12-
CONFIG_ARDUHAL_LOG_DEFAULT_LEVEL_NONE=y
13-
CONFIG_I2S_SUPPRESS_DEPRECATE_WARN=y
14-
CONFIG_RMT_SUPPRESS_DEPRECATE_WARN=y
15-
CONFIG_TEMP_SENSOR_SUPPRESS_DEPRECATE_WARN=y
16-
CONFIG_BOOTLOADER_COMPILER_OPTIMIZATION_SIZE=y
14+
15+
16+
CONFIG_ARDUHAL_ESP_LOG=y
17+
CONFIG_BOOTLOADER_APP_ROLLBACK_ENABLE=y
18+
CONFIG_BOOTLOADER_SKIP_VALIDATE_IN_DEEP_SLEEP=y
19+
CONFIG_BT_BLE_BLUFI_ENABLE=y
20+
CONFIG_BT_BLE_42_FEATURES_SUPPORTED=y
21+
CONFIG_BT_BTC_TASK_STACK_SIZE=8192
22+
CONFIG_BT_BTU_TASK_STACK_SIZE=8192
23+
CONFIG_BLE_MESH=y
1724
CONFIG_COMPILER_OPTIMIZATION_SIZE=y
18-
CONFIG_COMPILER_OPTIMIZATION_ASSERTIONS_DISABLE=y
19-
CONFIG_COMPILER_OPTIMIZATION_CHECKS_SILENT=y
20-
CONFIG_COMPILER_STACK_CHECK_MODE_NONE=y
25+
# CONFIG_COMPILER_OPTIMIZATION_ASSERTIONS_DISABLE=y
26+
# CONFIG_COMPILER_OPTIMIZATION_CHECKS_SILENT=y
27+
# CONFIG_COMPILER_STACK_CHECK_MODE_NONE=y
2128
# CONFIG_COMPILER_WARN_WRITE_STRINGS is not set
2229
# CONFIG_ESP_ERR_TO_NAME_LOOKUP is not set
2330
# CONFIG_ESP_EVENT_POST_FROM_IRAM_ISR is not set
2431
CONFIG_COMPILER_SAVE_RESTORE_LIBCALLS=y
25-
# CONFIG_ESP_HTTPS_SERVER_ENABLE is not set
2632
# CONFIG_ESP_HTTP_CLIENT_ENABLE_HTTPS is not set
27-
# CONFIG_ESP_HTTP_CLIENT_ENABLE_BASIC_AUTH is not set
2833
CONFIG_RINGBUF_PLACE_FUNCTIONS_INTO_FLASH=y
2934
CONFIG_ESP_SYSTEM_ESP32_SRAM1_REGION_AS_IRAM=y
35+
36+
CONFIG_COMPILER_CXX_EXCEPTIONS=y
37+
CONFIG_COMPILER_STACK_CHECK_MODE_NORM=y
38+
CONFIG_COMPILER_WARN_WRITE_STRINGS=y
39+
CONFIG_ESP_HTTPS_SERVER_ENABLE=y
40+
CONFIG_ESP_HTTP_CLIENT_ENABLE_BASIC_AUTH=y
3041
CONFIG_ESP_INT_WDT_TIMEOUT_MS=300
3142
CONFIG_ESP_IPC_TASK_STACK_SIZE=1024
3243
CONFIG_ESP_MAIN_TASK_STACK_SIZE=4096
3344
CONFIG_ESP_SYSTEM_EVENT_TASK_STACK_SIZE=2048
3445
CONFIG_ESP_TASK_WDT_PANIC=y
3546
CONFIG_ESP_TIMER_TASK_STACK_SIZE=4096
3647
CONFIG_ESPTOOLPY_FLASHSIZE_4MB=y
37-
CONFIG_ESPTOOLPY_HEADER_FLASHSIZE_UPDATE=y
38-
# CONFIG_ESP_WIFI_FTM_ENABLE is not set
48+
CONFIG_ESP_WIFI_FTM_ENABLE=y
3949
CONFIG_ESP_WIFI_STATIC_RX_BUFFER_NUM=8
4050
CONFIG_ESP_WIFI_STATIC_TX_BUFFER_NUM=8
4151
CONFIG_ESP_WIFI_CACHE_TX_BUFFER_NUM=16
42-
# CONFIG_ESP_WIFI_CSI_ENABLED is not set
52+
CONFIG_ESP_WIFI_CSI_ENABLED=y
4353
CONFIG_ESP_WIFI_ENABLE_WPA3_SAE=y
44-
CONFIG_ESP_WIFI_ENABLE_SAE_PK=y
45-
# CONFIG_ESP_WIFI_ENTERPRISE_SUPPORT is not set
46-
CONFIG_ESP_WIFI_MBEDTLS_TLS_CLIENT=y
47-
# CONFIG_ESP_WIFI_SOFTAP_SAE_SUPPORT is not set
48-
# CONFIG_ESP_WIFI_ENABLE_WPA3_OWE_STA is not set
49-
CONFIG_ESP_WIFI_ESPNOW_MAX_ENCRYPT_NUM=0
50-
# CONFIG_ESP_WIFI_MBEDTLS_CRYPTO is not set
5154
# CONFIG_ESP_WIFI_IRAM_OPT is not set
5255
# CONFIG_ESP_WIFI_RX_IRAM_OPT is not set
53-
CONFIG_ETH_TRANSMIT_MUTEX=y
5456
CONFIG_ETH_SPI_ETHERNET_DM9051=y
5557
CONFIG_ETH_SPI_ETHERNET_W5500=y
5658
CONFIG_ETH_SPI_ETHERNET_KSZ8851SNL=y
5759
CONFIG_FATFS_CODEPAGE_850=y
5860
CONFIG_FATFS_LFN_STACK=y
5961
# CONFIG_FATFS_API_ENCODING_ANSI_OEM is not set
6062
CONFIG_FATFS_API_ENCODING_UTF_8=y
63+
CONFIG_FATFS_USE_LABEL=y
6164
# CONFIG_FMB_CONTROLLER_SLAVE_ID_SUPPORT is not set
6265
CONFIG_FMB_TIMER_PORT_ENABLED=y
6366
CONFIG_FREERTOS_HZ=1000
64-
# CONFIG_FREERTOS_ENABLE_BACKWARD_COMPATIBILITY is not set
67+
CONFIG_FREERTOS_ENABLE_BACKWARD_COMPATIBILITY=y
6568
# CONFIG_FREERTOS_ASSERT_ON_UNTESTED_FUNCTION is not set
66-
# CONFIG_FREERTOS_ENABLE_TASK_SNAPSHOT is not set
67-
CONFIG_FREERTOS_IDLE_TASK_STACKSIZE=2304
68-
# CONFIG_FREERTOS_FPU_IN_ISR is not set
69-
CONFIG_FREERTOS_PLACE_FUNCTIONS_INTO_FLASH=y
70-
CONFIG_FREERTOS_PLACE_SNAPSHOT_FUNS_INTO_FLASH=y
71-
CONFIG_HAL_ASSERTION_DISABLE=y
69+
CONFIG_FREERTOS_IDLE_TASK_STACKSIZE=1024
7270
CONFIG_HEAP_POISONING_LIGHT=y
7371
CONFIG_HTTPD_MAX_REQ_HDR_LEN=1024
7472
CONFIG_HTTPD_WS_SUPPORT=y
75-
CONFIG_LOG_DEFAULT_LEVEL_NONE=y
7673
# CONFIG_LOG_COLORS is not set
77-
CONFIG_LWIP_LOCAL_HOSTNAME="tasmota"
78-
CONFIG_LWIP_MAX_SOCKETS=16
79-
CONFIG_LWIP_SO_RCVBUF=y
80-
CONFIG_LWIP_IP_FORWARD=y
81-
CONFIG_LWIP_IPV4_NAPT=y
74+
# CONFIG_LWIP_LOCAL_HOSTNAME="tasmota"
75+
CONFIG_LWIP_ETHARP_TRUST_IP_MAC=y
8276
# CONFIG_LWIP_DHCP_DOES_ARP_CHECK is not set
77+
CONFIG_LWIP_SO_RCVBUF=y
8378
CONFIG_LWIP_TCP_SYNMAXRTX=6
8479
CONFIG_LWIP_TCP_MSS=1436
8580
CONFIG_LWIP_TCP_RTO_TIME=3000
86-
CONFIG_LWIP_TCP_MSL=6000
87-
CONFIG_LWIP_TCP_FIN_WAIT_TIMEOUT=2000
88-
CONFIG_LWIP_TCPIP_TASK_STACK_SIZE=2560
81+
CONFIG_LWIP_TCPIP_TASK_STACK_SIZE=4096
8982
CONFIG_LWIP_TCPIP_TASK_AFFINITY_CPU0=y
90-
CONFIG_LWIP_IPV6_AUTOCONFIG=y
91-
CONFIG_LWIP_IPV6_RDNSS_MAX_DNS_SERVERS=2
9283
CONFIG_LWIP_MAX_SOCKETS=16
84+
CONFIG_LWIP_IP_FORWARD=y
85+
CONFIG_LWIP_IPV4_NAPT=y
9386
CONFIG_LWIP_DHCP_RESTORE_LAST_IP=n
9487
CONFIG_LWIP_DHCP_OPTIONS_LEN=128
95-
CONFIG_LWIP_SNTP_MAX_SERVERS=1
96-
# CONFIG_LWIP_DHCP_GET_NTP_SRV is not set
88+
CONFIG_LWIP_SNTP_MAX_SERVERS=3
9789
CONFIG_LWIP_SNTP_UPDATE_DELAY=10800000
98-
CONFIG_LWIP_TCPIP_RECVMBOX_SIZE=48
99-
CONFIG_LWIP_TCP_RECVMBOX_SIZE=16
100-
CONFIG_LWIP_UDP_RECVMBOX_SIZE=64
101-
CONFIG_NEWLIB_NANO_FORMAT=y
102-
# CONFIG_DAC_DMA_AUTO_16BIT_ALIGN is not set
103-
104-
CONFIG_MBEDTLS_CERTIFICATE_BUNDLE=y
105-
CONFIG_MBEDTLS_CERTIFICATE_BUNDLE_DEFAULT_FULL=y
106-
CONFIG_MBEDTLS_TLS_DISABLED=y
107-
# CONFIG_MBEDTLS_ASYMMETRIC_CONTENT_LEN is not set
90+
CONFIG_LWIP_DHCP_GET_NTP_SRV=y
91+
CONFIG_LWIP_IPV6_AUTOCONFIG=y
92+
CONFIG_LWIP_IPV6_DHCP6=y
93+
CONFIG_LWIP_IPV6_RDNSS_MAX_DNS_SERVERS=2
94+
CONFIG_LWIP_PPP_SUPPORT=y
95+
CONFIG_LWIP_PPP_NOTIFY_PHASE_SUPPORT=y
96+
CONFIG_LWIP_PPP_PAP_SUPPORT=y
97+
CONFIG_LWIP_PPP_ENABLE_IPV6=n
98+
CONFIG_MBEDTLS_PSK_MODES=y
99+
CONFIG_MBEDTLS_KEY_EXCHANGE_PSK=y
100+
CONFIG_MBEDTLS_CAMELLIA_C=y
101+
CONFIG_MBEDTLS_SSL_PROTO_DTLS=y
108102
CONFIG_MBEDTLS_CERTIFICATE_BUNDLE_MAX_CERTS=10
109103
# CONFIG_MBEDTLS_SSL_KEEP_PEER_CERTIFICATE is not set
110104
# CONFIG_MBEDTLS_PKCS7_C is not set
@@ -114,7 +108,6 @@ CONFIG_MBEDTLS_CERTIFICATE_BUNDLE_MAX_CERTS=10
114108
# Symmetric Ciphers
115109
#
116110
CONFIG_MBEDTLS_AES_C=y
117-
# CONFIG_MBEDTLS_CAMELLIA_C is not set
118111
# CONFIG_MBEDTLS_DES_C is not set
119112
# CONFIG_MBEDTLS_BLOWFISH_C is not set
120113
# CONFIG_MBEDTLS_XTEA_C is not set
@@ -186,45 +179,34 @@ CONFIG_MBEDTLS_ECP_DP_SECP256R1_ENABLED=y
186179
# CONFIG_MBEDTLS_ECP_FIXED_POINT_OPTIM is not set
187180
# CONFIG_MBEDTLS_ECP_NIST_OPTIM is not set
188181
# CONFIG_MBEDTLS_SSL_PROTO_GMTSSL1_1 is not set
189-
# CONFIG_MBEDTLS_SSL_PROTO_DTLS is not set
190182

191183
CONFIG_OPENSSL_ASSERT_DO_NOTHING=y
192184
CONFIG_PTHREAD_TASK_STACK_SIZE_DEFAULT=2048
193-
CONFIG_SPI_FLASH_DANGEROUS_WRITE_ALLOWED=y
194-
# CONFIG_SPI_FLASH_ENABLE_ENCRYPTED_READ_WRITE is not set
195185
CONFIG_SPI_FLASH_YIELD_DURING_ERASE=y
196186
CONFIG_SPI_FLASH_ERASE_YIELD_DURATION_MS=10
197187
CONFIG_SPI_FLASH_ERASE_YIELD_TICKS=2
198188
CONFIG_SPI_FLASH_WRITE_CHUNK_SIZE=4096
199-
# CONFIG_UNITY_ENABLE_FLOAT is not set
200-
# CONFIG_UNITY_ENABLE_DOUBLE is not set
201-
# CONFIG_UNITY_ENABLE_IDF_TEST_RUNNER is not set
202-
# CONFIG_USE_WAKENET is not set
203-
# CONFIG_USE_MULTINET is not set
204-
# CONFIG_VFS_SUPPORT_SELECT is not set
205-
# CONFIG_VFS_SUPPRESS_SELECT_DEBUG_OUTPUT is not set
206-
# CONFIG_VFS_SUPPORT_TERMIOS is not set
207189
# CONFIG_SPI_MASTER_ISR_IN_IRAM is not set
208190
# CONFIG_SPI_SLAVE_ISR_IN_IRAM is not set
209191
CONFIG_SPIRAM_MALLOC_ALWAYSINTERNAL=4096
210192
CONFIG_SPIRAM_MALLOC_RESERVE_INTERNAL=0
211-
212-
CONFIG_WIFI_PROV_SCAN_MAX_ENTRIES=1
213-
CONFIG_DSP_MAX_FFT_SIZE_1024=y
214-
215-
CONFIG_LITTLEFS_MAX_PARTITIONS=2
216-
CONFIG_LITTLEFS_MULTIVERSION=y
217-
CONFIG_LITTLEFS_DISK_VERSION_2_0=y
218-
219-
#
220-
# Disable Cameras not used
221-
#
222-
# CONFIG_OV7670_SUPPORT is not set
223-
# CONFIG_OV7725_SUPPORT is not set
224-
# CONFIG_NT99141_SUPPORT is not set
225-
# CONFIG_GC2145_SUPPORT is not set
226-
# CONFIG_GC032A_SUPPORT is not set
227-
# CONFIG_GC0308_SUPPORT is not set
228-
# CONFIG_BF3005_SUPPORT is not set
229-
# CONFIG_BF20A6_SUPPORT is not set
230-
# CONFIG_SC030IOT_SUPPORT is not set
193+
CONFIG_ESP_RMAKER_SKIP_VERSION_CHECK=y
194+
CONFIG_ESP_RMAKER_USER_ID_CHECK=y
195+
CONFIG_ESP_INSIGHTS_ENABLED=y
196+
CONFIG_ESP_INSIGHTS_COREDUMP_ENABLE=n
197+
CONFIG_ESP_INSIGHTS_TRANSPORT_HTTPS=y
198+
CONFIG_DIAG_LOG_DROP_WIFI_LOGS=y
199+
CONFIG_DIAG_ENABLE_METRICS=y
200+
CONFIG_DIAG_ENABLE_HEAP_METRICS=y
201+
CONFIG_DIAG_ENABLE_WIFI_METRICS=y
202+
CONFIG_DIAG_ENABLE_VARIABLES=y
203+
CONFIG_DIAG_ENABLE_NETWORK_VARIABLES=y
204+
CONFIG_ESP_COREDUMP_ENABLE=y
205+
CONFIG_ESP_COREDUMP_ENABLE_TO_FLASH=n
206+
CONFIG_ESP_COREDUMP_DATA_FORMAT_ELF=y
207+
CONFIG_ESP_COREDUMP_CHECKSUM_CRC32=y
208+
CONFIG_ESP_COREDUMP_MAX_TASKS_NUM=64
209+
CONFIG_ESP_COREDUMP_STACK_SIZE=1024
210+
CONFIG_MBEDTLS_DYNAMIC_BUFFER=y
211+
CONFIG_MBEDTLS_DYNAMIC_FREE_PEER_CERT=y
212+
CONFIG_MBEDTLS_DYNAMIC_FREE_CONFIG_DATA=y

configs/defconfig.esp32

Lines changed: 7 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -1,53 +1,20 @@
1-
#
2-
# Bluetooth
3-
#
1+
CONFIG_BTDM_CTRL_MODE_BTDM=y
2+
CONFIG_BTDM_SCAN_DUPL_CACHE_SIZE=20
43
CONFIG_BT_ENABLED=y
5-
CONFIG_BT_STACK_NO_LOG=y
6-
# CONFIG_BT_BLE_42_FEATURES_SUPPORTED is not set
7-
# CONFIG_BLE_MESH is not set
8-
CONFIG_BT_NIMBLE_ENABLED=y
9-
CONFIG_BT_NIMBLE_LOG_LEVEL_NONE=y
10-
CONFIG_BT_NIMBLE_MAX_CONNECTIONS=1
11-
# CONFIG_BT_NIMBLE_NVS_PERSIST is not set
12-
# CONFIG_BT_NIMBLE_CRYPTO_STACK_MBEDTLS is not set
13-
# CONFIG_BT_NIMBLE_LL_CFG_FEAT_LE_2M_PHY is not set
14-
# CONFIG_BT_NIMBLE_LL_CFG_FEAT_LE_CODED_PHY is not set
15-
# CONFIG_BT_NIMBLE_50_FEATURE_SUPPORT is not set
16-
# CONFIG_BTDM_CTRL_MODE_BTDM is not set
17-
# CONFIG_BT_BTC_TASK_STACK_SIZE is not set
18-
# CONFIG_BT_BTU_TASK_STACK_SIZE is not set
4+
CONFIG_BT_A2DP_ENABLE=y
5+
CONFIG_BT_SPP_ENABLED=y
6+
CONFIG_BT_HFP_ENABLE=y
197
CONFIG_BT_STACK_NO_LOG=y
208
CONFIG_BT_BLE_DYNAMIC_ENV_MEMORY=y
21-
22-
CONFIG_ESP_MAC_IGNORE_MAC_CRC_ERROR=y
23-
24-
CONFIG_ETH_ENABLED=y
25-
CONFIG_ETH_USE_ESP32_EMAC=y
26-
CONFIG_ETH_PHY_INTERFACE_RMII=y
27-
CONFIG_ETH_USE_SPI_ETHERNET=y
28-
299
CONFIG_SPIRAM=y
3010
CONFIG_SPIRAM_OCCUPY_HSPI_HOST=y
3111
CONFIG_ULP_COPROC_ENABLED=y
3212
# CONFIG_ESP_TASK_WDT_CHECK_IDLE_TASK_CPU1 is not set
33-
# CONFIG_UNITY_ENABLE_FLOAT is not set
34-
# CONFIG_UNITY_ENABLE_DOUBLE is not set
35-
# CONFIG_UNITY_ENABLE_IDF_TEST_RUNNER is not set
13+
CONFIG_FREERTOS_FPU_IN_ISR=y
3614
# CONFIG_USE_WAKENET is not set
3715
# CONFIG_USE_MULTINET is not set
38-
# CONFIG_VFS_SUPPORT_SELECT is not set
39-
# CONFIG_VFS_SUPPRESS_SELECT_DEBUG_OUTPUT is not set
40-
# CONFIG_VFS_SUPPORT_TERMIOS is not set
4116
CONFIG_TWAI_ERRATA_FIX_BUS_OFF_REC=y
4217
CONFIG_TWAI_ERRATA_FIX_TX_INTR_LOST=y
4318
CONFIG_TWAI_ERRATA_FIX_RX_FRAME_INVALID=y
4419
CONFIG_TWAI_ERRATA_FIX_RX_FIFO_CORRUPT=y
45-
CONFIG_FREERTOS_WATCHPOINT_END_OF_STACK=y
46-
47-
#
48-
# PPP
49-
#
50-
CONFIG_LWIP_PPP_SUPPORT=y
51-
CONFIG_LWIP_PPP_NOTIFY_PHASE_SUPPORT=y
52-
CONFIG_LWIP_PPP_PAP_SUPPORT=y
53-
CONFIG_LWIP_PPP_ENABLE_IPV6=n
20+
CONFIG_FREERTOS_WATCHPOINT_END_OF_STACK=y

configs/defconfig.esp32s3

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,3 @@
1-
CONFIG_IDF_EXPERIMENTAL_FEATURES=y
2-
3-
CONFIG_ULP_COPROC_ENABLED=y
4-
CONFIG_ULP_COPROC_TYPE_RISCV=y
5-
CONFIG_ULP_COPROC_RESERVE_MEM=4096
6-
71
CONFIG_ESP_DEFAULT_CPU_FREQ_MHZ_240=y
82
CONFIG_SPIRAM=y
93
CONFIG_SPIRAM_TRY_ALLOCATE_WIFI_LWIP=y
@@ -44,3 +38,11 @@ CONFIG_LWIP_PPP_SUPPORT=y
4438
CONFIG_LWIP_PPP_NOTIFY_PHASE_SUPPORT=y
4539
CONFIG_LWIP_PPP_PAP_SUPPORT=y
4640
CONFIG_LWIP_PPP_ENABLE_IPV6=n
41+
42+
# ULP Setting for IDF 5.x
43+
CONFIG_ULP_COPROC_ENABLED=y
44+
# end of ULP COPROC_ENABLE
45+
# Choose FSM or RISCV exclusively! Never both.
46+
# CONFIG_ULP_COPROC_TYPE_FSM=y
47+
CONFIG_ULP_COPROC_TYPE_RISCV=y
48+
CONFIG_ULP_COPROC_RESERVE_MEM=4096

0 commit comments

Comments
 (0)