Skip to content

Commit 1edc0fd

Browse files
committed
Fix Configurations for common, esp32, and esp32s3. And fix lwip CmakeLists to add mbedtls.
1 parent ceb74f2 commit 1edc0fd

File tree

4 files changed

+63
-2
lines changed

4 files changed

+63
-2
lines changed

components/lwip/CMakeLists.txt

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -112,6 +112,8 @@ if (${CONFIG_LWIP_ALTCP_TLS})
112112
list(APPEND include_dirs lwip/src/apps/altcp_tls)
113113
# add_compile_definitions(LWIP_ALTCP=1)
114114
# add_compile_definitions(LWIP_ALTCP_TLS=1)
115+
116+
set(requires mbedtls)
115117
endif()
116118
if(CONFIG_LWIP_PPP_SUPPORT)
117119
list(APPEND srcs
@@ -176,6 +178,7 @@ endif()
176178
idf_component_register(SRCS "${srcs}"
177179
INCLUDE_DIRS ${include_dirs}
178180
LDFRAGMENTS ${linker_fragments}
181+
REQUIRES ${requires}
179182
PRIV_REQUIRES ${priv_requires})
180183

181184
# lots of LWIP source files evaluate macros that check address of stack variables

configs/defconfig.common

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ CONFIG_MBEDTLS_SSL_IN_CONTENT_LEN=8192
88
# CONFIG_MBEDTLS_SSL_OUT_CONTENT_LEN is not set (default 4096)
99
CONFIG_MBEDTLS_SSL_MAX_CONTENT_LEN=8192
1010
CONFIG_MBEDTLS_SSL_VARIABLE_BUFFER_LENGTH=y
11+
CONFIG_MBEDTLS_HAVE_TIME=y
1112

1213
CONFIG_AUTOSTART_ARDUINO=y
1314
# CONFIG_WS2812_LED_ENABLE is not set
@@ -143,7 +144,6 @@ CONFIG_MBEDTLS_HARDWARE_AES=y
143144
CONFIG_MBEDTLS_HARDWARE_MPI=y
144145
CONFIG_MBEDTLS_HARDWARE_SHA=y
145146
# CONFIG_MBEDTLS_ECC_OTHER_CURVES_SOFT_FALLBACK is not set
146-
# CONFIG_MBEDTLS_HAVE_TIME is not set
147147
# CONFIG_MBEDTLS_ECDSA_DETERMINISTIC is not set
148148
# CONFIG_MBEDTLS_SHA512_C is not set
149149
# CONFIG_MBEDTLS_RIPEMD160_C is not set

configs/defconfig.esp32

Lines changed: 54 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,57 @@
1-
CONFIG_BTDM_CTRL_MODE_BTDM=y
1+
#
2+
# Bluetooth
3+
#
4+
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
19+
CONFIG_BT_STACK_NO_LOG=y
20+
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+
29+
CONFIG_SPIRAM=y
30+
CONFIG_SPIRAM_OCCUPY_HSPI_HOST=y
31+
CONFIG_ULP_COPROC_ENABLED=y
32+
# 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
36+
# CONFIG_USE_WAKENET is not set
37+
# 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
41+
CONFIG_TWAI_ERRATA_FIX_BUS_OFF_REC=y
42+
CONFIG_TWAI_ERRATA_FIX_TX_INTR_LOST=y
43+
CONFIG_TWAI_ERRATA_FIX_RX_FRAME_INVALID=y
44+
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
54+
255
CONFIG_BTDM_SCAN_DUPL_CACHE_SIZE=20
356
CONFIG_BT_ENABLED=y
457
CONFIG_BT_A2DP_ENABLE=y

configs/defconfig.esp32s3

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,8 @@
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
16
CONFIG_ESP_DEFAULT_CPU_FREQ_MHZ_240=y
27
CONFIG_SPIRAM=y
38
CONFIG_SPIRAM_TRY_ALLOCATE_WIFI_LWIP=y

0 commit comments

Comments
 (0)