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
- Change to 240Mhz
- Change TOOLPREFIX
- Disable SPIRAM_CACHE_WORKAROUND because of "IRAM0 segment data does not fit."

sdkconfig

@@ -2,24 +2,15 @@
 # Automatically generated file; DO NOT EDIT.
 # Espressif IoT Development Framework Configuration
 #
-CONFIG_IDF_TARGET="esp32"
 CONFIG_IDF_FIRMWARE_CHIP_ID=0x0000
 
 #
 # SDK tool configuration
 #
-CONFIG_TOOLPREFIX="xtensa-esp32-elf-"
-CONFIG_PYTHON="python"
+CONFIG_TOOLPREFIX="${HOME}/xtensa-esp32-elf/bin/xtensa-esp32-elf-"
+CONFIG_PYTHON="python2.7"
 CONFIG_MAKE_WARN_UNDEFINED_VARIABLES=y
 
-#
-# Application manager
-#
-CONFIG_APP_COMPILE_TIME_DATE=y
-CONFIG_APP_EXCLUDE_PROJECT_VER_VAR=
-CONFIG_APP_EXCLUDE_PROJECT_NAME_VAR=
-CONFIG_APP_RETRIEVE_LEN_ELF_SHA=16
-
 #
 # Arduino Configuration
 #
@@ -36,7 +27,6 @@ CONFIG_ARDUINO_EVENT_RUNNING_CORE=1
 CONFIG_ARDUINO_UDP_RUN_CORE0=
 CONFIG_ARDUINO_UDP_RUN_CORE1=y
 CONFIG_ARDUINO_UDP_RUN_NO_AFFINITY=
-CONFIG_ARDUINO_UDP_TASK_PRIORITY=3
 CONFIG_ARDUINO_UDP_RUNNING_CORE=1
 CONFIG_DISABLE_HAL_LOCKS=
 
@@ -78,7 +68,6 @@ CONFIG_BOOTLOADER_APP_TEST=
 CONFIG_BOOTLOADER_WDT_ENABLE=y
 CONFIG_BOOTLOADER_WDT_DISABLE_IN_USER_CODE=
 CONFIG_BOOTLOADER_WDT_TIME_MS=9000
-CONFIG_APP_ROLLBACK_ENABLE=
 
 #
 # Security features
@@ -184,17 +173,13 @@ CONFIG_BT_ENABLED=y
 #
 CONFIG_BTDM_CONTROLLER_MODE_BLE_ONLY=y
 CONFIG_BTDM_CONTROLLER_MODE_BR_EDR_ONLY=
-CONFIG_BTDM_CONTROLLER_MODE_BTDM=y
+CONFIG_BTDM_CONTROLLER_MODE_BTDM=
 CONFIG_BTDM_CONTROLLER_BLE_MAX_CONN=3
-CONFIG_BTDM_CONTROLLER_BR_EDR_MAX_ACL_CONN=2
-CONFIG_BTDM_CONTROLLER_BR_EDR_MAX_SYNC_CONN=0
-CONFIG_BTDM_CTRL_BR_EDR_SCO_DATA_PATH_EFF=0
-CONFIG_BTDM_CTRL_AUTO_LATENCY=
-CONFIG_BTDM_CTRL_AUTO_LATENCY_EFF=
-CONFIG_BTDM_CTRL_LEGACY_AUTH_VENDOR_EVT=y
-CONFIG_BTDM_CTRL_LEGACY_AUTH_VENDOR_EVT_EFF=y
+CONFIG_BTDM_CONTROLLER_BR_EDR_SCO_DATA_PATH_EFF=0
+CONFIG_BTDM_CONTROLLER_AUTO_LATENCY_EFF=
+CONFIG_BTDM_CTRL_LEGACY_AUTH_VENDOR_EVT_EFF=
 CONFIG_BTDM_CONTROLLER_BLE_MAX_CONN_EFF=3
-CONFIG_BTDM_CONTROLLER_BR_EDR_MAX_ACL_CONN_EFF=2
+CONFIG_BTDM_CONTROLLER_BR_EDR_MAX_ACL_CONN_EFF=0
 CONFIG_BTDM_CONTROLLER_BR_EDR_MAX_SYNC_CONN_EFF=0
 CONFIG_BTDM_CONTROLLER_PINNED_TO_CORE_0=y
 CONFIG_BTDM_CONTROLLER_PINNED_TO_CORE_1=
@@ -216,7 +201,6 @@ CONFIG_SCAN_DUPLICATE_BY_ADV_DATA_AND_DEVICE_ADDR=
 CONFIG_SCAN_DUPLICATE_TYPE=0
 CONFIG_DUPLICATE_SCAN_CACHE_SIZE=20
 CONFIG_BLE_MESH_SCAN_DUPLICATE_EN=
-CONFIG_BTDM_CONTROLLER_FULL_SCAN_SUPPORTED=y
 CONFIG_BLE_ADV_REPORT_FLOW_CONTROL_SUPPORTED=y
 CONFIG_BLE_ADV_REPORT_FLOW_CONTROL_NUM=100
 CONFIG_BLE_ADV_REPORT_DISCARD_THRSHOLD=20
@@ -237,7 +221,6 @@ CONFIG_HFP_ENABLE=y
 CONFIG_HFP_CLIENT_ENABLE=y
 CONFIG_HFP_AUDIO_DATA_PATH_PCM=y
 CONFIG_HFP_AUDIO_DATA_PATH_HCI=
-CONFIG_BT_SSP_ENABLED=y
 CONFIG_GATTS_ENABLE=y
 CONFIG_GATTS_SEND_SERVICE_CHANGE_MANUAL=
 CONFIG_GATTS_SEND_SERVICE_CHANGE_AUTO=y
@@ -255,7 +238,6 @@ CONFIG_SMP_ENABLE=y
 CONFIG_BLE_ACTIVE_SCAN_REPORT_ADV_SCAN_RSP_INDIVIDUALLY=
 CONFIG_BLE_ESTABLISH_LINK_CONNECTION_TIMEOUT=30
 CONFIG_BT_RESERVE_DRAM=0xdb5c
-CONFIG_BLE_MESH=
 
 #
 # Driver configurations
@@ -274,16 +256,6 @@ CONFIG_SPI_MASTER_IN_IRAM=
 CONFIG_SPI_MASTER_ISR_IN_IRAM=y
 CONFIG_SPI_SLAVE_IN_IRAM=
 CONFIG_SPI_SLAVE_ISR_IN_IRAM=y
-
-#
-# eFuse Bit Manager
-#
-CONFIG_EFUSE_CUSTOM_TABLE=
-CONFIG_EFUSE_VIRTUAL=
-CONFIG_EFUSE_CODE_SCHEME_COMPAT_NONE=
-CONFIG_EFUSE_CODE_SCHEME_COMPAT_3_4=y
-CONFIG_EFUSE_CODE_SCHEME_COMPAT_REPEAT=
-CONFIG_EFUSE_MAX_BLK_LEN=192
 CONFIG_C_IMPL=
 CONFIG_XTENSA_IMPL=y
 
@@ -315,7 +287,6 @@ CONFIG_HP_LITE1=
 #
 # ESP32-specific
 #
-CONFIG_IDF_TARGET_ESP32=y
 CONFIG_ESP32_ECO3_CACHE_LOCK_FIX=y
 CONFIG_ESP32_REV_MIN_0=y
 CONFIG_ESP32_REV_MIN_1=
@@ -341,10 +312,10 @@ CONFIG_SPIRAM_TYPE_ESPPSRAM32=
 CONFIG_SPIRAM_TYPE_ESPPSRAM64=
 CONFIG_SPIRAM_SIZE=-1
 CONFIG_SPIRAM_SPEED_40M=y
-CONFIG_SPIRAM_CACHE_WORKAROUND=y
+CONFIG_SPIRAM_CACHE_WORKAROUND=
 CONFIG_SPIRAM_BANKSWITCH_ENABLE=y
 CONFIG_SPIRAM_BANKSWITCH_RESERVE=8
-CONFIG_WIFI_LWIP_ALLOCATION_FROM_SPIRAM_FIRST=
+CONFIG_WIFI_LWIP_ALLOCATION_FROM_SPIRAM_FIRST=y
 CONFIG_SPIRAM_ALLOW_BSS_SEG_EXTERNAL_MEMORY=
 
 #
@@ -369,6 +340,10 @@ CONFIG_MEMMAP_TRACEMEM=
 CONFIG_MEMMAP_TRACEMEM_TWOBANKS=
 CONFIG_ESP32_TRAX=
 CONFIG_TRACEMEM_RESERVE_DRAM=0x0
+CONFIG_ESP32_ENABLE_COREDUMP_TO_FLASH=
+CONFIG_ESP32_ENABLE_COREDUMP_TO_UART=
+CONFIG_ESP32_ENABLE_COREDUMP_TO_NONE=y
+CONFIG_ESP32_ENABLE_COREDUMP=
 CONFIG_TWO_UNIVERSAL_MAC_ADDRESS=
 CONFIG_FOUR_UNIVERSAL_MAC_ADDRESS=y
 CONFIG_NUMBER_OF_UNIVERSAL_MAC_ADDRESS=4
@@ -440,25 +415,28 @@ CONFIG_ESP32_DPORT_DIS_INTERRUPT_LVL=5
 # Wi-Fi
 #
 CONFIG_SW_COEXIST_ENABLE=y
+CONFIG_SW_COEXIST_PREFERENCE_WIFI=
+CONFIG_SW_COEXIST_PREFERENCE_BT=
+CONFIG_SW_COEXIST_PREFERENCE_BALANCE=y
+CONFIG_SW_COEXIST_PREFERENCE_VALUE=2
 CONFIG_ESP32_WIFI_STATIC_RX_BUFFER_NUM=16
-CONFIG_ESP32_WIFI_DYNAMIC_RX_BUFFER_NUM=64
+CONFIG_ESP32_WIFI_DYNAMIC_RX_BUFFER_NUM=32
 CONFIG_ESP32_WIFI_STATIC_TX_BUFFER=
 CONFIG_ESP32_WIFI_DYNAMIC_TX_BUFFER=y
 CONFIG_ESP32_WIFI_TX_BUFFER_TYPE=1
-CONFIG_ESP32_WIFI_DYNAMIC_TX_BUFFER_NUM=64
+CONFIG_ESP32_WIFI_DYNAMIC_TX_BUFFER_NUM=32
 CONFIG_ESP32_WIFI_CSI_ENABLED=
 CONFIG_ESP32_WIFI_AMPDU_TX_ENABLED=y
-CONFIG_ESP32_WIFI_TX_BA_WIN=32
+CONFIG_ESP32_WIFI_TX_BA_WIN=12
 CONFIG_ESP32_WIFI_AMPDU_RX_ENABLED=y
-CONFIG_ESP32_WIFI_RX_BA_WIN=32
+CONFIG_ESP32_WIFI_RX_BA_WIN=16
 CONFIG_ESP32_WIFI_NVS_ENABLED=y
 CONFIG_ESP32_WIFI_TASK_PINNED_TO_CORE_0=y
 CONFIG_ESP32_WIFI_TASK_PINNED_TO_CORE_1=
 CONFIG_ESP32_WIFI_SOFTAP_BEACON_MAX_LEN=752
-CONFIG_ESP32_WIFI_MGMT_SBUF_NUM=32
-CONFIG_ESP32_WIFI_DEBUG_LOG_ENABLE=
 CONFIG_ESP32_WIFI_IRAM_OPT=
 CONFIG_ESP32_WIFI_RX_IRAM_OPT=
+CONFIG_ESP32_WIFI_MGMT_SBUF_NUM=32
 
 #
 # PHY
@@ -504,30 +482,15 @@ CONFIG_EVENT_LOOP_PROFILING=
 # ESP HTTP client
 #
 CONFIG_ESP_HTTP_CLIENT_ENABLE_HTTPS=y
-CONFIG_ESP_HTTP_CLIENT_ENABLE_BASIC_AUTH=
 
 #
 # HTTP Server
 #
 CONFIG_HTTPD_MAX_REQ_HDR_LEN=512
 CONFIG_HTTPD_MAX_URI_LEN=512
-CONFIG_HTTPD_ERR_RESP_NO_DELAY=y
 CONFIG_HTTPD_PURGE_BUF_LEN=32
 CONFIG_HTTPD_LOG_PURGE_DATA=
 
-#
-# ESP HTTPS OTA
-#
-CONFIG_OTA_ALLOW_HTTP=
-
-#
-# Core dump
-#
-CONFIG_ESP32_ENABLE_COREDUMP_TO_FLASH=
-CONFIG_ESP32_ENABLE_COREDUMP_TO_UART=
-CONFIG_ESP32_ENABLE_COREDUMP_TO_NONE=y
-CONFIG_ESP32_ENABLE_COREDUMP=
-
 #
 # Ethernet
 #
@@ -574,7 +537,6 @@ CONFIG_FATFS_API_ENCODING_UTF_8=
 CONFIG_FATFS_FS_LOCK=0
 CONFIG_FATFS_TIMEOUT_MS=10000
 CONFIG_FATFS_PER_FILE_CACHE=y
-CONFIG_FATFS_ALLOC_PREFER_EXTRAM=y
 
 #
 # Modbus configuration
@@ -623,8 +585,6 @@ CONFIG_FREERTOS_USE_TRACE_FACILITY=
 CONFIG_FREERTOS_GENERATE_RUN_TIME_STATS=
 CONFIG_FREERTOS_DEBUG_INTERNALS=
 CONFIG_FREERTOS_TASK_FUNCTION_WRAPPER=y
-CONFIG_FREERTOS_CHECK_MUTEX_GIVEN_BY_OWNER=y
-CONFIG_FREERTOS_CHECK_PORT_CRITICAL_COMPLIANCE=
 
 #
 # Heap memory debugging
@@ -656,7 +616,6 @@ CONFIG_LOG_COLORS=
 # LWIP
 #
 CONFIG_L2_TO_L3_COPY=
-CONFIG_ETHARP_SUPPORT_VLAN=
 CONFIG_LWIP_IRAM_OPTIMIZATION=
 CONFIG_LWIP_MAX_SOCKETS=10
 CONFIG_LWIP_RANDOMIZE_INITIAL_LOCAL_PORTS=y
@@ -665,6 +624,7 @@ CONFIG_LWIP_SO_LINGER=
 CONFIG_LWIP_SO_REUSE=y
 CONFIG_LWIP_SO_REUSE_RXTOALL=y
 CONFIG_LWIP_SO_RCVBUF=y
+CONFIG_LWIP_DHCP_MAX_NTP_SERVERS=1
 CONFIG_LWIP_IP4_FRAG=y
 CONFIG_LWIP_IP6_FRAG=y
 CONFIG_LWIP_IP4_REASSEMBLY=
@@ -690,7 +650,6 @@ CONFIG_LWIP_LOOPBACK_MAX_PBUFS=8
 #
 # TCP
 #
-CONFIG_LWIP_TCP_ISN_HOOK=y
 CONFIG_LWIP_MAX_ACTIVE_TCP=16
 CONFIG_LWIP_MAX_LISTENING_TCP=16
 CONFIG_TCP_MAXRTX=12
@@ -705,6 +664,7 @@ CONFIG_ESP_TCP_KEEP_CONNECTION_WHEN_IP_CHANGES=
 CONFIG_TCP_OVERSIZE_MSS=y
 CONFIG_TCP_OVERSIZE_QUARTER_MSS=
 CONFIG_TCP_OVERSIZE_DISABLE=
+CONFIG_LWIP_WND_SCALE=
 CONFIG_LWIP_TCP_RTO_TIME=3000
 
 #
@@ -720,7 +680,6 @@ CONFIG_TCPIP_TASK_AFFINITY=0x0
 CONFIG_LWIP_IPV6_MEMP_NUM_ND6_QUEUE=3
 CONFIG_LWIP_IPV6_ND6_NUM_NEIGHBORS=5
 CONFIG_PPP_SUPPORT=y
-CONFIG_PPP_NOTIFY_PHASE_SUPPORT=
 CONFIG_PPP_PAP_SUPPORT=y
 CONFIG_PPP_CHAP_SUPPORT=y
 CONFIG_PPP_MSCHAP_SUPPORT=y
@@ -738,13 +697,6 @@ CONFIG_LWIP_BROADCAST_PING=
 #
 CONFIG_LWIP_MAX_RAW_PCBS=16
 
-#
-# SNTP
-#
-CONFIG_LWIP_DHCP_MAX_NTP_SERVERS=1
-CONFIG_LWIP_SNTP_UPDATE_DELAY=3600000
-CONFIG_LWIP_ESP_LWIP_ASSERT=y
-
 #
 # mbedTLS
 #
@@ -755,10 +707,9 @@ CONFIG_MBEDTLS_CUSTOM_MEM_ALLOC=
 CONFIG_MBEDTLS_SSL_MAX_CONTENT_LEN=16384
 CONFIG_MBEDTLS_ASYMMETRIC_CONTENT_LEN=
 CONFIG_MBEDTLS_DEBUG=
-CONFIG_MBEDTLS_ECP_RESTARTABLE=
-CONFIG_MBEDTLS_CMAC_C=
 CONFIG_MBEDTLS_HARDWARE_AES=y
-CONFIG_MBEDTLS_HARDWARE_MPI=
+CONFIG_MBEDTLS_HARDWARE_MPI=y
+CONFIG_MBEDTLS_MPI_USE_INTERRUPT=y
 CONFIG_MBEDTLS_HARDWARE_SHA=
 CONFIG_MBEDTLS_HAVE_TIME=y
 CONFIG_MBEDTLS_HAVE_TIME_DATE=
@@ -866,11 +817,6 @@ CONFIG_OPENSSL_ASSERT_EXIT=
 CONFIG_ESP32_PTHREAD_TASK_PRIO_DEFAULT=5
 CONFIG_ESP32_PTHREAD_TASK_STACK_SIZE_DEFAULT=2048
 CONFIG_PTHREAD_STACK_MIN=768
-CONFIG_ESP32_DEFAULT_PTHREAD_CORE_NO_AFFINITY=y
-CONFIG_ESP32_DEFAULT_PTHREAD_CORE_0=
-CONFIG_ESP32_DEFAULT_PTHREAD_CORE_1=
-CONFIG_ESP32_PTHREAD_TASK_CORE_DEFAULT=-1
-CONFIG_ESP32_PTHREAD_TASK_NAME_DEFAULT="pthread"
 
 #
 # SPI Flash driver
@@ -920,15 +866,6 @@ CONFIG_SPIFFS_TEST_VISUALISATION=
 CONFIG_IP_LOST_TIMER_INTERVAL=120
 CONFIG_TCPIP_LWIP=y
 
-#
-# Unity unit testing library
-#
-CONFIG_UNITY_ENABLE_FLOAT=y
-CONFIG_UNITY_ENABLE_DOUBLE=y
-CONFIG_UNITY_ENABLE_COLOR=
-CONFIG_UNITY_ENABLE_IDF_TEST_RUNNER=y
-CONFIG_UNITY_ENABLE_FIXTURE=
-
 #
 # Virtual file system
 #
@@ -942,11 +879,6 @@ CONFIG_WL_SECTOR_SIZE_512=
 CONFIG_WL_SECTOR_SIZE_4096=y
 CONFIG_WL_SECTOR_SIZE=4096
 
-#
-# Wi-Fi Provisioning Manager
-#
-CONFIG_WIFI_PROV_SCAN_MAX_ENTRIES=16
-
 #
 # Supplicant
 #

sdkconfig.changes-al

@@ -3,18 +3,25 @@
 #
 
 CONFIG_BTDM_CONTROLLER_MODE_BLE_ONLY=y
+CONFIG_BTDM_CONTROLLER_MODE_BR_EDR_ONLY=
+CONFIG_BTDM_CONTROLLER_MODE_BTDM=
 
 #
 # Wi-Fi
 #
 
-CONFIG_ESP32_WIFI_DYNAMIC_RX_BUFFER_NUM=64
-CONFIG_ESP32_WIFI_DYNAMIC_TX_BUFFER_NUM=64
-CONFIG_ESP32_WIFI_TX_BA_WIN=32
-CONFIG_ESP32_WIFI_RX_BA_WIN=32
+CONFIG_ESP32_WIFI_DYNAMIC_RX_BUFFER_NUM=32
+CONFIG_ESP32_WIFI_DYNAMIC_TX_BUFFER_NUM=32
+CONFIG_ESP32_WIFI_TX_BA_WIN=12
+CONFIG_ESP32_WIFI_RX_BA_WIN=16
+
+CONFIG_ESP32_WIFI_IRAM_OPT=
+CONFIG_ESP32_WIFI_RX_IRAM_OPT=
 
 #
 # TLS Key Exchange Methods
 #
 
 CONFIG_MBEDTLS_SSL_PROTO_DTLS=y
+CONFIG_MBEDTLS_HARDWARE_MPI=y
+CONFIG_MBEDTLS_MPI_USE_INTERRUPT=y

tools/config.sh

@@ -9,7 +9,10 @@ IDF_TOOLCHAIN_WIN32="https://dl.espressif.com/dl/xtensa-esp32-elf-win32-1.22.0-9
 IDF_TOOLCHAIN_MACOS="https://dl.espressif.com/dl/xtensa-esp32-elf-osx-1.22.0-96-g2852398-5.2.0.tar.gz"
 
 if [ -z $IDF_BRANCH ]; then
-	IDF_BRANCH="release/v3.3"
+#	IDF_BRANCH="master"
+#	IDF_BRANCH="release/v4.2"
+#	IDF_BRANCH="release/v3.3"
+	IDF_BRANCH="release/v3.2"
 fi
 
 # Owner of the target ESP32 Arduino repository

tools/install-esp-idf.sh

@@ -11,16 +11,20 @@ fi
 # CLONE ESP-IDF
 #
 
-if [ -z "$IDF_PATH" ]; then
-	echo "ESP-IDF is not installed! Installing local copy"
+if [ ! -d "$IDF_PATH" ]; then
+	echo "ESP-IDF is not installed! Installing local copy from $IDF_REPO_URL branch $IDF_BRANCH"
 	idf_was_installed="1"
 	if ! [ -d esp-idf ]; then
 		git clone $IDF_REPO_URL -b $IDF_BRANCH
 	fi
 	export IDF_PATH="$AR_ROOT/esp-idf"
+else
+	echo "ESP-IDF is installed in $IDF_PATH"
 fi
 
+
 if [ "$IDF_COMMIT" ]; then
+	echo "IDF_COMMIT set to $IDF_COMMIT"
     git -C "$IDF_PATH" checkout "$IDF_COMMIT"
     commit_predefined="1"
 fi