Skip to content

Commit 2c682aa

Browse files
alorbachalorbach
committed
tools: Changed esp32-arduino component branch to 1.0.4 stable
- changed esp.dif to 3.2 - add debug output to install esp-idf script - change some sdk defaults - mbedtls: enable HARDWARE_MPI -
1 parent 4c3f472 commit 2c682aa

File tree

5 files changed

+46
-98
lines changed

5 files changed

+46
-98
lines changed

Diff for: ‎sdkconfig

+21-90
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22
# Automatically generated file; DO NOT EDIT.
33
# Espressif IoT Development Framework Configuration
44
#
5-
CONFIG_IDF_TARGET="esp32"
65
CONFIG_IDF_FIRMWARE_CHIP_ID=0x0000
76

87
#
@@ -12,14 +11,6 @@ CONFIG_TOOLPREFIX="xtensa-esp32-elf-"
1211
CONFIG_PYTHON="python"
1312
CONFIG_MAKE_WARN_UNDEFINED_VARIABLES=y
1413

15-
#
16-
# Application manager
17-
#
18-
CONFIG_APP_COMPILE_TIME_DATE=y
19-
CONFIG_APP_EXCLUDE_PROJECT_VER_VAR=
20-
CONFIG_APP_EXCLUDE_PROJECT_NAME_VAR=
21-
CONFIG_APP_RETRIEVE_LEN_ELF_SHA=16
22-
2314
#
2415
# Arduino Configuration
2516
#
@@ -36,7 +27,6 @@ CONFIG_ARDUINO_EVENT_RUNNING_CORE=1
3627
CONFIG_ARDUINO_UDP_RUN_CORE0=
3728
CONFIG_ARDUINO_UDP_RUN_CORE1=y
3829
CONFIG_ARDUINO_UDP_RUN_NO_AFFINITY=
39-
CONFIG_ARDUINO_UDP_TASK_PRIORITY=3
4030
CONFIG_ARDUINO_UDP_RUNNING_CORE=1
4131
CONFIG_DISABLE_HAL_LOCKS=
4232

@@ -78,7 +68,6 @@ CONFIG_BOOTLOADER_APP_TEST=
7868
CONFIG_BOOTLOADER_WDT_ENABLE=y
7969
CONFIG_BOOTLOADER_WDT_DISABLE_IN_USER_CODE=
8070
CONFIG_BOOTLOADER_WDT_TIME_MS=9000
81-
CONFIG_APP_ROLLBACK_ENABLE=
8271

8372
#
8473
# Security features
@@ -184,17 +173,13 @@ CONFIG_BT_ENABLED=y
184173
#
185174
CONFIG_BTDM_CONTROLLER_MODE_BLE_ONLY=y
186175
CONFIG_BTDM_CONTROLLER_MODE_BR_EDR_ONLY=
187-
CONFIG_BTDM_CONTROLLER_MODE_BTDM=y
176+
CONFIG_BTDM_CONTROLLER_MODE_BTDM=
188177
CONFIG_BTDM_CONTROLLER_BLE_MAX_CONN=3
189-
CONFIG_BTDM_CONTROLLER_BR_EDR_MAX_ACL_CONN=2
190-
CONFIG_BTDM_CONTROLLER_BR_EDR_MAX_SYNC_CONN=0
191-
CONFIG_BTDM_CTRL_BR_EDR_SCO_DATA_PATH_EFF=0
192-
CONFIG_BTDM_CTRL_AUTO_LATENCY=
193-
CONFIG_BTDM_CTRL_AUTO_LATENCY_EFF=
194-
CONFIG_BTDM_CTRL_LEGACY_AUTH_VENDOR_EVT=y
195-
CONFIG_BTDM_CTRL_LEGACY_AUTH_VENDOR_EVT_EFF=y
178+
CONFIG_BTDM_CONTROLLER_BR_EDR_SCO_DATA_PATH_EFF=0
179+
CONFIG_BTDM_CONTROLLER_AUTO_LATENCY_EFF=
180+
CONFIG_BTDM_CTRL_LEGACY_AUTH_VENDOR_EVT_EFF=
196181
CONFIG_BTDM_CONTROLLER_BLE_MAX_CONN_EFF=3
197-
CONFIG_BTDM_CONTROLLER_BR_EDR_MAX_ACL_CONN_EFF=2
182+
CONFIG_BTDM_CONTROLLER_BR_EDR_MAX_ACL_CONN_EFF=0
198183
CONFIG_BTDM_CONTROLLER_BR_EDR_MAX_SYNC_CONN_EFF=0
199184
CONFIG_BTDM_CONTROLLER_PINNED_TO_CORE_0=y
200185
CONFIG_BTDM_CONTROLLER_PINNED_TO_CORE_1=
@@ -216,7 +201,6 @@ CONFIG_SCAN_DUPLICATE_BY_ADV_DATA_AND_DEVICE_ADDR=
216201
CONFIG_SCAN_DUPLICATE_TYPE=0
217202
CONFIG_DUPLICATE_SCAN_CACHE_SIZE=20
218203
CONFIG_BLE_MESH_SCAN_DUPLICATE_EN=
219-
CONFIG_BTDM_CONTROLLER_FULL_SCAN_SUPPORTED=y
220204
CONFIG_BLE_ADV_REPORT_FLOW_CONTROL_SUPPORTED=y
221205
CONFIG_BLE_ADV_REPORT_FLOW_CONTROL_NUM=100
222206
CONFIG_BLE_ADV_REPORT_DISCARD_THRSHOLD=20
@@ -237,7 +221,6 @@ CONFIG_HFP_ENABLE=y
237221
CONFIG_HFP_CLIENT_ENABLE=y
238222
CONFIG_HFP_AUDIO_DATA_PATH_PCM=y
239223
CONFIG_HFP_AUDIO_DATA_PATH_HCI=
240-
CONFIG_BT_SSP_ENABLED=y
241224
CONFIG_GATTS_ENABLE=y
242225
CONFIG_GATTS_SEND_SERVICE_CHANGE_MANUAL=
243226
CONFIG_GATTS_SEND_SERVICE_CHANGE_AUTO=y
@@ -255,7 +238,6 @@ CONFIG_SMP_ENABLE=y
255238
CONFIG_BLE_ACTIVE_SCAN_REPORT_ADV_SCAN_RSP_INDIVIDUALLY=
256239
CONFIG_BLE_ESTABLISH_LINK_CONNECTION_TIMEOUT=30
257240
CONFIG_BT_RESERVE_DRAM=0xdb5c
258-
CONFIG_BLE_MESH=
259241

260242
#
261243
# Driver configurations
@@ -274,16 +256,6 @@ CONFIG_SPI_MASTER_IN_IRAM=
274256
CONFIG_SPI_MASTER_ISR_IN_IRAM=y
275257
CONFIG_SPI_SLAVE_IN_IRAM=
276258
CONFIG_SPI_SLAVE_ISR_IN_IRAM=y
277-
278-
#
279-
# eFuse Bit Manager
280-
#
281-
CONFIG_EFUSE_CUSTOM_TABLE=
282-
CONFIG_EFUSE_VIRTUAL=
283-
CONFIG_EFUSE_CODE_SCHEME_COMPAT_NONE=
284-
CONFIG_EFUSE_CODE_SCHEME_COMPAT_3_4=y
285-
CONFIG_EFUSE_CODE_SCHEME_COMPAT_REPEAT=
286-
CONFIG_EFUSE_MAX_BLK_LEN=192
287259
CONFIG_C_IMPL=
288260
CONFIG_XTENSA_IMPL=y
289261

@@ -315,7 +287,6 @@ CONFIG_HP_LITE1=
315287
#
316288
# ESP32-specific
317289
#
318-
CONFIG_IDF_TARGET_ESP32=y
319290
CONFIG_ESP32_ECO3_CACHE_LOCK_FIX=y
320291
CONFIG_ESP32_REV_MIN_0=y
321292
CONFIG_ESP32_REV_MIN_1=
@@ -369,6 +340,10 @@ CONFIG_MEMMAP_TRACEMEM=
369340
CONFIG_MEMMAP_TRACEMEM_TWOBANKS=
370341
CONFIG_ESP32_TRAX=
371342
CONFIG_TRACEMEM_RESERVE_DRAM=0x0
343+
CONFIG_ESP32_ENABLE_COREDUMP_TO_FLASH=
344+
CONFIG_ESP32_ENABLE_COREDUMP_TO_UART=
345+
CONFIG_ESP32_ENABLE_COREDUMP_TO_NONE=y
346+
CONFIG_ESP32_ENABLE_COREDUMP=
372347
CONFIG_TWO_UNIVERSAL_MAC_ADDRESS=
373348
CONFIG_FOUR_UNIVERSAL_MAC_ADDRESS=y
374349
CONFIG_NUMBER_OF_UNIVERSAL_MAC_ADDRESS=4
@@ -440,25 +415,28 @@ CONFIG_ESP32_DPORT_DIS_INTERRUPT_LVL=5
440415
# Wi-Fi
441416
#
442417
CONFIG_SW_COEXIST_ENABLE=y
418+
CONFIG_SW_COEXIST_PREFERENCE_WIFI=
419+
CONFIG_SW_COEXIST_PREFERENCE_BT=
420+
CONFIG_SW_COEXIST_PREFERENCE_BALANCE=y
421+
CONFIG_SW_COEXIST_PREFERENCE_VALUE=2
443422
CONFIG_ESP32_WIFI_STATIC_RX_BUFFER_NUM=16
444-
CONFIG_ESP32_WIFI_DYNAMIC_RX_BUFFER_NUM=64
423+
CONFIG_ESP32_WIFI_DYNAMIC_RX_BUFFER_NUM=32
445424
CONFIG_ESP32_WIFI_STATIC_TX_BUFFER=
446425
CONFIG_ESP32_WIFI_DYNAMIC_TX_BUFFER=y
447426
CONFIG_ESP32_WIFI_TX_BUFFER_TYPE=1
448-
CONFIG_ESP32_WIFI_DYNAMIC_TX_BUFFER_NUM=64
427+
CONFIG_ESP32_WIFI_DYNAMIC_TX_BUFFER_NUM=32
449428
CONFIG_ESP32_WIFI_CSI_ENABLED=
450429
CONFIG_ESP32_WIFI_AMPDU_TX_ENABLED=y
451-
CONFIG_ESP32_WIFI_TX_BA_WIN=32
430+
CONFIG_ESP32_WIFI_TX_BA_WIN=12
452431
CONFIG_ESP32_WIFI_AMPDU_RX_ENABLED=y
453-
CONFIG_ESP32_WIFI_RX_BA_WIN=32
432+
CONFIG_ESP32_WIFI_RX_BA_WIN=16
454433
CONFIG_ESP32_WIFI_NVS_ENABLED=y
455434
CONFIG_ESP32_WIFI_TASK_PINNED_TO_CORE_0=y
456435
CONFIG_ESP32_WIFI_TASK_PINNED_TO_CORE_1=
457436
CONFIG_ESP32_WIFI_SOFTAP_BEACON_MAX_LEN=752
458-
CONFIG_ESP32_WIFI_MGMT_SBUF_NUM=32
459-
CONFIG_ESP32_WIFI_DEBUG_LOG_ENABLE=
460437
CONFIG_ESP32_WIFI_IRAM_OPT=
461438
CONFIG_ESP32_WIFI_RX_IRAM_OPT=
439+
CONFIG_ESP32_WIFI_MGMT_SBUF_NUM=32
462440

463441
#
464442
# PHY
@@ -504,30 +482,15 @@ CONFIG_EVENT_LOOP_PROFILING=
504482
# ESP HTTP client
505483
#
506484
CONFIG_ESP_HTTP_CLIENT_ENABLE_HTTPS=y
507-
CONFIG_ESP_HTTP_CLIENT_ENABLE_BASIC_AUTH=
508485

509486
#
510487
# HTTP Server
511488
#
512489
CONFIG_HTTPD_MAX_REQ_HDR_LEN=512
513490
CONFIG_HTTPD_MAX_URI_LEN=512
514-
CONFIG_HTTPD_ERR_RESP_NO_DELAY=y
515491
CONFIG_HTTPD_PURGE_BUF_LEN=32
516492
CONFIG_HTTPD_LOG_PURGE_DATA=
517493

518-
#
519-
# ESP HTTPS OTA
520-
#
521-
CONFIG_OTA_ALLOW_HTTP=
522-
523-
#
524-
# Core dump
525-
#
526-
CONFIG_ESP32_ENABLE_COREDUMP_TO_FLASH=
527-
CONFIG_ESP32_ENABLE_COREDUMP_TO_UART=
528-
CONFIG_ESP32_ENABLE_COREDUMP_TO_NONE=y
529-
CONFIG_ESP32_ENABLE_COREDUMP=
530-
531494
#
532495
# Ethernet
533496
#
@@ -574,7 +537,6 @@ CONFIG_FATFS_API_ENCODING_UTF_8=
574537
CONFIG_FATFS_FS_LOCK=0
575538
CONFIG_FATFS_TIMEOUT_MS=10000
576539
CONFIG_FATFS_PER_FILE_CACHE=y
577-
CONFIG_FATFS_ALLOC_PREFER_EXTRAM=y
578540

579541
#
580542
# Modbus configuration
@@ -623,8 +585,6 @@ CONFIG_FREERTOS_USE_TRACE_FACILITY=
623585
CONFIG_FREERTOS_GENERATE_RUN_TIME_STATS=
624586
CONFIG_FREERTOS_DEBUG_INTERNALS=
625587
CONFIG_FREERTOS_TASK_FUNCTION_WRAPPER=y
626-
CONFIG_FREERTOS_CHECK_MUTEX_GIVEN_BY_OWNER=y
627-
CONFIG_FREERTOS_CHECK_PORT_CRITICAL_COMPLIANCE=
628588

629589
#
630590
# Heap memory debugging
@@ -656,7 +616,6 @@ CONFIG_LOG_COLORS=
656616
# LWIP
657617
#
658618
CONFIG_L2_TO_L3_COPY=
659-
CONFIG_ETHARP_SUPPORT_VLAN=
660619
CONFIG_LWIP_IRAM_OPTIMIZATION=
661620
CONFIG_LWIP_MAX_SOCKETS=10
662621
CONFIG_LWIP_RANDOMIZE_INITIAL_LOCAL_PORTS=y
@@ -665,6 +624,7 @@ CONFIG_LWIP_SO_LINGER=
665624
CONFIG_LWIP_SO_REUSE=y
666625
CONFIG_LWIP_SO_REUSE_RXTOALL=y
667626
CONFIG_LWIP_SO_RCVBUF=y
627+
CONFIG_LWIP_DHCP_MAX_NTP_SERVERS=1
668628
CONFIG_LWIP_IP4_FRAG=y
669629
CONFIG_LWIP_IP6_FRAG=y
670630
CONFIG_LWIP_IP4_REASSEMBLY=
@@ -690,7 +650,6 @@ CONFIG_LWIP_LOOPBACK_MAX_PBUFS=8
690650
#
691651
# TCP
692652
#
693-
CONFIG_LWIP_TCP_ISN_HOOK=y
694653
CONFIG_LWIP_MAX_ACTIVE_TCP=16
695654
CONFIG_LWIP_MAX_LISTENING_TCP=16
696655
CONFIG_TCP_MAXRTX=12
@@ -720,7 +679,6 @@ CONFIG_TCPIP_TASK_AFFINITY=0x0
720679
CONFIG_LWIP_IPV6_MEMP_NUM_ND6_QUEUE=3
721680
CONFIG_LWIP_IPV6_ND6_NUM_NEIGHBORS=5
722681
CONFIG_PPP_SUPPORT=y
723-
CONFIG_PPP_NOTIFY_PHASE_SUPPORT=
724682
CONFIG_PPP_PAP_SUPPORT=y
725683
CONFIG_PPP_CHAP_SUPPORT=y
726684
CONFIG_PPP_MSCHAP_SUPPORT=y
@@ -738,13 +696,6 @@ CONFIG_LWIP_BROADCAST_PING=
738696
#
739697
CONFIG_LWIP_MAX_RAW_PCBS=16
740698

741-
#
742-
# SNTP
743-
#
744-
CONFIG_LWIP_DHCP_MAX_NTP_SERVERS=1
745-
CONFIG_LWIP_SNTP_UPDATE_DELAY=3600000
746-
CONFIG_LWIP_ESP_LWIP_ASSERT=y
747-
748699
#
749700
# mbedTLS
750701
#
@@ -755,10 +706,9 @@ CONFIG_MBEDTLS_CUSTOM_MEM_ALLOC=
755706
CONFIG_MBEDTLS_SSL_MAX_CONTENT_LEN=16384
756707
CONFIG_MBEDTLS_ASYMMETRIC_CONTENT_LEN=
757708
CONFIG_MBEDTLS_DEBUG=
758-
CONFIG_MBEDTLS_ECP_RESTARTABLE=
759-
CONFIG_MBEDTLS_CMAC_C=
760709
CONFIG_MBEDTLS_HARDWARE_AES=y
761-
CONFIG_MBEDTLS_HARDWARE_MPI=
710+
CONFIG_MBEDTLS_HARDWARE_MPI=y
711+
CONFIG_MBEDTLS_MPI_USE_INTERRUPT=y
762712
CONFIG_MBEDTLS_HARDWARE_SHA=
763713
CONFIG_MBEDTLS_HAVE_TIME=y
764714
CONFIG_MBEDTLS_HAVE_TIME_DATE=
@@ -866,11 +816,6 @@ CONFIG_OPENSSL_ASSERT_EXIT=
866816
CONFIG_ESP32_PTHREAD_TASK_PRIO_DEFAULT=5
867817
CONFIG_ESP32_PTHREAD_TASK_STACK_SIZE_DEFAULT=2048
868818
CONFIG_PTHREAD_STACK_MIN=768
869-
CONFIG_ESP32_DEFAULT_PTHREAD_CORE_NO_AFFINITY=y
870-
CONFIG_ESP32_DEFAULT_PTHREAD_CORE_0=
871-
CONFIG_ESP32_DEFAULT_PTHREAD_CORE_1=
872-
CONFIG_ESP32_PTHREAD_TASK_CORE_DEFAULT=-1
873-
CONFIG_ESP32_PTHREAD_TASK_NAME_DEFAULT="pthread"
874819

875820
#
876821
# SPI Flash driver
@@ -920,15 +865,6 @@ CONFIG_SPIFFS_TEST_VISUALISATION=
920865
CONFIG_IP_LOST_TIMER_INTERVAL=120
921866
CONFIG_TCPIP_LWIP=y
922867

923-
#
924-
# Unity unit testing library
925-
#
926-
CONFIG_UNITY_ENABLE_FLOAT=y
927-
CONFIG_UNITY_ENABLE_DOUBLE=y
928-
CONFIG_UNITY_ENABLE_COLOR=
929-
CONFIG_UNITY_ENABLE_IDF_TEST_RUNNER=y
930-
CONFIG_UNITY_ENABLE_FIXTURE=
931-
932868
#
933869
# Virtual file system
934870
#
@@ -942,11 +878,6 @@ CONFIG_WL_SECTOR_SIZE_512=
942878
CONFIG_WL_SECTOR_SIZE_4096=y
943879
CONFIG_WL_SECTOR_SIZE=4096
944880

945-
#
946-
# Wi-Fi Provisioning Manager
947-
#
948-
CONFIG_WIFI_PROV_SCAN_MAX_ENTRIES=16
949-
950881
#
951882
# Supplicant
952883
#

Diff for: ‎sdkconfig.changes-al

+11-4
Original file line numberDiff line numberDiff line change
@@ -3,18 +3,25 @@
33
#
44

55
CONFIG_BTDM_CONTROLLER_MODE_BLE_ONLY=y
6+
CONFIG_BTDM_CONTROLLER_MODE_BR_EDR_ONLY=
7+
CONFIG_BTDM_CONTROLLER_MODE_BTDM=
68

79
#
810
# Wi-Fi
911
#
1012

11-
CONFIG_ESP32_WIFI_DYNAMIC_RX_BUFFER_NUM=64
12-
CONFIG_ESP32_WIFI_DYNAMIC_TX_BUFFER_NUM=64
13-
CONFIG_ESP32_WIFI_TX_BA_WIN=32
14-
CONFIG_ESP32_WIFI_RX_BA_WIN=32
13+
CONFIG_ESP32_WIFI_DYNAMIC_RX_BUFFER_NUM=32
14+
CONFIG_ESP32_WIFI_DYNAMIC_TX_BUFFER_NUM=32
15+
CONFIG_ESP32_WIFI_TX_BA_WIN=12
16+
CONFIG_ESP32_WIFI_RX_BA_WIN=16
17+
18+
CONFIG_ESP32_WIFI_IRAM_OPT=
19+
CONFIG_ESP32_WIFI_RX_IRAM_OPT=
1520

1621
#
1722
# TLS Key Exchange Methods
1823
#
1924

2025
CONFIG_MBEDTLS_SSL_PROTO_DTLS=y
26+
CONFIG_MBEDTLS_HARDWARE_MPI=y
27+
CONFIG_MBEDTLS_MPI_USE_INTERRUPT=y

Diff for: ‎tools/config.sh

+4-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,10 @@ IDF_TOOLCHAIN_WIN32="https://dl.espressif.com/dl/xtensa-esp32-elf-win32-1.22.0-9
99
IDF_TOOLCHAIN_MACOS="https://dl.espressif.com/dl/xtensa-esp32-elf-osx-1.22.0-96-g2852398-5.2.0.tar.gz"
1010

1111
if [ -z $IDF_BRANCH ]; then
12-
IDF_BRANCH="release/v3.3"
12+
# IDF_BRANCH="master"
13+
# IDF_BRANCH="release/v4.2"
14+
# IDF_BRANCH="release/v3.3"
15+
IDF_BRANCH="release/v3.2"
1316
fi
1417

1518
# Owner of the target ESP32 Arduino repository

Diff for: ‎tools/install-esp-idf.sh

+6-2
Original file line numberDiff line numberDiff line change
@@ -11,16 +11,20 @@ fi
1111
# CLONE ESP-IDF
1212
#
1313

14-
if [ -z "$IDF_PATH" ]; then
15-
echo "ESP-IDF is not installed! Installing local copy"
14+
if [ ! -d "$IDF_PATH" ]; then
15+
echo "ESP-IDF is not installed! Installing local copy from $IDF_REPO_URL branch $IDF_BRANCH"
1616
idf_was_installed="1"
1717
if ! [ -d esp-idf ]; then
1818
git clone $IDF_REPO_URL -b $IDF_BRANCH
1919
fi
2020
export IDF_PATH="$AR_ROOT/esp-idf"
21+
else
22+
echo "ESP-IDF is installed in $IDF_PATH"
2123
fi
2224

25+
2326
if [ "$IDF_COMMIT" ]; then
27+
echo "IDF_COMMIT set to $IDF_COMMIT"
2428
git -C "$IDF_PATH" checkout "$IDF_COMMIT"
2529
commit_predefined="1"
2630
fi

Diff for: ‎tools/update-components.sh

+4-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,10 @@ if [ ! -d "$AR_COMPS/arduino" ]; then
1010
git clone $AR_REPO_URL "$AR_COMPS/arduino"
1111
else
1212
git -C "$AR_COMPS/arduino" fetch origin && \
13-
git -C "$AR_COMPS/arduino" pull origin master
13+
# git -C "$AR_COMPS/arduino" pull origin master
14+
# git -C "$AR_COMPS/arduino" pull origin idf-release/v4.2
15+
# git -C "$AR_COMPS/arduino" pull origin 1.0.5-rc3
16+
git -C "$AR_COMPS/arduino" pull origin 1.0.4
1417
fi
1518
if [ $? -ne 0 ]; then exit 1; fi
1619
git -C "$AR_COMPS/arduino" submodule update --init --recursive

0 commit comments

Comments
 (0)