From 5cdde89da5837344e6398f32cbe20fb245934b52 Mon Sep 17 00:00:00 2001 From: Florian Loitsch Date: Wed, 4 Dec 2024 16:11:20 +0100 Subject: [PATCH 1/5] Update patches after 5.1 esp-idf roll. --- .../esp32-consibio/sdkconfig.defaults.patch | 25 +++++++------- .../sdkconfig.defaults.patch | 26 +++++++------- .../sdkconfig.defaults.patch | 6 ++-- .../sdkconfig.defaults.patch | 26 +++++++------- .../sdkconfig.defaults.patch | 6 ++-- .../esp32-no-ble/sdkconfig.defaults.patch | 22 ++++++------ variants/esp32-qemu/sdkconfig.defaults.patch | 4 +-- .../esp32-sedisto/sdkconfig.defaults.patch | 34 +++++++++---------- .../esp32-spiram/sdkconfig.defaults.patch | 26 +++++++------- .../esp32-tls-server/sdkconfig.defaults.patch | 2 +- .../sdkconfig.defaults.patch | 16 ++++----- .../esp32s3-no-ble/sdkconfig.defaults.patch | 10 +++--- .../sdkconfig.defaults.patch | 4 +-- .../esp32s3-synap/sdkconfig.defaults.patch | 21 ++++++------ 14 files changed, 113 insertions(+), 115 deletions(-) diff --git a/variants/esp32-consibio/sdkconfig.defaults.patch b/variants/esp32-consibio/sdkconfig.defaults.patch index 73023eb..bee2ff1 100644 --- a/variants/esp32-consibio/sdkconfig.defaults.patch +++ b/variants/esp32-consibio/sdkconfig.defaults.patch @@ -3,7 +3,7 @@ @@ -5,27 +5,10 @@ CONFIG_BOOTLOADER_APP_ROLLBACK_ENABLE=y CONFIG_BOOTLOADER_SKIP_VALIDATE_IN_DEEP_SLEEP=y - # CONFIG_APP_COMPILE_TIME_DATE is not set + CONFIG_APP_COMPILE_TIME_DATE=n -CONFIG_ESPTOOLPY_FLASHSIZE_4MB=y +CONFIG_ESPTOOLPY_FLASHSIZE_16MB=y CONFIG_PARTITION_TABLE_CUSTOM=y @@ -20,26 +20,25 @@ -CONFIG_BT_NIMBLE_NVS_PERSIST=y -CONFIG_BT_NIMBLE_SVC_GAP_DEVICE_NAME="toit" -CONFIG_BT_NIMBLE_SVC_GAP_APPEARANCE=0x0 --CONFIG_BT_NIMBLE_ACL_BUF_COUNT=10 +-CONFIG_BT_NIMBLE_TRANSPORT_ACL_FROM_LL_COUNT=10 -CONFIG_BTDM_CTRL_BLE_MAX_CONN=2 -CONFIG_BTDM_CTRL_PINNED_TO_CORE_1=y --# CONFIG_BTDM_CTRL_MODEM_SLEEP is not set --# CONFIG_BTDM_BLE_SCAN_DUPL is not set +-CONFIG_BTDM_CTRL_MODEM_SLEEP=n +-CONFIG_BTDM_BLE_SCAN_DUPL=n -CONFIG_BTDM_BLE_ADV_REPORT_FLOW_CTRL_NUM=50 - # CONFIG_ADC_CAL_EFUSE_TP_ENABLE is not set - # CONFIG_ADC_CAL_LUT_ENABLE is not set - # CONFIG_SPI_SLAVE_ISR_IN_IRAM is not set -@@ -62,6 +45,8 @@ + CONFIG_ADC_CAL_EFUSE_TP_ENABLE=n + CONFIG_ADC_CAL_LUT_ENABLE=n + CONFIG_SPI_SLAVE_ISR_IN_IRAM=n +@@ -62,6 +45,7 @@ CONFIG_MBEDTLS_SSL_IN_CONTENT_LEN=7800 CONFIG_MBEDTLS_SSL_OUT_CONTENT_LEN=3700 CONFIG_MBEDTLS_X509_TRUSTED_CERT_CALLBACK=y +CONFIG_MBEDTLS_ECP_RESTARTABLE=y -+CONFIG_MBEDTLS_CMAC_C=y - # CONFIG_MBEDTLS_HARDWARE_MPI is not set + CONFIG_MBEDTLS_HARDWARE_MPI=n CONFIG_MBEDTLS_TLS_CLIENT_ONLY=y CONFIG_MBEDTLS_POLY1305_C=y -@@ -73,4 +58,3 @@ +@@ -73,4 +57,3 @@ CONFIG_SPI_FLASH_LOG_FAILED_WRITE=y CONFIG_SPI_FLASH_WARN_SETTING_ZERO_TO_ONE=y - # CONFIG_WS_TRANSPORT is not set --# CONFIG_TOIT_INTERPRETER_HELPERS_IN_IRAM is not set + CONFIG_WS_TRANSPORT=n +-CONFIG_TOIT_INTERPRETER_HELPERS_IN_IRAM=n diff --git a/variants/esp32-eth-clk-out0-spiram/sdkconfig.defaults.patch b/variants/esp32-eth-clk-out0-spiram/sdkconfig.defaults.patch index e5a5f36..8844244 100644 --- a/variants/esp32-eth-clk-out0-spiram/sdkconfig.defaults.patch +++ b/variants/esp32-eth-clk-out0-spiram/sdkconfig.defaults.patch @@ -1,34 +1,34 @@ --- toit/toolchains/esp32/sdkconfig.defaults +++ synthesized/esp32-eth-clk-out0-spiram/sdkconfig.defaults @@ -31,12 +31,17 @@ - # CONFIG_SPI_SLAVE_ISR_IN_IRAM is not set + CONFIG_SPI_SLAVE_ISR_IN_IRAM=n CONFIG_UART_ISR_IN_IRAM=y - # CONFIG_ESP_ERR_TO_NAME_LOOKUP is not set + CONFIG_ESP_ERR_TO_NAME_LOOKUP=n +CONFIG_ETH_RMII_CLK_OUTPUT=y +CONFIG_ETH_RMII_CLK_OUTPUT_GPIO0=y CONFIG_ETH_SPI_ETHERNET_DM9051=y CONFIG_ETH_SPI_ETHERNET_W5500=y - # CONFIG_ESP_HTTP_CLIENT_ENABLE_HTTPS is not set + CONFIG_ESP_HTTP_CLIENT_ENABLE_HTTPS=n CONFIG_ESP_SLEEP_GPIO_RESET_WORKAROUND=y CONFIG_XTAL_FREQ_AUTO=y - # CONFIG_ESP_PHY_CALIBRATION_AND_DATA_STORAGE is not set + CONFIG_ESP_PHY_CALIBRATION_AND_DATA_STORAGE=n +CONFIG_SPIRAM=y +CONFIG_SPIRAM_IGNORE_NOTFOUND=y +CONFIG_SPIRAM_USE_CAPS_ALLOC=y CONFIG_ESP_DEFAULT_CPU_FREQ_MHZ_240=y - # CONFIG_ESP_INT_WDT is not set - # CONFIG_ESP_TASK_WDT_INIT is not set + CONFIG_ESP_INT_WDT=n + CONFIG_ESP_TASK_WDT_INIT=n @@ -45,7 +50,6 @@ - CONFIG_ESP32_WIFI_DYNAMIC_TX_BUFFER_NUM=16 - # CONFIG_ESP32_WIFI_NVS_ENABLED is not set - CONFIG_ESP32_WIFI_TASK_PINNED_TO_CORE_1=y --# CONFIG_ESP32_WIFI_IRAM_OPT is not set + CONFIG_ESP_WIFI_DYNAMIC_TX_BUFFER_NUM=16 + CONFIG_ESP_WIFI_NVS_ENABLED=n + CONFIG_ESP_WIFI_TASK_PINNED_TO_CORE_1=y +-CONFIG_ESP_WIFI_IRAM_OPT=n CONFIG_FATFS_LFN_HEAP=y CONFIG_FREERTOS_THREAD_LOCAL_STORAGE_POINTERS=3 CONFIG_FREERTOS_IDLE_TASK_STACKSIZE=1024 @@ -73,4 +77,5 @@ CONFIG_SPI_FLASH_LOG_FAILED_WRITE=y CONFIG_SPI_FLASH_WARN_SETTING_ZERO_TO_ONE=y - # CONFIG_WS_TRANSPORT is not set -+# CONFIG_TOIT_INTERPRETER_IN_IRAM is not set - # CONFIG_TOIT_INTERPRETER_HELPERS_IN_IRAM is not set + CONFIG_WS_TRANSPORT=n ++CONFIG_TOIT_INTERPRETER_IN_IRAM=n + CONFIG_TOIT_INTERPRETER_HELPERS_IN_IRAM=n diff --git a/variants/esp32-eth-clk-out0/sdkconfig.defaults.patch b/variants/esp32-eth-clk-out0/sdkconfig.defaults.patch index fbbd35a..ae2c817 100644 --- a/variants/esp32-eth-clk-out0/sdkconfig.defaults.patch +++ b/variants/esp32-eth-clk-out0/sdkconfig.defaults.patch @@ -1,11 +1,11 @@ --- toit/toolchains/esp32/sdkconfig.defaults +++ synthesized/esp32-eth-clk-out0/sdkconfig.defaults @@ -31,6 +31,8 @@ - # CONFIG_SPI_SLAVE_ISR_IN_IRAM is not set + CONFIG_SPI_SLAVE_ISR_IN_IRAM=n CONFIG_UART_ISR_IN_IRAM=y - # CONFIG_ESP_ERR_TO_NAME_LOOKUP is not set + CONFIG_ESP_ERR_TO_NAME_LOOKUP=n +CONFIG_ETH_RMII_CLK_OUTPUT=y +CONFIG_ETH_RMII_CLK_OUTPUT_GPIO0=y CONFIG_ETH_SPI_ETHERNET_DM9051=y CONFIG_ETH_SPI_ETHERNET_W5500=y - # CONFIG_ESP_HTTP_CLIENT_ENABLE_HTTPS is not set + CONFIG_ESP_HTTP_CLIENT_ENABLE_HTTPS=n diff --git a/variants/esp32-eth-clk-out17-spiram/sdkconfig.defaults.patch b/variants/esp32-eth-clk-out17-spiram/sdkconfig.defaults.patch index cbf2305..5fed786 100644 --- a/variants/esp32-eth-clk-out17-spiram/sdkconfig.defaults.patch +++ b/variants/esp32-eth-clk-out17-spiram/sdkconfig.defaults.patch @@ -1,33 +1,33 @@ --- toit/toolchains/esp32/sdkconfig.defaults +++ synthesized/esp32-eth-clk-out17-spiram/sdkconfig.defaults @@ -31,12 +31,16 @@ - # CONFIG_SPI_SLAVE_ISR_IN_IRAM is not set + CONFIG_SPI_SLAVE_ISR_IN_IRAM=n CONFIG_UART_ISR_IN_IRAM=y - # CONFIG_ESP_ERR_TO_NAME_LOOKUP is not set + CONFIG_ESP_ERR_TO_NAME_LOOKUP=n +CONFIG_ETH_RMII_CLK_OUTPUT=y CONFIG_ETH_SPI_ETHERNET_DM9051=y CONFIG_ETH_SPI_ETHERNET_W5500=y - # CONFIG_ESP_HTTP_CLIENT_ENABLE_HTTPS is not set + CONFIG_ESP_HTTP_CLIENT_ENABLE_HTTPS=n CONFIG_ESP_SLEEP_GPIO_RESET_WORKAROUND=y CONFIG_XTAL_FREQ_AUTO=y - # CONFIG_ESP_PHY_CALIBRATION_AND_DATA_STORAGE is not set + CONFIG_ESP_PHY_CALIBRATION_AND_DATA_STORAGE=n +CONFIG_SPIRAM=y +CONFIG_SPIRAM_IGNORE_NOTFOUND=y +CONFIG_SPIRAM_USE_CAPS_ALLOC=y CONFIG_ESP_DEFAULT_CPU_FREQ_MHZ_240=y - # CONFIG_ESP_INT_WDT is not set - # CONFIG_ESP_TASK_WDT_INIT is not set + CONFIG_ESP_INT_WDT=n + CONFIG_ESP_TASK_WDT_INIT=n @@ -45,7 +49,6 @@ - CONFIG_ESP32_WIFI_DYNAMIC_TX_BUFFER_NUM=16 - # CONFIG_ESP32_WIFI_NVS_ENABLED is not set - CONFIG_ESP32_WIFI_TASK_PINNED_TO_CORE_1=y --# CONFIG_ESP32_WIFI_IRAM_OPT is not set + CONFIG_ESP_WIFI_DYNAMIC_TX_BUFFER_NUM=16 + CONFIG_ESP_WIFI_NVS_ENABLED=n + CONFIG_ESP_WIFI_TASK_PINNED_TO_CORE_1=y +-CONFIG_ESP_WIFI_IRAM_OPT=n CONFIG_FATFS_LFN_HEAP=y CONFIG_FREERTOS_THREAD_LOCAL_STORAGE_POINTERS=3 CONFIG_FREERTOS_IDLE_TASK_STACKSIZE=1024 @@ -73,4 +76,5 @@ CONFIG_SPI_FLASH_LOG_FAILED_WRITE=y CONFIG_SPI_FLASH_WARN_SETTING_ZERO_TO_ONE=y - # CONFIG_WS_TRANSPORT is not set -+# CONFIG_TOIT_INTERPRETER_IN_IRAM is not set - # CONFIG_TOIT_INTERPRETER_HELPERS_IN_IRAM is not set + CONFIG_WS_TRANSPORT=n ++CONFIG_TOIT_INTERPRETER_IN_IRAM=n + CONFIG_TOIT_INTERPRETER_HELPERS_IN_IRAM=n diff --git a/variants/esp32-eth-clk-out17/sdkconfig.defaults.patch b/variants/esp32-eth-clk-out17/sdkconfig.defaults.patch index 2134eff..678e392 100644 --- a/variants/esp32-eth-clk-out17/sdkconfig.defaults.patch +++ b/variants/esp32-eth-clk-out17/sdkconfig.defaults.patch @@ -1,10 +1,10 @@ --- toit/toolchains/esp32/sdkconfig.defaults +++ synthesized/esp32-eth-clk-out17/sdkconfig.defaults @@ -31,6 +31,7 @@ - # CONFIG_SPI_SLAVE_ISR_IN_IRAM is not set + CONFIG_SPI_SLAVE_ISR_IN_IRAM=n CONFIG_UART_ISR_IN_IRAM=y - # CONFIG_ESP_ERR_TO_NAME_LOOKUP is not set + CONFIG_ESP_ERR_TO_NAME_LOOKUP=n +CONFIG_ETH_RMII_CLK_OUTPUT=y CONFIG_ETH_SPI_ETHERNET_DM9051=y CONFIG_ETH_SPI_ETHERNET_W5500=y - # CONFIG_ESP_HTTP_CLIENT_ENABLE_HTTPS is not set + CONFIG_ESP_HTTP_CLIENT_ENABLE_HTTPS=n diff --git a/variants/esp32-no-ble/sdkconfig.defaults.patch b/variants/esp32-no-ble/sdkconfig.defaults.patch index 350ced4..202c778 100644 --- a/variants/esp32-no-ble/sdkconfig.defaults.patch +++ b/variants/esp32-no-ble/sdkconfig.defaults.patch @@ -15,27 +15,27 @@ -CONFIG_BT_NIMBLE_NVS_PERSIST=y -CONFIG_BT_NIMBLE_SVC_GAP_DEVICE_NAME="toit" -CONFIG_BT_NIMBLE_SVC_GAP_APPEARANCE=0x0 --CONFIG_BT_NIMBLE_ACL_BUF_COUNT=10 +-CONFIG_BT_NIMBLE_TRANSPORT_ACL_FROM_LL_COUNT=10 -CONFIG_BTDM_CTRL_BLE_MAX_CONN=2 -CONFIG_BTDM_CTRL_PINNED_TO_CORE_1=y --# CONFIG_BTDM_CTRL_MODEM_SLEEP is not set --# CONFIG_BTDM_BLE_SCAN_DUPL is not set +-CONFIG_BTDM_CTRL_MODEM_SLEEP=n +-CONFIG_BTDM_BLE_SCAN_DUPL=n -CONFIG_BTDM_BLE_ADV_REPORT_FLOW_CTRL_NUM=50 - # CONFIG_ADC_CAL_EFUSE_TP_ENABLE is not set - # CONFIG_ADC_CAL_LUT_ENABLE is not set - # CONFIG_SPI_SLAVE_ISR_IN_IRAM is not set + CONFIG_ADC_CAL_EFUSE_TP_ENABLE=n + CONFIG_ADC_CAL_LUT_ENABLE=n + CONFIG_SPI_SLAVE_ISR_IN_IRAM=n @@ -37,6 +20,9 @@ CONFIG_ESP_SLEEP_GPIO_RESET_WORKAROUND=y CONFIG_XTAL_FREQ_AUTO=y - # CONFIG_ESP_PHY_CALIBRATION_AND_DATA_STORAGE is not set + CONFIG_ESP_PHY_CALIBRATION_AND_DATA_STORAGE=n +CONFIG_SPIRAM=y +CONFIG_SPIRAM_IGNORE_NOTFOUND=y +CONFIG_SPIRAM_USE_CAPS_ALLOC=y CONFIG_ESP_DEFAULT_CPU_FREQ_MHZ_240=y - # CONFIG_ESP_INT_WDT is not set - # CONFIG_ESP_TASK_WDT_INIT is not set + CONFIG_ESP_INT_WDT=n + CONFIG_ESP_TASK_WDT_INIT=n @@ -73,4 +59,3 @@ CONFIG_SPI_FLASH_LOG_FAILED_WRITE=y CONFIG_SPI_FLASH_WARN_SETTING_ZERO_TO_ONE=y - # CONFIG_WS_TRANSPORT is not set --# CONFIG_TOIT_INTERPRETER_HELPERS_IN_IRAM is not set + CONFIG_WS_TRANSPORT=n +-CONFIG_TOIT_INTERPRETER_HELPERS_IN_IRAM=n diff --git a/variants/esp32-qemu/sdkconfig.defaults.patch b/variants/esp32-qemu/sdkconfig.defaults.patch index f12d6bf..a04e4de 100644 --- a/variants/esp32-qemu/sdkconfig.defaults.patch +++ b/variants/esp32-qemu/sdkconfig.defaults.patch @@ -1,10 +1,10 @@ --- toit/toolchains/esp32/sdkconfig.defaults +++ synthesized/esp32-qemu/sdkconfig.defaults @@ -33,6 +33,7 @@ - # CONFIG_ESP_ERR_TO_NAME_LOOKUP is not set + CONFIG_ESP_ERR_TO_NAME_LOOKUP=n CONFIG_ETH_SPI_ETHERNET_DM9051=y CONFIG_ETH_SPI_ETHERNET_W5500=y +CONFIG_ETH_USE_OPENETH=y - # CONFIG_ESP_HTTP_CLIENT_ENABLE_HTTPS is not set + CONFIG_ESP_HTTP_CLIENT_ENABLE_HTTPS=n CONFIG_ESP_SLEEP_GPIO_RESET_WORKAROUND=y CONFIG_XTAL_FREQ_AUTO=y diff --git a/variants/esp32-sedisto/sdkconfig.defaults.patch b/variants/esp32-sedisto/sdkconfig.defaults.patch index 3c7683b..214278e 100644 --- a/variants/esp32-sedisto/sdkconfig.defaults.patch +++ b/variants/esp32-sedisto/sdkconfig.defaults.patch @@ -1,38 +1,38 @@ --- toit/toolchains/esp32/sdkconfig.defaults +++ synthesized/esp32-sedisto/sdkconfig.defaults @@ -31,12 +31,17 @@ - # CONFIG_SPI_SLAVE_ISR_IN_IRAM is not set + CONFIG_SPI_SLAVE_ISR_IN_IRAM=n CONFIG_UART_ISR_IN_IRAM=y - # CONFIG_ESP_ERR_TO_NAME_LOOKUP is not set + CONFIG_ESP_ERR_TO_NAME_LOOKUP=n +CONFIG_ETH_RMII_CLK_OUTPUT=y +CONFIG_ETH_RMII_CLK_OUTPUT_GPIO0=y CONFIG_ETH_SPI_ETHERNET_DM9051=y CONFIG_ETH_SPI_ETHERNET_W5500=y - # CONFIG_ESP_HTTP_CLIENT_ENABLE_HTTPS is not set + CONFIG_ESP_HTTP_CLIENT_ENABLE_HTTPS=n CONFIG_ESP_SLEEP_GPIO_RESET_WORKAROUND=y CONFIG_XTAL_FREQ_AUTO=y - # CONFIG_ESP_PHY_CALIBRATION_AND_DATA_STORAGE is not set + CONFIG_ESP_PHY_CALIBRATION_AND_DATA_STORAGE=n +CONFIG_SPIRAM=y +CONFIG_SPIRAM_IGNORE_NOTFOUND=y +CONFIG_SPIRAM_USE_CAPS_ALLOC=y CONFIG_ESP_DEFAULT_CPU_FREQ_MHZ_240=y - # CONFIG_ESP_INT_WDT is not set - # CONFIG_ESP_TASK_WDT_INIT is not set + CONFIG_ESP_INT_WDT=n + CONFIG_ESP_TASK_WDT_INIT=n @@ -45,7 +50,6 @@ - CONFIG_ESP32_WIFI_DYNAMIC_TX_BUFFER_NUM=16 - # CONFIG_ESP32_WIFI_NVS_ENABLED is not set - CONFIG_ESP32_WIFI_TASK_PINNED_TO_CORE_1=y --# CONFIG_ESP32_WIFI_IRAM_OPT is not set + CONFIG_ESP_WIFI_DYNAMIC_TX_BUFFER_NUM=16 + CONFIG_ESP_WIFI_NVS_ENABLED=n + CONFIG_ESP_WIFI_TASK_PINNED_TO_CORE_1=y +-CONFIG_ESP_WIFI_IRAM_OPT=n CONFIG_FATFS_LFN_HEAP=y CONFIG_FREERTOS_THREAD_LOCAL_STORAGE_POINTERS=3 CONFIG_FREERTOS_IDLE_TASK_STACKSIZE=1024 @@ -73,4 +77,9 @@ CONFIG_SPI_FLASH_LOG_FAILED_WRITE=y CONFIG_SPI_FLASH_WARN_SETTING_ZERO_TO_ONE=y - # CONFIG_WS_TRANSPORT is not set -+# CONFIG_TOIT_BYTE_DISPLAY is not set -+# CONFIG_TOIT_BIT_DISPLAY is not set -+# CONFIG_TOIT_FONT is not set -+# CONFIG_TOIT_FATFS is not set -+# CONFIG_TOIT_INTERPRETER_IN_IRAM is not set - # CONFIG_TOIT_INTERPRETER_HELPERS_IN_IRAM is not set + CONFIG_WS_TRANSPORT=n ++CONFIG_TOIT_BYTE_DISPLAY=n ++CONFIG_TOIT_BIT_DISPLAY=n ++CONFIG_TOIT_FONT=n ++CONFIG_TOIT_FATFS=n ++CONFIG_TOIT_INTERPRETER_IN_IRAM=n + CONFIG_TOIT_INTERPRETER_HELPERS_IN_IRAM=n diff --git a/variants/esp32-spiram/sdkconfig.defaults.patch b/variants/esp32-spiram/sdkconfig.defaults.patch index 088c4d6..4dbee80 100644 --- a/variants/esp32-spiram/sdkconfig.defaults.patch +++ b/variants/esp32-spiram/sdkconfig.defaults.patch @@ -3,25 +3,25 @@ @@ -37,15 +37,16 @@ CONFIG_ESP_SLEEP_GPIO_RESET_WORKAROUND=y CONFIG_XTAL_FREQ_AUTO=y - # CONFIG_ESP_PHY_CALIBRATION_AND_DATA_STORAGE is not set + CONFIG_ESP_PHY_CALIBRATION_AND_DATA_STORAGE=n +CONFIG_SPIRAM=y +CONFIG_SPIRAM_IGNORE_NOTFOUND=y CONFIG_ESP_DEFAULT_CPU_FREQ_MHZ_240=y - # CONFIG_ESP_INT_WDT is not set - # CONFIG_ESP_TASK_WDT_INIT is not set - # CONFIG_ESP_DEBUG_OCDAWARE is not set - CONFIG_ESP32_WIFI_DYNAMIC_RX_BUFFER_NUM=16 --CONFIG_ESP32_WIFI_DYNAMIC_TX_BUFFER_NUM=16 - # CONFIG_ESP32_WIFI_NVS_ENABLED is not set - CONFIG_ESP32_WIFI_TASK_PINNED_TO_CORE_1=y --# CONFIG_ESP32_WIFI_IRAM_OPT is not set -+CONFIG_ESP32_WIFI_RX_IRAM_OPT=y + CONFIG_ESP_INT_WDT=n + CONFIG_ESP_TASK_WDT_INIT=n + CONFIG_ESP_DEBUG_OCDAWARE=n + CONFIG_ESP_WIFI_DYNAMIC_RX_BUFFER_NUM=16 +-CONFIG_ESP_WIFI_DYNAMIC_TX_BUFFER_NUM=16 + CONFIG_ESP_WIFI_NVS_ENABLED=n + CONFIG_ESP_WIFI_TASK_PINNED_TO_CORE_1=y +-CONFIG_ESP_WIFI_IRAM_OPT=n ++CONFIG_ESP_WIFI_RX_IRAM_OPT=y CONFIG_FATFS_LFN_HEAP=y CONFIG_FREERTOS_THREAD_LOCAL_STORAGE_POINTERS=3 CONFIG_FREERTOS_IDLE_TASK_STACKSIZE=1024 @@ -73,4 +74,5 @@ CONFIG_SPI_FLASH_LOG_FAILED_WRITE=y CONFIG_SPI_FLASH_WARN_SETTING_ZERO_TO_ONE=y - # CONFIG_WS_TRANSPORT is not set -+# CONFIG_TOIT_INTERPRETER_IN_IRAM is not set - # CONFIG_TOIT_INTERPRETER_HELPERS_IN_IRAM is not set + CONFIG_WS_TRANSPORT=n ++CONFIG_TOIT_INTERPRETER_IN_IRAM=n + CONFIG_TOIT_INTERPRETER_HELPERS_IN_IRAM=n diff --git a/variants/esp32-tls-server/sdkconfig.defaults.patch b/variants/esp32-tls-server/sdkconfig.defaults.patch index e6e0eeb..795ebdb 100644 --- a/variants/esp32-tls-server/sdkconfig.defaults.patch +++ b/variants/esp32-tls-server/sdkconfig.defaults.patch @@ -3,7 +3,7 @@ @@ -63,7 +63,6 @@ CONFIG_MBEDTLS_SSL_OUT_CONTENT_LEN=3700 CONFIG_MBEDTLS_X509_TRUSTED_CERT_CALLBACK=y - # CONFIG_MBEDTLS_HARDWARE_MPI is not set + CONFIG_MBEDTLS_HARDWARE_MPI=n -CONFIG_MBEDTLS_TLS_CLIENT_ONLY=y CONFIG_MBEDTLS_POLY1305_C=y CONFIG_MBEDTLS_CHACHA20_C=y diff --git a/variants/esp32s3-consibio-spiram-octo/sdkconfig.defaults.patch b/variants/esp32s3-consibio-spiram-octo/sdkconfig.defaults.patch index 69cd82a..46da057 100644 --- a/variants/esp32s3-consibio-spiram-octo/sdkconfig.defaults.patch +++ b/variants/esp32s3-consibio-spiram-octo/sdkconfig.defaults.patch @@ -3,7 +3,7 @@ @@ -6,23 +6,12 @@ CONFIG_BOOTLOADER_APP_ROLLBACK_ENABLE=y CONFIG_BOOTLOADER_SKIP_VALIDATE_IN_DEEP_SLEEP=y - # CONFIG_APP_COMPILE_TIME_DATE is not set + CONFIG_APP_COMPILE_TIME_DATE=n -CONFIG_ESPTOOLPY_FLASHSIZE_4MB=y +CONFIG_ESPTOOLPY_OCT_FLASH=y +CONFIG_ESPTOOLPY_FLASH_SAMPLE_MODE_STR=y @@ -22,24 +22,24 @@ -CONFIG_BT_NIMBLE_NVS_PERSIST=y -CONFIG_BT_NIMBLE_SVC_GAP_DEVICE_NAME="toit" -CONFIG_BT_NIMBLE_SVC_GAP_APPEARANCE=0x0 --CONFIG_BT_NIMBLE_ACL_BUF_COUNT=10 +-CONFIG_BT_NIMBLE_TRANSPORT_ACL_FROM_LL_COUNT=10 -CONFIG_BT_CTRL_BLE_MAX_ACT=10 - # CONFIG_SPI_SLAVE_ISR_IN_IRAM is not set + CONFIG_SPI_SLAVE_ISR_IN_IRAM=n CONFIG_UART_ISR_IN_IRAM=y - # CONFIG_ESP_ERR_TO_NAME_LOOKUP is not set + CONFIG_ESP_ERR_TO_NAME_LOOKUP=n @@ -32,6 +21,7 @@ - # CONFIG_ESP_PHY_CALIBRATION_AND_DATA_STORAGE is not set + CONFIG_ESP_PHY_CALIBRATION_AND_DATA_STORAGE=n CONFIG_ESP_PHY_REDUCE_TX_POWER=y CONFIG_SPIRAM=y +CONFIG_SPIRAM_MODE_OCT=y CONFIG_SPIRAM_IGNORE_NOTFOUND=y - CONFIG_SPIRAM_RODATA_PADDING=2097152 CONFIG_ESP_DEFAULT_CPU_FREQ_MHZ_240=y -@@ -57,6 +47,7 @@ + CONFIG_ESP_INT_WDT=n +@@ -56,6 +46,7 @@ CONFIG_MBEDTLS_SSL_IN_CONTENT_LEN=7800 CONFIG_MBEDTLS_SSL_OUT_CONTENT_LEN=3700 CONFIG_MBEDTLS_X509_TRUSTED_CERT_CALLBACK=y +CONFIG_MBEDTLS_ECP_RESTARTABLE=y - # CONFIG_MBEDTLS_HARDWARE_MPI is not set + CONFIG_MBEDTLS_HARDWARE_MPI=n CONFIG_MBEDTLS_TLS_CLIENT_ONLY=y CONFIG_MBEDTLS_POLY1305_C=y diff --git a/variants/esp32s3-no-ble/sdkconfig.defaults.patch b/variants/esp32s3-no-ble/sdkconfig.defaults.patch index 631dcf4..8b8074f 100644 --- a/variants/esp32s3-no-ble/sdkconfig.defaults.patch +++ b/variants/esp32s3-no-ble/sdkconfig.defaults.patch @@ -15,16 +15,16 @@ -CONFIG_BT_NIMBLE_NVS_PERSIST=y -CONFIG_BT_NIMBLE_SVC_GAP_DEVICE_NAME="toit" -CONFIG_BT_NIMBLE_SVC_GAP_APPEARANCE=0x0 --CONFIG_BT_NIMBLE_ACL_BUF_COUNT=10 +-CONFIG_BT_NIMBLE_TRANSPORT_ACL_FROM_LL_COUNT=10 -CONFIG_BT_CTRL_BLE_MAX_ACT=10 - # CONFIG_SPI_SLAVE_ISR_IN_IRAM is not set + CONFIG_SPI_SLAVE_ISR_IN_IRAM=n CONFIG_UART_ISR_IN_IRAM=y - # CONFIG_ESP_ERR_TO_NAME_LOOKUP is not set -@@ -57,6 +44,7 @@ + CONFIG_ESP_ERR_TO_NAME_LOOKUP=n +@@ -56,6 +43,7 @@ CONFIG_MBEDTLS_SSL_IN_CONTENT_LEN=7800 CONFIG_MBEDTLS_SSL_OUT_CONTENT_LEN=3700 CONFIG_MBEDTLS_X509_TRUSTED_CERT_CALLBACK=y +CONFIG_MBEDTLS_ECP_RESTARTABLE=y - # CONFIG_MBEDTLS_HARDWARE_MPI is not set + CONFIG_MBEDTLS_HARDWARE_MPI=n CONFIG_MBEDTLS_TLS_CLIENT_ONLY=y CONFIG_MBEDTLS_POLY1305_C=y diff --git a/variants/esp32s3-spiram-octo/sdkconfig.defaults.patch b/variants/esp32s3-spiram-octo/sdkconfig.defaults.patch index cd5ee07..74f917c 100644 --- a/variants/esp32s3-spiram-octo/sdkconfig.defaults.patch +++ b/variants/esp32s3-spiram-octo/sdkconfig.defaults.patch @@ -1,10 +1,10 @@ --- toit/toolchains/esp32s3/sdkconfig.defaults +++ synthesized/esp32s3-spiram-octo/sdkconfig.defaults @@ -32,6 +32,7 @@ - # CONFIG_ESP_PHY_CALIBRATION_AND_DATA_STORAGE is not set + CONFIG_ESP_PHY_CALIBRATION_AND_DATA_STORAGE=n CONFIG_ESP_PHY_REDUCE_TX_POWER=y CONFIG_SPIRAM=y +CONFIG_SPIRAM_MODE_OCT=y CONFIG_SPIRAM_IGNORE_NOTFOUND=y - CONFIG_SPIRAM_RODATA_PADDING=2097152 CONFIG_ESP_DEFAULT_CPU_FREQ_MHZ_240=y + CONFIG_ESP_INT_WDT=n diff --git a/variants/esp32s3-synap/sdkconfig.defaults.patch b/variants/esp32s3-synap/sdkconfig.defaults.patch index 460d9f8..4dc283d 100644 --- a/variants/esp32s3-synap/sdkconfig.defaults.patch +++ b/variants/esp32s3-synap/sdkconfig.defaults.patch @@ -3,7 +3,7 @@ @@ -6,23 +6,10 @@ CONFIG_BOOTLOADER_APP_ROLLBACK_ENABLE=y CONFIG_BOOTLOADER_SKIP_VALIDATE_IN_DEEP_SLEEP=y - # CONFIG_APP_COMPILE_TIME_DATE is not set + CONFIG_APP_COMPILE_TIME_DATE=n -CONFIG_ESPTOOLPY_FLASHSIZE_4MB=y +CONFIG_ESPTOOLPY_FLASHSIZE_8MB=y CONFIG_PARTITION_TABLE_CUSTOM=y @@ -20,26 +20,25 @@ -CONFIG_BT_NIMBLE_NVS_PERSIST=y -CONFIG_BT_NIMBLE_SVC_GAP_DEVICE_NAME="toit" -CONFIG_BT_NIMBLE_SVC_GAP_APPEARANCE=0x0 --CONFIG_BT_NIMBLE_ACL_BUF_COUNT=10 +-CONFIG_BT_NIMBLE_TRANSPORT_ACL_FROM_LL_COUNT=10 -CONFIG_BT_CTRL_BLE_MAX_ACT=10 - # CONFIG_SPI_SLAVE_ISR_IN_IRAM is not set + CONFIG_SPI_SLAVE_ISR_IN_IRAM=n CONFIG_UART_ISR_IN_IRAM=y - # CONFIG_ESP_ERR_TO_NAME_LOOKUP is not set -@@ -35,6 +22,8 @@ + CONFIG_ESP_ERR_TO_NAME_LOOKUP=n +@@ -34,6 +21,8 @@ + CONFIG_SPIRAM=y CONFIG_SPIRAM_IGNORE_NOTFOUND=y - CONFIG_SPIRAM_RODATA_PADDING=2097152 CONFIG_ESP_DEFAULT_CPU_FREQ_MHZ_240=y +CONFIG_ESP_CONSOLE_UART_CUSTOM=y +CONFIG_ESP_CONSOLE_UART_RX_GPIO=7 - # CONFIG_ESP_INT_WDT is not set - # CONFIG_ESP_TASK_WDT_INIT is not set + CONFIG_ESP_INT_WDT=n + CONFIG_ESP_TASK_WDT_INIT=n CONFIG_ESP_IPC_TASK_STACK_SIZE=1024 -@@ -57,6 +46,8 @@ +@@ -56,6 +45,7 @@ CONFIG_MBEDTLS_SSL_IN_CONTENT_LEN=7800 CONFIG_MBEDTLS_SSL_OUT_CONTENT_LEN=3700 CONFIG_MBEDTLS_X509_TRUSTED_CERT_CALLBACK=y +CONFIG_MBEDTLS_ECP_RESTARTABLE=y -+CONFIG_MBEDTLS_CMAC_C=y - # CONFIG_MBEDTLS_HARDWARE_MPI is not set + CONFIG_MBEDTLS_HARDWARE_MPI=n CONFIG_MBEDTLS_TLS_CLIENT_ONLY=y CONFIG_MBEDTLS_POLY1305_C=y From 51e133e8f7c49cc9dde3763181c84b3baf8ec078 Mon Sep 17 00:00:00 2001 From: Florian Loitsch Date: Wed, 4 Dec 2024 16:35:58 +0100 Subject: [PATCH 2/5] Use sdk defaults. --- .../esp32-consibio/sdkconfig.defaults.patch | 21 +++++++++++++--- .../sdkconfig.defaults.patch | 20 +++++++++++++-- .../sdkconfig.defaults.patch | 23 +++++++++++++++++ .../sdkconfig.defaults.patch | 20 +++++++++++++-- .../sdkconfig.defaults.patch | 23 +++++++++++++++++ .../esp32-no-ble/sdkconfig.defaults.patch | 25 ++++++++++++++++++- variants/esp32-qemu/sdkconfig.defaults.patch | 23 +++++++++++++++++ .../esp32-sedisto/sdkconfig.defaults.patch | 20 +++++++++++++-- .../esp32-spiram/sdkconfig.defaults.patch | 20 +++++++++++++-- .../esp32-tls-server/sdkconfig.defaults.patch | 17 ++++++++++++- .../sdkconfig.defaults.patch | 19 ++++++++++++-- .../esp32s3-no-ble/sdkconfig.defaults.patch | 19 ++++++++++++-- .../sdkconfig.defaults.patch | 23 +++++++++++++++++ .../esp32s3-synap/sdkconfig.defaults.patch | 20 ++++++++++++--- 14 files changed, 273 insertions(+), 20 deletions(-) diff --git a/variants/esp32-consibio/sdkconfig.defaults.patch b/variants/esp32-consibio/sdkconfig.defaults.patch index bee2ff1..bb8fdbb 100644 --- a/variants/esp32-consibio/sdkconfig.defaults.patch +++ b/variants/esp32-consibio/sdkconfig.defaults.patch @@ -29,15 +29,30 @@ CONFIG_ADC_CAL_EFUSE_TP_ENABLE=n CONFIG_ADC_CAL_LUT_ENABLE=n CONFIG_SPI_SLAVE_ISR_IN_IRAM=n -@@ -62,6 +45,7 @@ +@@ -46,7 +29,6 @@ + CONFIG_ESP_WIFI_NVS_ENABLED=n + CONFIG_ESP_WIFI_TASK_PINNED_TO_CORE_1=y + CONFIG_ESP_WIFI_IRAM_OPT=n +-CONFIG_ESP_WIFI_GMAC_SUPPORT=n + CONFIG_FATFS_LFN_HEAP=y + CONFIG_FREERTOS_THREAD_LOCAL_STORAGE_POINTERS=3 + CONFIG_FREERTOS_IDLE_TASK_STACKSIZE=1024 +@@ -60,14 +42,12 @@ + CONFIG_LWIP_TCP_MSS=1410 + CONFIG_LWIP_TCP_SND_BUF_DEFAULT=5640 + CONFIG_LWIP_TCP_WND_DEFAULT=5640 +-CONFIG_LWIP_HOOK_IP6_INPUT_NONE=y CONFIG_MBEDTLS_SSL_IN_CONTENT_LEN=7800 CONFIG_MBEDTLS_SSL_OUT_CONTENT_LEN=3700 CONFIG_MBEDTLS_X509_TRUSTED_CERT_CALLBACK=y -+CONFIG_MBEDTLS_ECP_RESTARTABLE=y + CONFIG_MBEDTLS_ECP_RESTARTABLE=y CONFIG_MBEDTLS_HARDWARE_MPI=n CONFIG_MBEDTLS_TLS_CLIENT_ONLY=y +-CONFIG_MBEDTLS_ECP_FIXED_POINT_OPTIM=y CONFIG_MBEDTLS_POLY1305_C=y -@@ -73,4 +57,3 @@ + CONFIG_MBEDTLS_CHACHA20_C=y + CONFIG_MBEDTLS_CHACHAPOLY_C=y +@@ -77,4 +57,3 @@ CONFIG_SPI_FLASH_LOG_FAILED_WRITE=y CONFIG_SPI_FLASH_WARN_SETTING_ZERO_TO_ONE=y CONFIG_WS_TRANSPORT=n diff --git a/variants/esp32-eth-clk-out0-spiram/sdkconfig.defaults.patch b/variants/esp32-eth-clk-out0-spiram/sdkconfig.defaults.patch index 8844244..6dfa59b 100644 --- a/variants/esp32-eth-clk-out0-spiram/sdkconfig.defaults.patch +++ b/variants/esp32-eth-clk-out0-spiram/sdkconfig.defaults.patch @@ -18,15 +18,31 @@ CONFIG_ESP_DEFAULT_CPU_FREQ_MHZ_240=y CONFIG_ESP_INT_WDT=n CONFIG_ESP_TASK_WDT_INIT=n -@@ -45,7 +50,6 @@ +@@ -45,8 +50,6 @@ CONFIG_ESP_WIFI_DYNAMIC_TX_BUFFER_NUM=16 CONFIG_ESP_WIFI_NVS_ENABLED=n CONFIG_ESP_WIFI_TASK_PINNED_TO_CORE_1=y -CONFIG_ESP_WIFI_IRAM_OPT=n +-CONFIG_ESP_WIFI_GMAC_SUPPORT=n CONFIG_FATFS_LFN_HEAP=y CONFIG_FREERTOS_THREAD_LOCAL_STORAGE_POINTERS=3 CONFIG_FREERTOS_IDLE_TASK_STACKSIZE=1024 -@@ -73,4 +77,5 @@ +@@ -60,14 +63,11 @@ + CONFIG_LWIP_TCP_MSS=1410 + CONFIG_LWIP_TCP_SND_BUF_DEFAULT=5640 + CONFIG_LWIP_TCP_WND_DEFAULT=5640 +-CONFIG_LWIP_HOOK_IP6_INPUT_NONE=y + CONFIG_MBEDTLS_SSL_IN_CONTENT_LEN=7800 + CONFIG_MBEDTLS_SSL_OUT_CONTENT_LEN=3700 + CONFIG_MBEDTLS_X509_TRUSTED_CERT_CALLBACK=y +-CONFIG_MBEDTLS_ECP_RESTARTABLE=y + CONFIG_MBEDTLS_HARDWARE_MPI=n + CONFIG_MBEDTLS_TLS_CLIENT_ONLY=y +-CONFIG_MBEDTLS_ECP_FIXED_POINT_OPTIM=y + CONFIG_MBEDTLS_POLY1305_C=y + CONFIG_MBEDTLS_CHACHA20_C=y + CONFIG_MBEDTLS_CHACHAPOLY_C=y +@@ -77,4 +77,5 @@ CONFIG_SPI_FLASH_LOG_FAILED_WRITE=y CONFIG_SPI_FLASH_WARN_SETTING_ZERO_TO_ONE=y CONFIG_WS_TRANSPORT=n diff --git a/variants/esp32-eth-clk-out0/sdkconfig.defaults.patch b/variants/esp32-eth-clk-out0/sdkconfig.defaults.patch index ae2c817..fea8f05 100644 --- a/variants/esp32-eth-clk-out0/sdkconfig.defaults.patch +++ b/variants/esp32-eth-clk-out0/sdkconfig.defaults.patch @@ -9,3 +9,26 @@ CONFIG_ETH_SPI_ETHERNET_DM9051=y CONFIG_ETH_SPI_ETHERNET_W5500=y CONFIG_ESP_HTTP_CLIENT_ENABLE_HTTPS=n +@@ -46,7 +48,6 @@ + CONFIG_ESP_WIFI_NVS_ENABLED=n + CONFIG_ESP_WIFI_TASK_PINNED_TO_CORE_1=y + CONFIG_ESP_WIFI_IRAM_OPT=n +-CONFIG_ESP_WIFI_GMAC_SUPPORT=n + CONFIG_FATFS_LFN_HEAP=y + CONFIG_FREERTOS_THREAD_LOCAL_STORAGE_POINTERS=3 + CONFIG_FREERTOS_IDLE_TASK_STACKSIZE=1024 +@@ -60,14 +61,11 @@ + CONFIG_LWIP_TCP_MSS=1410 + CONFIG_LWIP_TCP_SND_BUF_DEFAULT=5640 + CONFIG_LWIP_TCP_WND_DEFAULT=5640 +-CONFIG_LWIP_HOOK_IP6_INPUT_NONE=y + CONFIG_MBEDTLS_SSL_IN_CONTENT_LEN=7800 + CONFIG_MBEDTLS_SSL_OUT_CONTENT_LEN=3700 + CONFIG_MBEDTLS_X509_TRUSTED_CERT_CALLBACK=y +-CONFIG_MBEDTLS_ECP_RESTARTABLE=y + CONFIG_MBEDTLS_HARDWARE_MPI=n + CONFIG_MBEDTLS_TLS_CLIENT_ONLY=y +-CONFIG_MBEDTLS_ECP_FIXED_POINT_OPTIM=y + CONFIG_MBEDTLS_POLY1305_C=y + CONFIG_MBEDTLS_CHACHA20_C=y + CONFIG_MBEDTLS_CHACHAPOLY_C=y diff --git a/variants/esp32-eth-clk-out17-spiram/sdkconfig.defaults.patch b/variants/esp32-eth-clk-out17-spiram/sdkconfig.defaults.patch index 5fed786..a7306da 100644 --- a/variants/esp32-eth-clk-out17-spiram/sdkconfig.defaults.patch +++ b/variants/esp32-eth-clk-out17-spiram/sdkconfig.defaults.patch @@ -17,15 +17,31 @@ CONFIG_ESP_DEFAULT_CPU_FREQ_MHZ_240=y CONFIG_ESP_INT_WDT=n CONFIG_ESP_TASK_WDT_INIT=n -@@ -45,7 +49,6 @@ +@@ -45,8 +49,6 @@ CONFIG_ESP_WIFI_DYNAMIC_TX_BUFFER_NUM=16 CONFIG_ESP_WIFI_NVS_ENABLED=n CONFIG_ESP_WIFI_TASK_PINNED_TO_CORE_1=y -CONFIG_ESP_WIFI_IRAM_OPT=n +-CONFIG_ESP_WIFI_GMAC_SUPPORT=n CONFIG_FATFS_LFN_HEAP=y CONFIG_FREERTOS_THREAD_LOCAL_STORAGE_POINTERS=3 CONFIG_FREERTOS_IDLE_TASK_STACKSIZE=1024 -@@ -73,4 +76,5 @@ +@@ -60,14 +62,11 @@ + CONFIG_LWIP_TCP_MSS=1410 + CONFIG_LWIP_TCP_SND_BUF_DEFAULT=5640 + CONFIG_LWIP_TCP_WND_DEFAULT=5640 +-CONFIG_LWIP_HOOK_IP6_INPUT_NONE=y + CONFIG_MBEDTLS_SSL_IN_CONTENT_LEN=7800 + CONFIG_MBEDTLS_SSL_OUT_CONTENT_LEN=3700 + CONFIG_MBEDTLS_X509_TRUSTED_CERT_CALLBACK=y +-CONFIG_MBEDTLS_ECP_RESTARTABLE=y + CONFIG_MBEDTLS_HARDWARE_MPI=n + CONFIG_MBEDTLS_TLS_CLIENT_ONLY=y +-CONFIG_MBEDTLS_ECP_FIXED_POINT_OPTIM=y + CONFIG_MBEDTLS_POLY1305_C=y + CONFIG_MBEDTLS_CHACHA20_C=y + CONFIG_MBEDTLS_CHACHAPOLY_C=y +@@ -77,4 +76,5 @@ CONFIG_SPI_FLASH_LOG_FAILED_WRITE=y CONFIG_SPI_FLASH_WARN_SETTING_ZERO_TO_ONE=y CONFIG_WS_TRANSPORT=n diff --git a/variants/esp32-eth-clk-out17/sdkconfig.defaults.patch b/variants/esp32-eth-clk-out17/sdkconfig.defaults.patch index 678e392..618f401 100644 --- a/variants/esp32-eth-clk-out17/sdkconfig.defaults.patch +++ b/variants/esp32-eth-clk-out17/sdkconfig.defaults.patch @@ -8,3 +8,26 @@ CONFIG_ETH_SPI_ETHERNET_DM9051=y CONFIG_ETH_SPI_ETHERNET_W5500=y CONFIG_ESP_HTTP_CLIENT_ENABLE_HTTPS=n +@@ -46,7 +47,6 @@ + CONFIG_ESP_WIFI_NVS_ENABLED=n + CONFIG_ESP_WIFI_TASK_PINNED_TO_CORE_1=y + CONFIG_ESP_WIFI_IRAM_OPT=n +-CONFIG_ESP_WIFI_GMAC_SUPPORT=n + CONFIG_FATFS_LFN_HEAP=y + CONFIG_FREERTOS_THREAD_LOCAL_STORAGE_POINTERS=3 + CONFIG_FREERTOS_IDLE_TASK_STACKSIZE=1024 +@@ -60,14 +60,11 @@ + CONFIG_LWIP_TCP_MSS=1410 + CONFIG_LWIP_TCP_SND_BUF_DEFAULT=5640 + CONFIG_LWIP_TCP_WND_DEFAULT=5640 +-CONFIG_LWIP_HOOK_IP6_INPUT_NONE=y + CONFIG_MBEDTLS_SSL_IN_CONTENT_LEN=7800 + CONFIG_MBEDTLS_SSL_OUT_CONTENT_LEN=3700 + CONFIG_MBEDTLS_X509_TRUSTED_CERT_CALLBACK=y +-CONFIG_MBEDTLS_ECP_RESTARTABLE=y + CONFIG_MBEDTLS_HARDWARE_MPI=n + CONFIG_MBEDTLS_TLS_CLIENT_ONLY=y +-CONFIG_MBEDTLS_ECP_FIXED_POINT_OPTIM=y + CONFIG_MBEDTLS_POLY1305_C=y + CONFIG_MBEDTLS_CHACHA20_C=y + CONFIG_MBEDTLS_CHACHAPOLY_C=y diff --git a/variants/esp32-no-ble/sdkconfig.defaults.patch b/variants/esp32-no-ble/sdkconfig.defaults.patch index 202c778..72c17a6 100644 --- a/variants/esp32-no-ble/sdkconfig.defaults.patch +++ b/variants/esp32-no-ble/sdkconfig.defaults.patch @@ -34,7 +34,30 @@ CONFIG_ESP_DEFAULT_CPU_FREQ_MHZ_240=y CONFIG_ESP_INT_WDT=n CONFIG_ESP_TASK_WDT_INIT=n -@@ -73,4 +59,3 @@ +@@ -46,7 +32,6 @@ + CONFIG_ESP_WIFI_NVS_ENABLED=n + CONFIG_ESP_WIFI_TASK_PINNED_TO_CORE_1=y + CONFIG_ESP_WIFI_IRAM_OPT=n +-CONFIG_ESP_WIFI_GMAC_SUPPORT=n + CONFIG_FATFS_LFN_HEAP=y + CONFIG_FREERTOS_THREAD_LOCAL_STORAGE_POINTERS=3 + CONFIG_FREERTOS_IDLE_TASK_STACKSIZE=1024 +@@ -60,14 +45,11 @@ + CONFIG_LWIP_TCP_MSS=1410 + CONFIG_LWIP_TCP_SND_BUF_DEFAULT=5640 + CONFIG_LWIP_TCP_WND_DEFAULT=5640 +-CONFIG_LWIP_HOOK_IP6_INPUT_NONE=y + CONFIG_MBEDTLS_SSL_IN_CONTENT_LEN=7800 + CONFIG_MBEDTLS_SSL_OUT_CONTENT_LEN=3700 + CONFIG_MBEDTLS_X509_TRUSTED_CERT_CALLBACK=y +-CONFIG_MBEDTLS_ECP_RESTARTABLE=y + CONFIG_MBEDTLS_HARDWARE_MPI=n + CONFIG_MBEDTLS_TLS_CLIENT_ONLY=y +-CONFIG_MBEDTLS_ECP_FIXED_POINT_OPTIM=y + CONFIG_MBEDTLS_POLY1305_C=y + CONFIG_MBEDTLS_CHACHA20_C=y + CONFIG_MBEDTLS_CHACHAPOLY_C=y +@@ -77,4 +59,3 @@ CONFIG_SPI_FLASH_LOG_FAILED_WRITE=y CONFIG_SPI_FLASH_WARN_SETTING_ZERO_TO_ONE=y CONFIG_WS_TRANSPORT=n diff --git a/variants/esp32-qemu/sdkconfig.defaults.patch b/variants/esp32-qemu/sdkconfig.defaults.patch index a04e4de..72ec903 100644 --- a/variants/esp32-qemu/sdkconfig.defaults.patch +++ b/variants/esp32-qemu/sdkconfig.defaults.patch @@ -8,3 +8,26 @@ CONFIG_ESP_HTTP_CLIENT_ENABLE_HTTPS=n CONFIG_ESP_SLEEP_GPIO_RESET_WORKAROUND=y CONFIG_XTAL_FREQ_AUTO=y +@@ -46,7 +47,6 @@ + CONFIG_ESP_WIFI_NVS_ENABLED=n + CONFIG_ESP_WIFI_TASK_PINNED_TO_CORE_1=y + CONFIG_ESP_WIFI_IRAM_OPT=n +-CONFIG_ESP_WIFI_GMAC_SUPPORT=n + CONFIG_FATFS_LFN_HEAP=y + CONFIG_FREERTOS_THREAD_LOCAL_STORAGE_POINTERS=3 + CONFIG_FREERTOS_IDLE_TASK_STACKSIZE=1024 +@@ -60,14 +60,11 @@ + CONFIG_LWIP_TCP_MSS=1410 + CONFIG_LWIP_TCP_SND_BUF_DEFAULT=5640 + CONFIG_LWIP_TCP_WND_DEFAULT=5640 +-CONFIG_LWIP_HOOK_IP6_INPUT_NONE=y + CONFIG_MBEDTLS_SSL_IN_CONTENT_LEN=7800 + CONFIG_MBEDTLS_SSL_OUT_CONTENT_LEN=3700 + CONFIG_MBEDTLS_X509_TRUSTED_CERT_CALLBACK=y +-CONFIG_MBEDTLS_ECP_RESTARTABLE=y + CONFIG_MBEDTLS_HARDWARE_MPI=n + CONFIG_MBEDTLS_TLS_CLIENT_ONLY=y +-CONFIG_MBEDTLS_ECP_FIXED_POINT_OPTIM=y + CONFIG_MBEDTLS_POLY1305_C=y + CONFIG_MBEDTLS_CHACHA20_C=y + CONFIG_MBEDTLS_CHACHAPOLY_C=y diff --git a/variants/esp32-sedisto/sdkconfig.defaults.patch b/variants/esp32-sedisto/sdkconfig.defaults.patch index 214278e..6f13232 100644 --- a/variants/esp32-sedisto/sdkconfig.defaults.patch +++ b/variants/esp32-sedisto/sdkconfig.defaults.patch @@ -18,15 +18,31 @@ CONFIG_ESP_DEFAULT_CPU_FREQ_MHZ_240=y CONFIG_ESP_INT_WDT=n CONFIG_ESP_TASK_WDT_INIT=n -@@ -45,7 +50,6 @@ +@@ -45,8 +50,6 @@ CONFIG_ESP_WIFI_DYNAMIC_TX_BUFFER_NUM=16 CONFIG_ESP_WIFI_NVS_ENABLED=n CONFIG_ESP_WIFI_TASK_PINNED_TO_CORE_1=y -CONFIG_ESP_WIFI_IRAM_OPT=n +-CONFIG_ESP_WIFI_GMAC_SUPPORT=n CONFIG_FATFS_LFN_HEAP=y CONFIG_FREERTOS_THREAD_LOCAL_STORAGE_POINTERS=3 CONFIG_FREERTOS_IDLE_TASK_STACKSIZE=1024 -@@ -73,4 +77,9 @@ +@@ -60,14 +63,11 @@ + CONFIG_LWIP_TCP_MSS=1410 + CONFIG_LWIP_TCP_SND_BUF_DEFAULT=5640 + CONFIG_LWIP_TCP_WND_DEFAULT=5640 +-CONFIG_LWIP_HOOK_IP6_INPUT_NONE=y + CONFIG_MBEDTLS_SSL_IN_CONTENT_LEN=7800 + CONFIG_MBEDTLS_SSL_OUT_CONTENT_LEN=3700 + CONFIG_MBEDTLS_X509_TRUSTED_CERT_CALLBACK=y +-CONFIG_MBEDTLS_ECP_RESTARTABLE=y + CONFIG_MBEDTLS_HARDWARE_MPI=n + CONFIG_MBEDTLS_TLS_CLIENT_ONLY=y +-CONFIG_MBEDTLS_ECP_FIXED_POINT_OPTIM=y + CONFIG_MBEDTLS_POLY1305_C=y + CONFIG_MBEDTLS_CHACHA20_C=y + CONFIG_MBEDTLS_CHACHAPOLY_C=y +@@ -77,4 +77,9 @@ CONFIG_SPI_FLASH_LOG_FAILED_WRITE=y CONFIG_SPI_FLASH_WARN_SETTING_ZERO_TO_ONE=y CONFIG_WS_TRANSPORT=n diff --git a/variants/esp32-spiram/sdkconfig.defaults.patch b/variants/esp32-spiram/sdkconfig.defaults.patch index 4dbee80..7217d85 100644 --- a/variants/esp32-spiram/sdkconfig.defaults.patch +++ b/variants/esp32-spiram/sdkconfig.defaults.patch @@ -1,6 +1,6 @@ --- toit/toolchains/esp32/sdkconfig.defaults +++ synthesized/esp32-spiram/sdkconfig.defaults -@@ -37,15 +37,16 @@ +@@ -37,16 +37,16 @@ CONFIG_ESP_SLEEP_GPIO_RESET_WORKAROUND=y CONFIG_XTAL_FREQ_AUTO=y CONFIG_ESP_PHY_CALIBRATION_AND_DATA_STORAGE=n @@ -15,11 +15,27 @@ CONFIG_ESP_WIFI_NVS_ENABLED=n CONFIG_ESP_WIFI_TASK_PINNED_TO_CORE_1=y -CONFIG_ESP_WIFI_IRAM_OPT=n +-CONFIG_ESP_WIFI_GMAC_SUPPORT=n +CONFIG_ESP_WIFI_RX_IRAM_OPT=y CONFIG_FATFS_LFN_HEAP=y CONFIG_FREERTOS_THREAD_LOCAL_STORAGE_POINTERS=3 CONFIG_FREERTOS_IDLE_TASK_STACKSIZE=1024 -@@ -73,4 +74,5 @@ +@@ -60,14 +60,11 @@ + CONFIG_LWIP_TCP_MSS=1410 + CONFIG_LWIP_TCP_SND_BUF_DEFAULT=5640 + CONFIG_LWIP_TCP_WND_DEFAULT=5640 +-CONFIG_LWIP_HOOK_IP6_INPUT_NONE=y + CONFIG_MBEDTLS_SSL_IN_CONTENT_LEN=7800 + CONFIG_MBEDTLS_SSL_OUT_CONTENT_LEN=3700 + CONFIG_MBEDTLS_X509_TRUSTED_CERT_CALLBACK=y +-CONFIG_MBEDTLS_ECP_RESTARTABLE=y + CONFIG_MBEDTLS_HARDWARE_MPI=n + CONFIG_MBEDTLS_TLS_CLIENT_ONLY=y +-CONFIG_MBEDTLS_ECP_FIXED_POINT_OPTIM=y + CONFIG_MBEDTLS_POLY1305_C=y + CONFIG_MBEDTLS_CHACHA20_C=y + CONFIG_MBEDTLS_CHACHAPOLY_C=y +@@ -77,4 +74,5 @@ CONFIG_SPI_FLASH_LOG_FAILED_WRITE=y CONFIG_SPI_FLASH_WARN_SETTING_ZERO_TO_ONE=y CONFIG_WS_TRANSPORT=n diff --git a/variants/esp32-tls-server/sdkconfig.defaults.patch b/variants/esp32-tls-server/sdkconfig.defaults.patch index 795ebdb..1866d2a 100644 --- a/variants/esp32-tls-server/sdkconfig.defaults.patch +++ b/variants/esp32-tls-server/sdkconfig.defaults.patch @@ -1,10 +1,25 @@ --- toit/toolchains/esp32/sdkconfig.defaults +++ synthesized/esp32-tls-server/sdkconfig.defaults -@@ -63,7 +63,6 @@ +@@ -46,7 +46,6 @@ + CONFIG_ESP_WIFI_NVS_ENABLED=n + CONFIG_ESP_WIFI_TASK_PINNED_TO_CORE_1=y + CONFIG_ESP_WIFI_IRAM_OPT=n +-CONFIG_ESP_WIFI_GMAC_SUPPORT=n + CONFIG_FATFS_LFN_HEAP=y + CONFIG_FREERTOS_THREAD_LOCAL_STORAGE_POINTERS=3 + CONFIG_FREERTOS_IDLE_TASK_STACKSIZE=1024 +@@ -60,14 +59,10 @@ + CONFIG_LWIP_TCP_MSS=1410 + CONFIG_LWIP_TCP_SND_BUF_DEFAULT=5640 + CONFIG_LWIP_TCP_WND_DEFAULT=5640 +-CONFIG_LWIP_HOOK_IP6_INPUT_NONE=y + CONFIG_MBEDTLS_SSL_IN_CONTENT_LEN=7800 CONFIG_MBEDTLS_SSL_OUT_CONTENT_LEN=3700 CONFIG_MBEDTLS_X509_TRUSTED_CERT_CALLBACK=y +-CONFIG_MBEDTLS_ECP_RESTARTABLE=y CONFIG_MBEDTLS_HARDWARE_MPI=n -CONFIG_MBEDTLS_TLS_CLIENT_ONLY=y +-CONFIG_MBEDTLS_ECP_FIXED_POINT_OPTIM=y CONFIG_MBEDTLS_POLY1305_C=y CONFIG_MBEDTLS_CHACHA20_C=y CONFIG_MBEDTLS_CHACHAPOLY_C=y diff --git a/variants/esp32s3-consibio-spiram-octo/sdkconfig.defaults.patch b/variants/esp32s3-consibio-spiram-octo/sdkconfig.defaults.patch index 46da057..c4276cd 100644 --- a/variants/esp32s3-consibio-spiram-octo/sdkconfig.defaults.patch +++ b/variants/esp32s3-consibio-spiram-octo/sdkconfig.defaults.patch @@ -35,11 +35,26 @@ CONFIG_SPIRAM_IGNORE_NOTFOUND=y CONFIG_ESP_DEFAULT_CPU_FREQ_MHZ_240=y CONFIG_ESP_INT_WDT=n -@@ -56,6 +46,7 @@ +@@ -40,7 +30,6 @@ + CONFIG_ESP_WIFI_DYNAMIC_RX_BUFFER_NUM=16 + CONFIG_ESP_WIFI_NVS_ENABLED=n + CONFIG_ESP_WIFI_TASK_PINNED_TO_CORE_1=y +-CONFIG_ESP_WIFI_GMAC_SUPPORT=n + CONFIG_FATFS_LFN_HEAP=y + CONFIG_FREERTOS_THREAD_LOCAL_STORAGE_POINTERS=3 + CONFIG_FREERTOS_IDLE_TASK_STACKSIZE=1024 +@@ -54,14 +43,12 @@ + CONFIG_LWIP_TCP_MSS=1410 + CONFIG_LWIP_TCP_SND_BUF_DEFAULT=5640 + CONFIG_LWIP_TCP_WND_DEFAULT=5640 +-CONFIG_LWIP_HOOK_IP6_INPUT_NONE=y CONFIG_MBEDTLS_SSL_IN_CONTENT_LEN=7800 CONFIG_MBEDTLS_SSL_OUT_CONTENT_LEN=3700 CONFIG_MBEDTLS_X509_TRUSTED_CERT_CALLBACK=y -+CONFIG_MBEDTLS_ECP_RESTARTABLE=y + CONFIG_MBEDTLS_ECP_RESTARTABLE=y CONFIG_MBEDTLS_HARDWARE_MPI=n CONFIG_MBEDTLS_TLS_CLIENT_ONLY=y +-CONFIG_MBEDTLS_ECP_FIXED_POINT_OPTIM=y CONFIG_MBEDTLS_POLY1305_C=y + CONFIG_MBEDTLS_CHACHA20_C=y + CONFIG_MBEDTLS_CHACHAPOLY_C=y diff --git a/variants/esp32s3-no-ble/sdkconfig.defaults.patch b/variants/esp32s3-no-ble/sdkconfig.defaults.patch index 8b8074f..0b82976 100644 --- a/variants/esp32s3-no-ble/sdkconfig.defaults.patch +++ b/variants/esp32s3-no-ble/sdkconfig.defaults.patch @@ -20,11 +20,26 @@ CONFIG_SPI_SLAVE_ISR_IN_IRAM=n CONFIG_UART_ISR_IN_IRAM=y CONFIG_ESP_ERR_TO_NAME_LOOKUP=n -@@ -56,6 +43,7 @@ +@@ -40,7 +27,6 @@ + CONFIG_ESP_WIFI_DYNAMIC_RX_BUFFER_NUM=16 + CONFIG_ESP_WIFI_NVS_ENABLED=n + CONFIG_ESP_WIFI_TASK_PINNED_TO_CORE_1=y +-CONFIG_ESP_WIFI_GMAC_SUPPORT=n + CONFIG_FATFS_LFN_HEAP=y + CONFIG_FREERTOS_THREAD_LOCAL_STORAGE_POINTERS=3 + CONFIG_FREERTOS_IDLE_TASK_STACKSIZE=1024 +@@ -54,14 +40,12 @@ + CONFIG_LWIP_TCP_MSS=1410 + CONFIG_LWIP_TCP_SND_BUF_DEFAULT=5640 + CONFIG_LWIP_TCP_WND_DEFAULT=5640 +-CONFIG_LWIP_HOOK_IP6_INPUT_NONE=y CONFIG_MBEDTLS_SSL_IN_CONTENT_LEN=7800 CONFIG_MBEDTLS_SSL_OUT_CONTENT_LEN=3700 CONFIG_MBEDTLS_X509_TRUSTED_CERT_CALLBACK=y -+CONFIG_MBEDTLS_ECP_RESTARTABLE=y + CONFIG_MBEDTLS_ECP_RESTARTABLE=y CONFIG_MBEDTLS_HARDWARE_MPI=n CONFIG_MBEDTLS_TLS_CLIENT_ONLY=y +-CONFIG_MBEDTLS_ECP_FIXED_POINT_OPTIM=y CONFIG_MBEDTLS_POLY1305_C=y + CONFIG_MBEDTLS_CHACHA20_C=y + CONFIG_MBEDTLS_CHACHAPOLY_C=y diff --git a/variants/esp32s3-spiram-octo/sdkconfig.defaults.patch b/variants/esp32s3-spiram-octo/sdkconfig.defaults.patch index 74f917c..275a3ba 100644 --- a/variants/esp32s3-spiram-octo/sdkconfig.defaults.patch +++ b/variants/esp32s3-spiram-octo/sdkconfig.defaults.patch @@ -8,3 +8,26 @@ CONFIG_SPIRAM_IGNORE_NOTFOUND=y CONFIG_ESP_DEFAULT_CPU_FREQ_MHZ_240=y CONFIG_ESP_INT_WDT=n +@@ -40,7 +41,6 @@ + CONFIG_ESP_WIFI_DYNAMIC_RX_BUFFER_NUM=16 + CONFIG_ESP_WIFI_NVS_ENABLED=n + CONFIG_ESP_WIFI_TASK_PINNED_TO_CORE_1=y +-CONFIG_ESP_WIFI_GMAC_SUPPORT=n + CONFIG_FATFS_LFN_HEAP=y + CONFIG_FREERTOS_THREAD_LOCAL_STORAGE_POINTERS=3 + CONFIG_FREERTOS_IDLE_TASK_STACKSIZE=1024 +@@ -54,14 +54,11 @@ + CONFIG_LWIP_TCP_MSS=1410 + CONFIG_LWIP_TCP_SND_BUF_DEFAULT=5640 + CONFIG_LWIP_TCP_WND_DEFAULT=5640 +-CONFIG_LWIP_HOOK_IP6_INPUT_NONE=y + CONFIG_MBEDTLS_SSL_IN_CONTENT_LEN=7800 + CONFIG_MBEDTLS_SSL_OUT_CONTENT_LEN=3700 + CONFIG_MBEDTLS_X509_TRUSTED_CERT_CALLBACK=y +-CONFIG_MBEDTLS_ECP_RESTARTABLE=y + CONFIG_MBEDTLS_HARDWARE_MPI=n + CONFIG_MBEDTLS_TLS_CLIENT_ONLY=y +-CONFIG_MBEDTLS_ECP_FIXED_POINT_OPTIM=y + CONFIG_MBEDTLS_POLY1305_C=y + CONFIG_MBEDTLS_CHACHA20_C=y + CONFIG_MBEDTLS_CHACHAPOLY_C=y diff --git a/variants/esp32s3-synap/sdkconfig.defaults.patch b/variants/esp32s3-synap/sdkconfig.defaults.patch index 4dc283d..9c3e7bb 100644 --- a/variants/esp32s3-synap/sdkconfig.defaults.patch +++ b/variants/esp32s3-synap/sdkconfig.defaults.patch @@ -25,7 +25,7 @@ CONFIG_SPI_SLAVE_ISR_IN_IRAM=n CONFIG_UART_ISR_IN_IRAM=y CONFIG_ESP_ERR_TO_NAME_LOOKUP=n -@@ -34,6 +21,8 @@ +@@ -34,13 +21,14 @@ CONFIG_SPIRAM=y CONFIG_SPIRAM_IGNORE_NOTFOUND=y CONFIG_ESP_DEFAULT_CPU_FREQ_MHZ_240=y @@ -34,11 +34,25 @@ CONFIG_ESP_INT_WDT=n CONFIG_ESP_TASK_WDT_INIT=n CONFIG_ESP_IPC_TASK_STACK_SIZE=1024 -@@ -56,6 +45,7 @@ + CONFIG_ESP_WIFI_DYNAMIC_RX_BUFFER_NUM=16 + CONFIG_ESP_WIFI_NVS_ENABLED=n + CONFIG_ESP_WIFI_TASK_PINNED_TO_CORE_1=y +-CONFIG_ESP_WIFI_GMAC_SUPPORT=n + CONFIG_FATFS_LFN_HEAP=y + CONFIG_FREERTOS_THREAD_LOCAL_STORAGE_POINTERS=3 + CONFIG_FREERTOS_IDLE_TASK_STACKSIZE=1024 +@@ -54,14 +42,12 @@ + CONFIG_LWIP_TCP_MSS=1410 + CONFIG_LWIP_TCP_SND_BUF_DEFAULT=5640 + CONFIG_LWIP_TCP_WND_DEFAULT=5640 +-CONFIG_LWIP_HOOK_IP6_INPUT_NONE=y CONFIG_MBEDTLS_SSL_IN_CONTENT_LEN=7800 CONFIG_MBEDTLS_SSL_OUT_CONTENT_LEN=3700 CONFIG_MBEDTLS_X509_TRUSTED_CERT_CALLBACK=y -+CONFIG_MBEDTLS_ECP_RESTARTABLE=y + CONFIG_MBEDTLS_ECP_RESTARTABLE=y CONFIG_MBEDTLS_HARDWARE_MPI=n CONFIG_MBEDTLS_TLS_CLIENT_ONLY=y +-CONFIG_MBEDTLS_ECP_FIXED_POINT_OPTIM=y CONFIG_MBEDTLS_POLY1305_C=y + CONFIG_MBEDTLS_CHACHA20_C=y + CONFIG_MBEDTLS_CHACHAPOLY_C=y From 7fff9d8229e289bdbc2b322f47d4f5f26b7a8f3d Mon Sep 17 00:00:00 2001 From: Florian Loitsch Date: Wed, 4 Dec 2024 16:41:08 +0100 Subject: [PATCH 3/5] Use newest sdkconfigs. --- .../esp32-consibio/sdkconfig.defaults.patch | 30 ++++++++----------- .../sdkconfig.defaults.patch | 26 +++++++++------- .../sdkconfig.defaults.patch | 24 ++++++++------- .../sdkconfig.defaults.patch | 26 +++++++++------- .../sdkconfig.defaults.patch | 24 ++++++++------- .../esp32-no-ble/sdkconfig.defaults.patch | 27 ++++++++++------- variants/esp32-qemu/sdkconfig.defaults.patch | 26 +++++++++------- .../esp32-sedisto/sdkconfig.defaults.patch | 26 +++++++++------- .../esp32-spiram/sdkconfig.defaults.patch | 30 ++++++++++++------- .../esp32-tls-server/sdkconfig.defaults.patch | 25 ++++++++++++---- .../sdkconfig.defaults.patch | 30 ++++++++----------- .../esp32s3-no-ble/sdkconfig.defaults.patch | 30 ++++++++----------- .../sdkconfig.defaults.patch | 28 +++++++++++------ .../esp32s3-synap/sdkconfig.defaults.patch | 29 ++++++++---------- 14 files changed, 213 insertions(+), 168 deletions(-) diff --git a/variants/esp32-consibio/sdkconfig.defaults.patch b/variants/esp32-consibio/sdkconfig.defaults.patch index bb8fdbb..a256a35 100644 --- a/variants/esp32-consibio/sdkconfig.defaults.patch +++ b/variants/esp32-consibio/sdkconfig.defaults.patch @@ -1,6 +1,11 @@ --- toit/toolchains/esp32/sdkconfig.defaults +++ synthesized/esp32-consibio/sdkconfig.defaults -@@ -5,27 +5,10 @@ +@@ -1,36 +1,19 @@ + # This file was generated using idf.py save-defconfig. It can be edited manually. +-# Espressif IoT Development Framework (ESP-IDF) 5.3.1 Project Minimal Configuration ++# Espressif IoT Development Framework (ESP-IDF) Project Minimal Configuration + # + CONFIG_BOOTLOADER_LOG_LEVEL_NONE=y CONFIG_BOOTLOADER_APP_ROLLBACK_ENABLE=y CONFIG_BOOTLOADER_SKIP_VALIDATE_IN_DEEP_SLEEP=y CONFIG_APP_COMPILE_TIME_DATE=n @@ -28,7 +33,13 @@ -CONFIG_BTDM_BLE_ADV_REPORT_FLOW_CTRL_NUM=50 CONFIG_ADC_CAL_EFUSE_TP_ENABLE=n CONFIG_ADC_CAL_LUT_ENABLE=n +-CONFIG_ESP_ERR_TO_NAME_LOOKUP=n CONFIG_SPI_SLAVE_ISR_IN_IRAM=n + CONFIG_UART_ISR_IN_IRAM=y ++CONFIG_ESP_ERR_TO_NAME_LOOKUP=n + CONFIG_ETH_SPI_ETHERNET_DM9051=y + CONFIG_ETH_SPI_ETHERNET_W5500=y + CONFIG_ESP_HTTP_CLIENT_ENABLE_HTTPS=n @@ -46,7 +29,6 @@ CONFIG_ESP_WIFI_NVS_ENABLED=n CONFIG_ESP_WIFI_TASK_PINNED_TO_CORE_1=y @@ -37,22 +48,7 @@ CONFIG_FATFS_LFN_HEAP=y CONFIG_FREERTOS_THREAD_LOCAL_STORAGE_POINTERS=3 CONFIG_FREERTOS_IDLE_TASK_STACKSIZE=1024 -@@ -60,14 +42,12 @@ - CONFIG_LWIP_TCP_MSS=1410 - CONFIG_LWIP_TCP_SND_BUF_DEFAULT=5640 - CONFIG_LWIP_TCP_WND_DEFAULT=5640 --CONFIG_LWIP_HOOK_IP6_INPUT_NONE=y - CONFIG_MBEDTLS_SSL_IN_CONTENT_LEN=7800 - CONFIG_MBEDTLS_SSL_OUT_CONTENT_LEN=3700 - CONFIG_MBEDTLS_X509_TRUSTED_CERT_CALLBACK=y - CONFIG_MBEDTLS_ECP_RESTARTABLE=y - CONFIG_MBEDTLS_HARDWARE_MPI=n - CONFIG_MBEDTLS_TLS_CLIENT_ONLY=y --CONFIG_MBEDTLS_ECP_FIXED_POINT_OPTIM=y - CONFIG_MBEDTLS_POLY1305_C=y - CONFIG_MBEDTLS_CHACHA20_C=y - CONFIG_MBEDTLS_CHACHAPOLY_C=y -@@ -77,4 +57,3 @@ +@@ -75,4 +57,3 @@ CONFIG_SPI_FLASH_LOG_FAILED_WRITE=y CONFIG_SPI_FLASH_WARN_SETTING_ZERO_TO_ONE=y CONFIG_WS_TRANSPORT=n diff --git a/variants/esp32-eth-clk-out0-spiram/sdkconfig.defaults.patch b/variants/esp32-eth-clk-out0-spiram/sdkconfig.defaults.patch index 6dfa59b..5138703 100644 --- a/variants/esp32-eth-clk-out0-spiram/sdkconfig.defaults.patch +++ b/variants/esp32-eth-clk-out0-spiram/sdkconfig.defaults.patch @@ -1,9 +1,20 @@ --- toit/toolchains/esp32/sdkconfig.defaults +++ synthesized/esp32-eth-clk-out0-spiram/sdkconfig.defaults -@@ -31,12 +31,17 @@ +@@ -1,5 +1,5 @@ + # This file was generated using idf.py save-defconfig. It can be edited manually. +-# Espressif IoT Development Framework (ESP-IDF) 5.3.1 Project Minimal Configuration ++# Espressif IoT Development Framework (ESP-IDF) Project Minimal Configuration + # + CONFIG_BOOTLOADER_LOG_LEVEL_NONE=y + CONFIG_BOOTLOADER_APP_ROLLBACK_ENABLE=y +@@ -28,15 +28,20 @@ + CONFIG_BTDM_BLE_ADV_REPORT_FLOW_CTRL_NUM=50 + CONFIG_ADC_CAL_EFUSE_TP_ENABLE=n + CONFIG_ADC_CAL_LUT_ENABLE=n +-CONFIG_ESP_ERR_TO_NAME_LOOKUP=n CONFIG_SPI_SLAVE_ISR_IN_IRAM=n CONFIG_UART_ISR_IN_IRAM=y - CONFIG_ESP_ERR_TO_NAME_LOOKUP=n ++CONFIG_ESP_ERR_TO_NAME_LOOKUP=n +CONFIG_ETH_RMII_CLK_OUTPUT=y +CONFIG_ETH_RMII_CLK_OUTPUT_GPIO0=y CONFIG_ETH_SPI_ETHERNET_DM9051=y @@ -27,22 +38,15 @@ CONFIG_FATFS_LFN_HEAP=y CONFIG_FREERTOS_THREAD_LOCAL_STORAGE_POINTERS=3 CONFIG_FREERTOS_IDLE_TASK_STACKSIZE=1024 -@@ -60,14 +63,11 @@ - CONFIG_LWIP_TCP_MSS=1410 - CONFIG_LWIP_TCP_SND_BUF_DEFAULT=5640 - CONFIG_LWIP_TCP_WND_DEFAULT=5640 --CONFIG_LWIP_HOOK_IP6_INPUT_NONE=y +@@ -63,7 +66,6 @@ CONFIG_MBEDTLS_SSL_IN_CONTENT_LEN=7800 CONFIG_MBEDTLS_SSL_OUT_CONTENT_LEN=3700 CONFIG_MBEDTLS_X509_TRUSTED_CERT_CALLBACK=y -CONFIG_MBEDTLS_ECP_RESTARTABLE=y CONFIG_MBEDTLS_HARDWARE_MPI=n CONFIG_MBEDTLS_TLS_CLIENT_ONLY=y --CONFIG_MBEDTLS_ECP_FIXED_POINT_OPTIM=y CONFIG_MBEDTLS_POLY1305_C=y - CONFIG_MBEDTLS_CHACHA20_C=y - CONFIG_MBEDTLS_CHACHAPOLY_C=y -@@ -77,4 +77,5 @@ +@@ -75,4 +77,5 @@ CONFIG_SPI_FLASH_LOG_FAILED_WRITE=y CONFIG_SPI_FLASH_WARN_SETTING_ZERO_TO_ONE=y CONFIG_WS_TRANSPORT=n diff --git a/variants/esp32-eth-clk-out0/sdkconfig.defaults.patch b/variants/esp32-eth-clk-out0/sdkconfig.defaults.patch index fea8f05..6972bad 100644 --- a/variants/esp32-eth-clk-out0/sdkconfig.defaults.patch +++ b/variants/esp32-eth-clk-out0/sdkconfig.defaults.patch @@ -1,9 +1,20 @@ --- toit/toolchains/esp32/sdkconfig.defaults +++ synthesized/esp32-eth-clk-out0/sdkconfig.defaults -@@ -31,6 +31,8 @@ +@@ -1,5 +1,5 @@ + # This file was generated using idf.py save-defconfig. It can be edited manually. +-# Espressif IoT Development Framework (ESP-IDF) 5.3.1 Project Minimal Configuration ++# Espressif IoT Development Framework (ESP-IDF) Project Minimal Configuration + # + CONFIG_BOOTLOADER_LOG_LEVEL_NONE=y + CONFIG_BOOTLOADER_APP_ROLLBACK_ENABLE=y +@@ -28,9 +28,11 @@ + CONFIG_BTDM_BLE_ADV_REPORT_FLOW_CTRL_NUM=50 + CONFIG_ADC_CAL_EFUSE_TP_ENABLE=n + CONFIG_ADC_CAL_LUT_ENABLE=n +-CONFIG_ESP_ERR_TO_NAME_LOOKUP=n CONFIG_SPI_SLAVE_ISR_IN_IRAM=n CONFIG_UART_ISR_IN_IRAM=y - CONFIG_ESP_ERR_TO_NAME_LOOKUP=n ++CONFIG_ESP_ERR_TO_NAME_LOOKUP=n +CONFIG_ETH_RMII_CLK_OUTPUT=y +CONFIG_ETH_RMII_CLK_OUTPUT_GPIO0=y CONFIG_ETH_SPI_ETHERNET_DM9051=y @@ -17,18 +28,11 @@ CONFIG_FATFS_LFN_HEAP=y CONFIG_FREERTOS_THREAD_LOCAL_STORAGE_POINTERS=3 CONFIG_FREERTOS_IDLE_TASK_STACKSIZE=1024 -@@ -60,14 +61,11 @@ - CONFIG_LWIP_TCP_MSS=1410 - CONFIG_LWIP_TCP_SND_BUF_DEFAULT=5640 - CONFIG_LWIP_TCP_WND_DEFAULT=5640 --CONFIG_LWIP_HOOK_IP6_INPUT_NONE=y +@@ -63,7 +64,6 @@ CONFIG_MBEDTLS_SSL_IN_CONTENT_LEN=7800 CONFIG_MBEDTLS_SSL_OUT_CONTENT_LEN=3700 CONFIG_MBEDTLS_X509_TRUSTED_CERT_CALLBACK=y -CONFIG_MBEDTLS_ECP_RESTARTABLE=y CONFIG_MBEDTLS_HARDWARE_MPI=n CONFIG_MBEDTLS_TLS_CLIENT_ONLY=y --CONFIG_MBEDTLS_ECP_FIXED_POINT_OPTIM=y CONFIG_MBEDTLS_POLY1305_C=y - CONFIG_MBEDTLS_CHACHA20_C=y - CONFIG_MBEDTLS_CHACHAPOLY_C=y diff --git a/variants/esp32-eth-clk-out17-spiram/sdkconfig.defaults.patch b/variants/esp32-eth-clk-out17-spiram/sdkconfig.defaults.patch index a7306da..b0fd0ff 100644 --- a/variants/esp32-eth-clk-out17-spiram/sdkconfig.defaults.patch +++ b/variants/esp32-eth-clk-out17-spiram/sdkconfig.defaults.patch @@ -1,9 +1,20 @@ --- toit/toolchains/esp32/sdkconfig.defaults +++ synthesized/esp32-eth-clk-out17-spiram/sdkconfig.defaults -@@ -31,12 +31,16 @@ +@@ -1,5 +1,5 @@ + # This file was generated using idf.py save-defconfig. It can be edited manually. +-# Espressif IoT Development Framework (ESP-IDF) 5.3.1 Project Minimal Configuration ++# Espressif IoT Development Framework (ESP-IDF) Project Minimal Configuration + # + CONFIG_BOOTLOADER_LOG_LEVEL_NONE=y + CONFIG_BOOTLOADER_APP_ROLLBACK_ENABLE=y +@@ -28,15 +28,19 @@ + CONFIG_BTDM_BLE_ADV_REPORT_FLOW_CTRL_NUM=50 + CONFIG_ADC_CAL_EFUSE_TP_ENABLE=n + CONFIG_ADC_CAL_LUT_ENABLE=n +-CONFIG_ESP_ERR_TO_NAME_LOOKUP=n CONFIG_SPI_SLAVE_ISR_IN_IRAM=n CONFIG_UART_ISR_IN_IRAM=y - CONFIG_ESP_ERR_TO_NAME_LOOKUP=n ++CONFIG_ESP_ERR_TO_NAME_LOOKUP=n +CONFIG_ETH_RMII_CLK_OUTPUT=y CONFIG_ETH_SPI_ETHERNET_DM9051=y CONFIG_ETH_SPI_ETHERNET_W5500=y @@ -26,22 +37,15 @@ CONFIG_FATFS_LFN_HEAP=y CONFIG_FREERTOS_THREAD_LOCAL_STORAGE_POINTERS=3 CONFIG_FREERTOS_IDLE_TASK_STACKSIZE=1024 -@@ -60,14 +62,11 @@ - CONFIG_LWIP_TCP_MSS=1410 - CONFIG_LWIP_TCP_SND_BUF_DEFAULT=5640 - CONFIG_LWIP_TCP_WND_DEFAULT=5640 --CONFIG_LWIP_HOOK_IP6_INPUT_NONE=y +@@ -63,7 +65,6 @@ CONFIG_MBEDTLS_SSL_IN_CONTENT_LEN=7800 CONFIG_MBEDTLS_SSL_OUT_CONTENT_LEN=3700 CONFIG_MBEDTLS_X509_TRUSTED_CERT_CALLBACK=y -CONFIG_MBEDTLS_ECP_RESTARTABLE=y CONFIG_MBEDTLS_HARDWARE_MPI=n CONFIG_MBEDTLS_TLS_CLIENT_ONLY=y --CONFIG_MBEDTLS_ECP_FIXED_POINT_OPTIM=y CONFIG_MBEDTLS_POLY1305_C=y - CONFIG_MBEDTLS_CHACHA20_C=y - CONFIG_MBEDTLS_CHACHAPOLY_C=y -@@ -77,4 +76,5 @@ +@@ -75,4 +76,5 @@ CONFIG_SPI_FLASH_LOG_FAILED_WRITE=y CONFIG_SPI_FLASH_WARN_SETTING_ZERO_TO_ONE=y CONFIG_WS_TRANSPORT=n diff --git a/variants/esp32-eth-clk-out17/sdkconfig.defaults.patch b/variants/esp32-eth-clk-out17/sdkconfig.defaults.patch index 618f401..9fcb434 100644 --- a/variants/esp32-eth-clk-out17/sdkconfig.defaults.patch +++ b/variants/esp32-eth-clk-out17/sdkconfig.defaults.patch @@ -1,9 +1,20 @@ --- toit/toolchains/esp32/sdkconfig.defaults +++ synthesized/esp32-eth-clk-out17/sdkconfig.defaults -@@ -31,6 +31,7 @@ +@@ -1,5 +1,5 @@ + # This file was generated using idf.py save-defconfig. It can be edited manually. +-# Espressif IoT Development Framework (ESP-IDF) 5.3.1 Project Minimal Configuration ++# Espressif IoT Development Framework (ESP-IDF) Project Minimal Configuration + # + CONFIG_BOOTLOADER_LOG_LEVEL_NONE=y + CONFIG_BOOTLOADER_APP_ROLLBACK_ENABLE=y +@@ -28,9 +28,10 @@ + CONFIG_BTDM_BLE_ADV_REPORT_FLOW_CTRL_NUM=50 + CONFIG_ADC_CAL_EFUSE_TP_ENABLE=n + CONFIG_ADC_CAL_LUT_ENABLE=n +-CONFIG_ESP_ERR_TO_NAME_LOOKUP=n CONFIG_SPI_SLAVE_ISR_IN_IRAM=n CONFIG_UART_ISR_IN_IRAM=y - CONFIG_ESP_ERR_TO_NAME_LOOKUP=n ++CONFIG_ESP_ERR_TO_NAME_LOOKUP=n +CONFIG_ETH_RMII_CLK_OUTPUT=y CONFIG_ETH_SPI_ETHERNET_DM9051=y CONFIG_ETH_SPI_ETHERNET_W5500=y @@ -16,18 +27,11 @@ CONFIG_FATFS_LFN_HEAP=y CONFIG_FREERTOS_THREAD_LOCAL_STORAGE_POINTERS=3 CONFIG_FREERTOS_IDLE_TASK_STACKSIZE=1024 -@@ -60,14 +60,11 @@ - CONFIG_LWIP_TCP_MSS=1410 - CONFIG_LWIP_TCP_SND_BUF_DEFAULT=5640 - CONFIG_LWIP_TCP_WND_DEFAULT=5640 --CONFIG_LWIP_HOOK_IP6_INPUT_NONE=y +@@ -63,7 +63,6 @@ CONFIG_MBEDTLS_SSL_IN_CONTENT_LEN=7800 CONFIG_MBEDTLS_SSL_OUT_CONTENT_LEN=3700 CONFIG_MBEDTLS_X509_TRUSTED_CERT_CALLBACK=y -CONFIG_MBEDTLS_ECP_RESTARTABLE=y CONFIG_MBEDTLS_HARDWARE_MPI=n CONFIG_MBEDTLS_TLS_CLIENT_ONLY=y --CONFIG_MBEDTLS_ECP_FIXED_POINT_OPTIM=y CONFIG_MBEDTLS_POLY1305_C=y - CONFIG_MBEDTLS_CHACHA20_C=y - CONFIG_MBEDTLS_CHACHAPOLY_C=y diff --git a/variants/esp32-no-ble/sdkconfig.defaults.patch b/variants/esp32-no-ble/sdkconfig.defaults.patch index 72c17a6..b03d289 100644 --- a/variants/esp32-no-ble/sdkconfig.defaults.patch +++ b/variants/esp32-no-ble/sdkconfig.defaults.patch @@ -1,6 +1,13 @@ --- toit/toolchains/esp32/sdkconfig.defaults +++ synthesized/esp32-no-ble/sdkconfig.defaults -@@ -9,23 +9,6 @@ +@@ -1,5 +1,5 @@ + # This file was generated using idf.py save-defconfig. It can be edited manually. +-# Espressif IoT Development Framework (ESP-IDF) 5.3.1 Project Minimal Configuration ++# Espressif IoT Development Framework (ESP-IDF) Project Minimal Configuration + # + CONFIG_BOOTLOADER_LOG_LEVEL_NONE=y + CONFIG_BOOTLOADER_APP_ROLLBACK_ENABLE=y +@@ -9,34 +9,20 @@ CONFIG_PARTITION_TABLE_CUSTOM=y CONFIG_COMPILER_OPTIMIZATION_SIZE=y CONFIG_COMPILER_OPTIMIZATION_ASSERTIONS_DISABLE=y @@ -23,8 +30,13 @@ -CONFIG_BTDM_BLE_ADV_REPORT_FLOW_CTRL_NUM=50 CONFIG_ADC_CAL_EFUSE_TP_ENABLE=n CONFIG_ADC_CAL_LUT_ENABLE=n +-CONFIG_ESP_ERR_TO_NAME_LOOKUP=n CONFIG_SPI_SLAVE_ISR_IN_IRAM=n -@@ -37,6 +20,9 @@ + CONFIG_UART_ISR_IN_IRAM=y ++CONFIG_ESP_ERR_TO_NAME_LOOKUP=n + CONFIG_ETH_SPI_ETHERNET_DM9051=y + CONFIG_ETH_SPI_ETHERNET_W5500=y + CONFIG_ESP_HTTP_CLIENT_ENABLE_HTTPS=n CONFIG_ESP_SLEEP_GPIO_RESET_WORKAROUND=y CONFIG_XTAL_FREQ_AUTO=y CONFIG_ESP_PHY_CALIBRATION_AND_DATA_STORAGE=n @@ -42,22 +54,15 @@ CONFIG_FATFS_LFN_HEAP=y CONFIG_FREERTOS_THREAD_LOCAL_STORAGE_POINTERS=3 CONFIG_FREERTOS_IDLE_TASK_STACKSIZE=1024 -@@ -60,14 +45,11 @@ - CONFIG_LWIP_TCP_MSS=1410 - CONFIG_LWIP_TCP_SND_BUF_DEFAULT=5640 - CONFIG_LWIP_TCP_WND_DEFAULT=5640 --CONFIG_LWIP_HOOK_IP6_INPUT_NONE=y +@@ -63,7 +48,6 @@ CONFIG_MBEDTLS_SSL_IN_CONTENT_LEN=7800 CONFIG_MBEDTLS_SSL_OUT_CONTENT_LEN=3700 CONFIG_MBEDTLS_X509_TRUSTED_CERT_CALLBACK=y -CONFIG_MBEDTLS_ECP_RESTARTABLE=y CONFIG_MBEDTLS_HARDWARE_MPI=n CONFIG_MBEDTLS_TLS_CLIENT_ONLY=y --CONFIG_MBEDTLS_ECP_FIXED_POINT_OPTIM=y CONFIG_MBEDTLS_POLY1305_C=y - CONFIG_MBEDTLS_CHACHA20_C=y - CONFIG_MBEDTLS_CHACHAPOLY_C=y -@@ -77,4 +59,3 @@ +@@ -75,4 +59,3 @@ CONFIG_SPI_FLASH_LOG_FAILED_WRITE=y CONFIG_SPI_FLASH_WARN_SETTING_ZERO_TO_ONE=y CONFIG_WS_TRANSPORT=n diff --git a/variants/esp32-qemu/sdkconfig.defaults.patch b/variants/esp32-qemu/sdkconfig.defaults.patch index 72ec903..ed5d38d 100644 --- a/variants/esp32-qemu/sdkconfig.defaults.patch +++ b/variants/esp32-qemu/sdkconfig.defaults.patch @@ -1,7 +1,20 @@ --- toit/toolchains/esp32/sdkconfig.defaults +++ synthesized/esp32-qemu/sdkconfig.defaults -@@ -33,6 +33,7 @@ - CONFIG_ESP_ERR_TO_NAME_LOOKUP=n +@@ -1,5 +1,5 @@ + # This file was generated using idf.py save-defconfig. It can be edited manually. +-# Espressif IoT Development Framework (ESP-IDF) 5.3.1 Project Minimal Configuration ++# Espressif IoT Development Framework (ESP-IDF) Project Minimal Configuration + # + CONFIG_BOOTLOADER_LOG_LEVEL_NONE=y + CONFIG_BOOTLOADER_APP_ROLLBACK_ENABLE=y +@@ -28,11 +28,12 @@ + CONFIG_BTDM_BLE_ADV_REPORT_FLOW_CTRL_NUM=50 + CONFIG_ADC_CAL_EFUSE_TP_ENABLE=n + CONFIG_ADC_CAL_LUT_ENABLE=n +-CONFIG_ESP_ERR_TO_NAME_LOOKUP=n + CONFIG_SPI_SLAVE_ISR_IN_IRAM=n + CONFIG_UART_ISR_IN_IRAM=y ++CONFIG_ESP_ERR_TO_NAME_LOOKUP=n CONFIG_ETH_SPI_ETHERNET_DM9051=y CONFIG_ETH_SPI_ETHERNET_W5500=y +CONFIG_ETH_USE_OPENETH=y @@ -16,18 +29,11 @@ CONFIG_FATFS_LFN_HEAP=y CONFIG_FREERTOS_THREAD_LOCAL_STORAGE_POINTERS=3 CONFIG_FREERTOS_IDLE_TASK_STACKSIZE=1024 -@@ -60,14 +60,11 @@ - CONFIG_LWIP_TCP_MSS=1410 - CONFIG_LWIP_TCP_SND_BUF_DEFAULT=5640 - CONFIG_LWIP_TCP_WND_DEFAULT=5640 --CONFIG_LWIP_HOOK_IP6_INPUT_NONE=y +@@ -63,7 +63,6 @@ CONFIG_MBEDTLS_SSL_IN_CONTENT_LEN=7800 CONFIG_MBEDTLS_SSL_OUT_CONTENT_LEN=3700 CONFIG_MBEDTLS_X509_TRUSTED_CERT_CALLBACK=y -CONFIG_MBEDTLS_ECP_RESTARTABLE=y CONFIG_MBEDTLS_HARDWARE_MPI=n CONFIG_MBEDTLS_TLS_CLIENT_ONLY=y --CONFIG_MBEDTLS_ECP_FIXED_POINT_OPTIM=y CONFIG_MBEDTLS_POLY1305_C=y - CONFIG_MBEDTLS_CHACHA20_C=y - CONFIG_MBEDTLS_CHACHAPOLY_C=y diff --git a/variants/esp32-sedisto/sdkconfig.defaults.patch b/variants/esp32-sedisto/sdkconfig.defaults.patch index 6f13232..7879c2f 100644 --- a/variants/esp32-sedisto/sdkconfig.defaults.patch +++ b/variants/esp32-sedisto/sdkconfig.defaults.patch @@ -1,9 +1,20 @@ --- toit/toolchains/esp32/sdkconfig.defaults +++ synthesized/esp32-sedisto/sdkconfig.defaults -@@ -31,12 +31,17 @@ +@@ -1,5 +1,5 @@ + # This file was generated using idf.py save-defconfig. It can be edited manually. +-# Espressif IoT Development Framework (ESP-IDF) 5.3.1 Project Minimal Configuration ++# Espressif IoT Development Framework (ESP-IDF) Project Minimal Configuration + # + CONFIG_BOOTLOADER_LOG_LEVEL_NONE=y + CONFIG_BOOTLOADER_APP_ROLLBACK_ENABLE=y +@@ -28,15 +28,20 @@ + CONFIG_BTDM_BLE_ADV_REPORT_FLOW_CTRL_NUM=50 + CONFIG_ADC_CAL_EFUSE_TP_ENABLE=n + CONFIG_ADC_CAL_LUT_ENABLE=n +-CONFIG_ESP_ERR_TO_NAME_LOOKUP=n CONFIG_SPI_SLAVE_ISR_IN_IRAM=n CONFIG_UART_ISR_IN_IRAM=y - CONFIG_ESP_ERR_TO_NAME_LOOKUP=n ++CONFIG_ESP_ERR_TO_NAME_LOOKUP=n +CONFIG_ETH_RMII_CLK_OUTPUT=y +CONFIG_ETH_RMII_CLK_OUTPUT_GPIO0=y CONFIG_ETH_SPI_ETHERNET_DM9051=y @@ -27,22 +38,15 @@ CONFIG_FATFS_LFN_HEAP=y CONFIG_FREERTOS_THREAD_LOCAL_STORAGE_POINTERS=3 CONFIG_FREERTOS_IDLE_TASK_STACKSIZE=1024 -@@ -60,14 +63,11 @@ - CONFIG_LWIP_TCP_MSS=1410 - CONFIG_LWIP_TCP_SND_BUF_DEFAULT=5640 - CONFIG_LWIP_TCP_WND_DEFAULT=5640 --CONFIG_LWIP_HOOK_IP6_INPUT_NONE=y +@@ -63,7 +66,6 @@ CONFIG_MBEDTLS_SSL_IN_CONTENT_LEN=7800 CONFIG_MBEDTLS_SSL_OUT_CONTENT_LEN=3700 CONFIG_MBEDTLS_X509_TRUSTED_CERT_CALLBACK=y -CONFIG_MBEDTLS_ECP_RESTARTABLE=y CONFIG_MBEDTLS_HARDWARE_MPI=n CONFIG_MBEDTLS_TLS_CLIENT_ONLY=y --CONFIG_MBEDTLS_ECP_FIXED_POINT_OPTIM=y CONFIG_MBEDTLS_POLY1305_C=y - CONFIG_MBEDTLS_CHACHA20_C=y - CONFIG_MBEDTLS_CHACHAPOLY_C=y -@@ -77,4 +77,9 @@ +@@ -75,4 +77,9 @@ CONFIG_SPI_FLASH_LOG_FAILED_WRITE=y CONFIG_SPI_FLASH_WARN_SETTING_ZERO_TO_ONE=y CONFIG_WS_TRANSPORT=n diff --git a/variants/esp32-spiram/sdkconfig.defaults.patch b/variants/esp32-spiram/sdkconfig.defaults.patch index 7217d85..5c330fc 100644 --- a/variants/esp32-spiram/sdkconfig.defaults.patch +++ b/variants/esp32-spiram/sdkconfig.defaults.patch @@ -1,6 +1,23 @@ --- toit/toolchains/esp32/sdkconfig.defaults +++ synthesized/esp32-spiram/sdkconfig.defaults -@@ -37,16 +37,16 @@ +@@ -1,5 +1,5 @@ + # This file was generated using idf.py save-defconfig. It can be edited manually. +-# Espressif IoT Development Framework (ESP-IDF) 5.3.1 Project Minimal Configuration ++# Espressif IoT Development Framework (ESP-IDF) Project Minimal Configuration + # + CONFIG_BOOTLOADER_LOG_LEVEL_NONE=y + CONFIG_BOOTLOADER_APP_ROLLBACK_ENABLE=y +@@ -28,25 +28,25 @@ + CONFIG_BTDM_BLE_ADV_REPORT_FLOW_CTRL_NUM=50 + CONFIG_ADC_CAL_EFUSE_TP_ENABLE=n + CONFIG_ADC_CAL_LUT_ENABLE=n +-CONFIG_ESP_ERR_TO_NAME_LOOKUP=n + CONFIG_SPI_SLAVE_ISR_IN_IRAM=n + CONFIG_UART_ISR_IN_IRAM=y ++CONFIG_ESP_ERR_TO_NAME_LOOKUP=n + CONFIG_ETH_SPI_ETHERNET_DM9051=y + CONFIG_ETH_SPI_ETHERNET_W5500=y + CONFIG_ESP_HTTP_CLIENT_ENABLE_HTTPS=n CONFIG_ESP_SLEEP_GPIO_RESET_WORKAROUND=y CONFIG_XTAL_FREQ_AUTO=y CONFIG_ESP_PHY_CALIBRATION_AND_DATA_STORAGE=n @@ -20,22 +37,15 @@ CONFIG_FATFS_LFN_HEAP=y CONFIG_FREERTOS_THREAD_LOCAL_STORAGE_POINTERS=3 CONFIG_FREERTOS_IDLE_TASK_STACKSIZE=1024 -@@ -60,14 +60,11 @@ - CONFIG_LWIP_TCP_MSS=1410 - CONFIG_LWIP_TCP_SND_BUF_DEFAULT=5640 - CONFIG_LWIP_TCP_WND_DEFAULT=5640 --CONFIG_LWIP_HOOK_IP6_INPUT_NONE=y +@@ -63,7 +63,6 @@ CONFIG_MBEDTLS_SSL_IN_CONTENT_LEN=7800 CONFIG_MBEDTLS_SSL_OUT_CONTENT_LEN=3700 CONFIG_MBEDTLS_X509_TRUSTED_CERT_CALLBACK=y -CONFIG_MBEDTLS_ECP_RESTARTABLE=y CONFIG_MBEDTLS_HARDWARE_MPI=n CONFIG_MBEDTLS_TLS_CLIENT_ONLY=y --CONFIG_MBEDTLS_ECP_FIXED_POINT_OPTIM=y CONFIG_MBEDTLS_POLY1305_C=y - CONFIG_MBEDTLS_CHACHA20_C=y - CONFIG_MBEDTLS_CHACHAPOLY_C=y -@@ -77,4 +74,5 @@ +@@ -75,4 +74,5 @@ CONFIG_SPI_FLASH_LOG_FAILED_WRITE=y CONFIG_SPI_FLASH_WARN_SETTING_ZERO_TO_ONE=y CONFIG_WS_TRANSPORT=n diff --git a/variants/esp32-tls-server/sdkconfig.defaults.patch b/variants/esp32-tls-server/sdkconfig.defaults.patch index 1866d2a..9c2e3fa 100644 --- a/variants/esp32-tls-server/sdkconfig.defaults.patch +++ b/variants/esp32-tls-server/sdkconfig.defaults.patch @@ -1,5 +1,23 @@ --- toit/toolchains/esp32/sdkconfig.defaults +++ synthesized/esp32-tls-server/sdkconfig.defaults +@@ -1,5 +1,5 @@ + # This file was generated using idf.py save-defconfig. It can be edited manually. +-# Espressif IoT Development Framework (ESP-IDF) 5.3.1 Project Minimal Configuration ++# Espressif IoT Development Framework (ESP-IDF) Project Minimal Configuration + # + CONFIG_BOOTLOADER_LOG_LEVEL_NONE=y + CONFIG_BOOTLOADER_APP_ROLLBACK_ENABLE=y +@@ -28,9 +28,9 @@ + CONFIG_BTDM_BLE_ADV_REPORT_FLOW_CTRL_NUM=50 + CONFIG_ADC_CAL_EFUSE_TP_ENABLE=n + CONFIG_ADC_CAL_LUT_ENABLE=n +-CONFIG_ESP_ERR_TO_NAME_LOOKUP=n + CONFIG_SPI_SLAVE_ISR_IN_IRAM=n + CONFIG_UART_ISR_IN_IRAM=y ++CONFIG_ESP_ERR_TO_NAME_LOOKUP=n + CONFIG_ETH_SPI_ETHERNET_DM9051=y + CONFIG_ETH_SPI_ETHERNET_W5500=y + CONFIG_ESP_HTTP_CLIENT_ENABLE_HTTPS=n @@ -46,7 +46,6 @@ CONFIG_ESP_WIFI_NVS_ENABLED=n CONFIG_ESP_WIFI_TASK_PINNED_TO_CORE_1=y @@ -8,18 +26,13 @@ CONFIG_FATFS_LFN_HEAP=y CONFIG_FREERTOS_THREAD_LOCAL_STORAGE_POINTERS=3 CONFIG_FREERTOS_IDLE_TASK_STACKSIZE=1024 -@@ -60,14 +59,10 @@ - CONFIG_LWIP_TCP_MSS=1410 - CONFIG_LWIP_TCP_SND_BUF_DEFAULT=5640 - CONFIG_LWIP_TCP_WND_DEFAULT=5640 --CONFIG_LWIP_HOOK_IP6_INPUT_NONE=y +@@ -63,9 +62,7 @@ CONFIG_MBEDTLS_SSL_IN_CONTENT_LEN=7800 CONFIG_MBEDTLS_SSL_OUT_CONTENT_LEN=3700 CONFIG_MBEDTLS_X509_TRUSTED_CERT_CALLBACK=y -CONFIG_MBEDTLS_ECP_RESTARTABLE=y CONFIG_MBEDTLS_HARDWARE_MPI=n -CONFIG_MBEDTLS_TLS_CLIENT_ONLY=y --CONFIG_MBEDTLS_ECP_FIXED_POINT_OPTIM=y CONFIG_MBEDTLS_POLY1305_C=y CONFIG_MBEDTLS_CHACHA20_C=y CONFIG_MBEDTLS_CHACHAPOLY_C=y diff --git a/variants/esp32s3-consibio-spiram-octo/sdkconfig.defaults.patch b/variants/esp32s3-consibio-spiram-octo/sdkconfig.defaults.patch index c4276cd..77bb603 100644 --- a/variants/esp32s3-consibio-spiram-octo/sdkconfig.defaults.patch +++ b/variants/esp32s3-consibio-spiram-octo/sdkconfig.defaults.patch @@ -1,6 +1,12 @@ --- toit/toolchains/esp32s3/sdkconfig.defaults +++ synthesized/esp32s3-consibio-spiram-octo/sdkconfig.defaults -@@ -6,23 +6,12 @@ +@@ -1,37 +1,27 @@ + # This file was generated using idf.py save-defconfig. It can be edited manually. +-# Espressif IoT Development Framework (ESP-IDF) 5.3.1 Project Minimal Configuration ++# Espressif IoT Development Framework (ESP-IDF) Project Minimal Configuration + # + CONFIG_IDF_TARGET="esp32s3" + CONFIG_BOOTLOADER_LOG_LEVEL_NONE=y CONFIG_BOOTLOADER_APP_ROLLBACK_ENABLE=y CONFIG_BOOTLOADER_SKIP_VALIDATE_IN_DEEP_SLEEP=y CONFIG_APP_COMPILE_TIME_DATE=n @@ -24,10 +30,13 @@ -CONFIG_BT_NIMBLE_SVC_GAP_APPEARANCE=0x0 -CONFIG_BT_NIMBLE_TRANSPORT_ACL_FROM_LL_COUNT=10 -CONFIG_BT_CTRL_BLE_MAX_ACT=10 +-CONFIG_ESP_ERR_TO_NAME_LOOKUP=n CONFIG_SPI_SLAVE_ISR_IN_IRAM=n CONFIG_UART_ISR_IN_IRAM=y - CONFIG_ESP_ERR_TO_NAME_LOOKUP=n -@@ -32,6 +21,7 @@ ++CONFIG_ESP_ERR_TO_NAME_LOOKUP=n + CONFIG_ETH_SPI_ETHERNET_DM9051=y + CONFIG_ETH_SPI_ETHERNET_W5500=y + CONFIG_ESP_HTTP_CLIENT_ENABLE_HTTPS=n CONFIG_ESP_PHY_CALIBRATION_AND_DATA_STORAGE=n CONFIG_ESP_PHY_REDUCE_TX_POWER=y CONFIG_SPIRAM=y @@ -43,18 +52,3 @@ CONFIG_FATFS_LFN_HEAP=y CONFIG_FREERTOS_THREAD_LOCAL_STORAGE_POINTERS=3 CONFIG_FREERTOS_IDLE_TASK_STACKSIZE=1024 -@@ -54,14 +43,12 @@ - CONFIG_LWIP_TCP_MSS=1410 - CONFIG_LWIP_TCP_SND_BUF_DEFAULT=5640 - CONFIG_LWIP_TCP_WND_DEFAULT=5640 --CONFIG_LWIP_HOOK_IP6_INPUT_NONE=y - CONFIG_MBEDTLS_SSL_IN_CONTENT_LEN=7800 - CONFIG_MBEDTLS_SSL_OUT_CONTENT_LEN=3700 - CONFIG_MBEDTLS_X509_TRUSTED_CERT_CALLBACK=y - CONFIG_MBEDTLS_ECP_RESTARTABLE=y - CONFIG_MBEDTLS_HARDWARE_MPI=n - CONFIG_MBEDTLS_TLS_CLIENT_ONLY=y --CONFIG_MBEDTLS_ECP_FIXED_POINT_OPTIM=y - CONFIG_MBEDTLS_POLY1305_C=y - CONFIG_MBEDTLS_CHACHA20_C=y - CONFIG_MBEDTLS_CHACHAPOLY_C=y diff --git a/variants/esp32s3-no-ble/sdkconfig.defaults.patch b/variants/esp32s3-no-ble/sdkconfig.defaults.patch index 0b82976..8ff12ca 100644 --- a/variants/esp32s3-no-ble/sdkconfig.defaults.patch +++ b/variants/esp32s3-no-ble/sdkconfig.defaults.patch @@ -1,6 +1,13 @@ --- toit/toolchains/esp32s3/sdkconfig.defaults +++ synthesized/esp32s3-no-ble/sdkconfig.defaults -@@ -10,19 +10,6 @@ +@@ -1,5 +1,5 @@ + # This file was generated using idf.py save-defconfig. It can be edited manually. +-# Espressif IoT Development Framework (ESP-IDF) 5.3.1 Project Minimal Configuration ++# Espressif IoT Development Framework (ESP-IDF) Project Minimal Configuration + # + CONFIG_IDF_TARGET="esp32s3" + CONFIG_BOOTLOADER_LOG_LEVEL_NONE=y +@@ -10,22 +10,9 @@ CONFIG_PARTITION_TABLE_CUSTOM=y CONFIG_COMPILER_OPTIMIZATION_SIZE=y CONFIG_COMPILER_OPTIMIZATION_ASSERTIONS_DISABLE=y @@ -17,9 +24,13 @@ -CONFIG_BT_NIMBLE_SVC_GAP_APPEARANCE=0x0 -CONFIG_BT_NIMBLE_TRANSPORT_ACL_FROM_LL_COUNT=10 -CONFIG_BT_CTRL_BLE_MAX_ACT=10 +-CONFIG_ESP_ERR_TO_NAME_LOOKUP=n CONFIG_SPI_SLAVE_ISR_IN_IRAM=n CONFIG_UART_ISR_IN_IRAM=y - CONFIG_ESP_ERR_TO_NAME_LOOKUP=n ++CONFIG_ESP_ERR_TO_NAME_LOOKUP=n + CONFIG_ETH_SPI_ETHERNET_DM9051=y + CONFIG_ETH_SPI_ETHERNET_W5500=y + CONFIG_ESP_HTTP_CLIENT_ENABLE_HTTPS=n @@ -40,7 +27,6 @@ CONFIG_ESP_WIFI_DYNAMIC_RX_BUFFER_NUM=16 CONFIG_ESP_WIFI_NVS_ENABLED=n @@ -28,18 +39,3 @@ CONFIG_FATFS_LFN_HEAP=y CONFIG_FREERTOS_THREAD_LOCAL_STORAGE_POINTERS=3 CONFIG_FREERTOS_IDLE_TASK_STACKSIZE=1024 -@@ -54,14 +40,12 @@ - CONFIG_LWIP_TCP_MSS=1410 - CONFIG_LWIP_TCP_SND_BUF_DEFAULT=5640 - CONFIG_LWIP_TCP_WND_DEFAULT=5640 --CONFIG_LWIP_HOOK_IP6_INPUT_NONE=y - CONFIG_MBEDTLS_SSL_IN_CONTENT_LEN=7800 - CONFIG_MBEDTLS_SSL_OUT_CONTENT_LEN=3700 - CONFIG_MBEDTLS_X509_TRUSTED_CERT_CALLBACK=y - CONFIG_MBEDTLS_ECP_RESTARTABLE=y - CONFIG_MBEDTLS_HARDWARE_MPI=n - CONFIG_MBEDTLS_TLS_CLIENT_ONLY=y --CONFIG_MBEDTLS_ECP_FIXED_POINT_OPTIM=y - CONFIG_MBEDTLS_POLY1305_C=y - CONFIG_MBEDTLS_CHACHA20_C=y - CONFIG_MBEDTLS_CHACHAPOLY_C=y diff --git a/variants/esp32s3-spiram-octo/sdkconfig.defaults.patch b/variants/esp32s3-spiram-octo/sdkconfig.defaults.patch index 275a3ba..67ed7c9 100644 --- a/variants/esp32s3-spiram-octo/sdkconfig.defaults.patch +++ b/variants/esp32s3-spiram-octo/sdkconfig.defaults.patch @@ -1,6 +1,23 @@ --- toit/toolchains/esp32s3/sdkconfig.defaults +++ synthesized/esp32s3-spiram-octo/sdkconfig.defaults -@@ -32,6 +32,7 @@ +@@ -1,5 +1,5 @@ + # This file was generated using idf.py save-defconfig. It can be edited manually. +-# Espressif IoT Development Framework (ESP-IDF) 5.3.1 Project Minimal Configuration ++# Espressif IoT Development Framework (ESP-IDF) Project Minimal Configuration + # + CONFIG_IDF_TARGET="esp32s3" + CONFIG_BOOTLOADER_LOG_LEVEL_NONE=y +@@ -23,15 +23,16 @@ + CONFIG_BT_NIMBLE_SVC_GAP_APPEARANCE=0x0 + CONFIG_BT_NIMBLE_TRANSPORT_ACL_FROM_LL_COUNT=10 + CONFIG_BT_CTRL_BLE_MAX_ACT=10 +-CONFIG_ESP_ERR_TO_NAME_LOOKUP=n + CONFIG_SPI_SLAVE_ISR_IN_IRAM=n + CONFIG_UART_ISR_IN_IRAM=y ++CONFIG_ESP_ERR_TO_NAME_LOOKUP=n + CONFIG_ETH_SPI_ETHERNET_DM9051=y + CONFIG_ETH_SPI_ETHERNET_W5500=y + CONFIG_ESP_HTTP_CLIENT_ENABLE_HTTPS=n CONFIG_ESP_PHY_CALIBRATION_AND_DATA_STORAGE=n CONFIG_ESP_PHY_REDUCE_TX_POWER=y CONFIG_SPIRAM=y @@ -16,18 +33,11 @@ CONFIG_FATFS_LFN_HEAP=y CONFIG_FREERTOS_THREAD_LOCAL_STORAGE_POINTERS=3 CONFIG_FREERTOS_IDLE_TASK_STACKSIZE=1024 -@@ -54,14 +54,11 @@ - CONFIG_LWIP_TCP_MSS=1410 - CONFIG_LWIP_TCP_SND_BUF_DEFAULT=5640 - CONFIG_LWIP_TCP_WND_DEFAULT=5640 --CONFIG_LWIP_HOOK_IP6_INPUT_NONE=y +@@ -57,7 +57,6 @@ CONFIG_MBEDTLS_SSL_IN_CONTENT_LEN=7800 CONFIG_MBEDTLS_SSL_OUT_CONTENT_LEN=3700 CONFIG_MBEDTLS_X509_TRUSTED_CERT_CALLBACK=y -CONFIG_MBEDTLS_ECP_RESTARTABLE=y CONFIG_MBEDTLS_HARDWARE_MPI=n CONFIG_MBEDTLS_TLS_CLIENT_ONLY=y --CONFIG_MBEDTLS_ECP_FIXED_POINT_OPTIM=y CONFIG_MBEDTLS_POLY1305_C=y - CONFIG_MBEDTLS_CHACHA20_C=y - CONFIG_MBEDTLS_CHACHAPOLY_C=y diff --git a/variants/esp32s3-synap/sdkconfig.defaults.patch b/variants/esp32s3-synap/sdkconfig.defaults.patch index 9c3e7bb..c17012b 100644 --- a/variants/esp32s3-synap/sdkconfig.defaults.patch +++ b/variants/esp32s3-synap/sdkconfig.defaults.patch @@ -1,6 +1,12 @@ --- toit/toolchains/esp32s3/sdkconfig.defaults +++ synthesized/esp32s3-synap/sdkconfig.defaults -@@ -6,23 +6,10 @@ +@@ -1,31 +1,18 @@ + # This file was generated using idf.py save-defconfig. It can be edited manually. +-# Espressif IoT Development Framework (ESP-IDF) 5.3.1 Project Minimal Configuration ++# Espressif IoT Development Framework (ESP-IDF) Project Minimal Configuration + # + CONFIG_IDF_TARGET="esp32s3" + CONFIG_BOOTLOADER_LOG_LEVEL_NONE=y CONFIG_BOOTLOADER_APP_ROLLBACK_ENABLE=y CONFIG_BOOTLOADER_SKIP_VALIDATE_IN_DEEP_SLEEP=y CONFIG_APP_COMPILE_TIME_DATE=n @@ -22,9 +28,13 @@ -CONFIG_BT_NIMBLE_SVC_GAP_APPEARANCE=0x0 -CONFIG_BT_NIMBLE_TRANSPORT_ACL_FROM_LL_COUNT=10 -CONFIG_BT_CTRL_BLE_MAX_ACT=10 +-CONFIG_ESP_ERR_TO_NAME_LOOKUP=n CONFIG_SPI_SLAVE_ISR_IN_IRAM=n CONFIG_UART_ISR_IN_IRAM=y - CONFIG_ESP_ERR_TO_NAME_LOOKUP=n ++CONFIG_ESP_ERR_TO_NAME_LOOKUP=n + CONFIG_ETH_SPI_ETHERNET_DM9051=y + CONFIG_ETH_SPI_ETHERNET_W5500=y + CONFIG_ESP_HTTP_CLIENT_ENABLE_HTTPS=n @@ -34,13 +21,14 @@ CONFIG_SPIRAM=y CONFIG_SPIRAM_IGNORE_NOTFOUND=y @@ -41,18 +51,3 @@ CONFIG_FATFS_LFN_HEAP=y CONFIG_FREERTOS_THREAD_LOCAL_STORAGE_POINTERS=3 CONFIG_FREERTOS_IDLE_TASK_STACKSIZE=1024 -@@ -54,14 +42,12 @@ - CONFIG_LWIP_TCP_MSS=1410 - CONFIG_LWIP_TCP_SND_BUF_DEFAULT=5640 - CONFIG_LWIP_TCP_WND_DEFAULT=5640 --CONFIG_LWIP_HOOK_IP6_INPUT_NONE=y - CONFIG_MBEDTLS_SSL_IN_CONTENT_LEN=7800 - CONFIG_MBEDTLS_SSL_OUT_CONTENT_LEN=3700 - CONFIG_MBEDTLS_X509_TRUSTED_CERT_CALLBACK=y - CONFIG_MBEDTLS_ECP_RESTARTABLE=y - CONFIG_MBEDTLS_HARDWARE_MPI=n - CONFIG_MBEDTLS_TLS_CLIENT_ONLY=y --CONFIG_MBEDTLS_ECP_FIXED_POINT_OPTIM=y - CONFIG_MBEDTLS_POLY1305_C=y - CONFIG_MBEDTLS_CHACHA20_C=y - CONFIG_MBEDTLS_CHACHAPOLY_C=y From dfee54007f281da006a5adabe87d38b92f5b7a6a Mon Sep 17 00:00:00 2001 From: Florian Loitsch Date: Wed, 4 Dec 2024 16:44:45 +0100 Subject: [PATCH 4/5] Remove spurious changes. --- variants/esp32-consibio/sdkconfig.defaults.patch | 7 +------ .../esp32-eth-clk-out0-spiram/sdkconfig.defaults.patch | 7 ------- variants/esp32-eth-clk-out0/sdkconfig.defaults.patch | 7 ------- .../esp32-eth-clk-out17-spiram/sdkconfig.defaults.patch | 7 ------- variants/esp32-eth-clk-out17/sdkconfig.defaults.patch | 7 ------- variants/esp32-no-ble/sdkconfig.defaults.patch | 7 ------- variants/esp32-qemu/sdkconfig.defaults.patch | 7 ------- variants/esp32-sedisto/sdkconfig.defaults.patch | 7 ------- variants/esp32-spiram/sdkconfig.defaults.patch | 7 ------- variants/esp32-tls-server/sdkconfig.defaults.patch | 7 ------- .../esp32s3-consibio-spiram-octo/sdkconfig.defaults.patch | 8 +------- variants/esp32s3-no-ble/sdkconfig.defaults.patch | 7 ------- variants/esp32s3-spiram-octo/sdkconfig.defaults.patch | 7 ------- variants/esp32s3-synap/sdkconfig.defaults.patch | 8 +------- 14 files changed, 3 insertions(+), 97 deletions(-) diff --git a/variants/esp32-consibio/sdkconfig.defaults.patch b/variants/esp32-consibio/sdkconfig.defaults.patch index a256a35..f6100cc 100644 --- a/variants/esp32-consibio/sdkconfig.defaults.patch +++ b/variants/esp32-consibio/sdkconfig.defaults.patch @@ -1,11 +1,6 @@ --- toit/toolchains/esp32/sdkconfig.defaults +++ synthesized/esp32-consibio/sdkconfig.defaults -@@ -1,36 +1,19 @@ - # This file was generated using idf.py save-defconfig. It can be edited manually. --# Espressif IoT Development Framework (ESP-IDF) 5.3.1 Project Minimal Configuration -+# Espressif IoT Development Framework (ESP-IDF) Project Minimal Configuration - # - CONFIG_BOOTLOADER_LOG_LEVEL_NONE=y +@@ -5,32 +5,15 @@ CONFIG_BOOTLOADER_APP_ROLLBACK_ENABLE=y CONFIG_BOOTLOADER_SKIP_VALIDATE_IN_DEEP_SLEEP=y CONFIG_APP_COMPILE_TIME_DATE=n diff --git a/variants/esp32-eth-clk-out0-spiram/sdkconfig.defaults.patch b/variants/esp32-eth-clk-out0-spiram/sdkconfig.defaults.patch index 5138703..831e01a 100644 --- a/variants/esp32-eth-clk-out0-spiram/sdkconfig.defaults.patch +++ b/variants/esp32-eth-clk-out0-spiram/sdkconfig.defaults.patch @@ -1,12 +1,5 @@ --- toit/toolchains/esp32/sdkconfig.defaults +++ synthesized/esp32-eth-clk-out0-spiram/sdkconfig.defaults -@@ -1,5 +1,5 @@ - # This file was generated using idf.py save-defconfig. It can be edited manually. --# Espressif IoT Development Framework (ESP-IDF) 5.3.1 Project Minimal Configuration -+# Espressif IoT Development Framework (ESP-IDF) Project Minimal Configuration - # - CONFIG_BOOTLOADER_LOG_LEVEL_NONE=y - CONFIG_BOOTLOADER_APP_ROLLBACK_ENABLE=y @@ -28,15 +28,20 @@ CONFIG_BTDM_BLE_ADV_REPORT_FLOW_CTRL_NUM=50 CONFIG_ADC_CAL_EFUSE_TP_ENABLE=n diff --git a/variants/esp32-eth-clk-out0/sdkconfig.defaults.patch b/variants/esp32-eth-clk-out0/sdkconfig.defaults.patch index 6972bad..0f12bd0 100644 --- a/variants/esp32-eth-clk-out0/sdkconfig.defaults.patch +++ b/variants/esp32-eth-clk-out0/sdkconfig.defaults.patch @@ -1,12 +1,5 @@ --- toit/toolchains/esp32/sdkconfig.defaults +++ synthesized/esp32-eth-clk-out0/sdkconfig.defaults -@@ -1,5 +1,5 @@ - # This file was generated using idf.py save-defconfig. It can be edited manually. --# Espressif IoT Development Framework (ESP-IDF) 5.3.1 Project Minimal Configuration -+# Espressif IoT Development Framework (ESP-IDF) Project Minimal Configuration - # - CONFIG_BOOTLOADER_LOG_LEVEL_NONE=y - CONFIG_BOOTLOADER_APP_ROLLBACK_ENABLE=y @@ -28,9 +28,11 @@ CONFIG_BTDM_BLE_ADV_REPORT_FLOW_CTRL_NUM=50 CONFIG_ADC_CAL_EFUSE_TP_ENABLE=n diff --git a/variants/esp32-eth-clk-out17-spiram/sdkconfig.defaults.patch b/variants/esp32-eth-clk-out17-spiram/sdkconfig.defaults.patch index b0fd0ff..d09408c 100644 --- a/variants/esp32-eth-clk-out17-spiram/sdkconfig.defaults.patch +++ b/variants/esp32-eth-clk-out17-spiram/sdkconfig.defaults.patch @@ -1,12 +1,5 @@ --- toit/toolchains/esp32/sdkconfig.defaults +++ synthesized/esp32-eth-clk-out17-spiram/sdkconfig.defaults -@@ -1,5 +1,5 @@ - # This file was generated using idf.py save-defconfig. It can be edited manually. --# Espressif IoT Development Framework (ESP-IDF) 5.3.1 Project Minimal Configuration -+# Espressif IoT Development Framework (ESP-IDF) Project Minimal Configuration - # - CONFIG_BOOTLOADER_LOG_LEVEL_NONE=y - CONFIG_BOOTLOADER_APP_ROLLBACK_ENABLE=y @@ -28,15 +28,19 @@ CONFIG_BTDM_BLE_ADV_REPORT_FLOW_CTRL_NUM=50 CONFIG_ADC_CAL_EFUSE_TP_ENABLE=n diff --git a/variants/esp32-eth-clk-out17/sdkconfig.defaults.patch b/variants/esp32-eth-clk-out17/sdkconfig.defaults.patch index 9fcb434..4831075 100644 --- a/variants/esp32-eth-clk-out17/sdkconfig.defaults.patch +++ b/variants/esp32-eth-clk-out17/sdkconfig.defaults.patch @@ -1,12 +1,5 @@ --- toit/toolchains/esp32/sdkconfig.defaults +++ synthesized/esp32-eth-clk-out17/sdkconfig.defaults -@@ -1,5 +1,5 @@ - # This file was generated using idf.py save-defconfig. It can be edited manually. --# Espressif IoT Development Framework (ESP-IDF) 5.3.1 Project Minimal Configuration -+# Espressif IoT Development Framework (ESP-IDF) Project Minimal Configuration - # - CONFIG_BOOTLOADER_LOG_LEVEL_NONE=y - CONFIG_BOOTLOADER_APP_ROLLBACK_ENABLE=y @@ -28,9 +28,10 @@ CONFIG_BTDM_BLE_ADV_REPORT_FLOW_CTRL_NUM=50 CONFIG_ADC_CAL_EFUSE_TP_ENABLE=n diff --git a/variants/esp32-no-ble/sdkconfig.defaults.patch b/variants/esp32-no-ble/sdkconfig.defaults.patch index b03d289..f7aa635 100644 --- a/variants/esp32-no-ble/sdkconfig.defaults.patch +++ b/variants/esp32-no-ble/sdkconfig.defaults.patch @@ -1,12 +1,5 @@ --- toit/toolchains/esp32/sdkconfig.defaults +++ synthesized/esp32-no-ble/sdkconfig.defaults -@@ -1,5 +1,5 @@ - # This file was generated using idf.py save-defconfig. It can be edited manually. --# Espressif IoT Development Framework (ESP-IDF) 5.3.1 Project Minimal Configuration -+# Espressif IoT Development Framework (ESP-IDF) Project Minimal Configuration - # - CONFIG_BOOTLOADER_LOG_LEVEL_NONE=y - CONFIG_BOOTLOADER_APP_ROLLBACK_ENABLE=y @@ -9,34 +9,20 @@ CONFIG_PARTITION_TABLE_CUSTOM=y CONFIG_COMPILER_OPTIMIZATION_SIZE=y diff --git a/variants/esp32-qemu/sdkconfig.defaults.patch b/variants/esp32-qemu/sdkconfig.defaults.patch index ed5d38d..b10ca87 100644 --- a/variants/esp32-qemu/sdkconfig.defaults.patch +++ b/variants/esp32-qemu/sdkconfig.defaults.patch @@ -1,12 +1,5 @@ --- toit/toolchains/esp32/sdkconfig.defaults +++ synthesized/esp32-qemu/sdkconfig.defaults -@@ -1,5 +1,5 @@ - # This file was generated using idf.py save-defconfig. It can be edited manually. --# Espressif IoT Development Framework (ESP-IDF) 5.3.1 Project Minimal Configuration -+# Espressif IoT Development Framework (ESP-IDF) Project Minimal Configuration - # - CONFIG_BOOTLOADER_LOG_LEVEL_NONE=y - CONFIG_BOOTLOADER_APP_ROLLBACK_ENABLE=y @@ -28,11 +28,12 @@ CONFIG_BTDM_BLE_ADV_REPORT_FLOW_CTRL_NUM=50 CONFIG_ADC_CAL_EFUSE_TP_ENABLE=n diff --git a/variants/esp32-sedisto/sdkconfig.defaults.patch b/variants/esp32-sedisto/sdkconfig.defaults.patch index 7879c2f..d994f1f 100644 --- a/variants/esp32-sedisto/sdkconfig.defaults.patch +++ b/variants/esp32-sedisto/sdkconfig.defaults.patch @@ -1,12 +1,5 @@ --- toit/toolchains/esp32/sdkconfig.defaults +++ synthesized/esp32-sedisto/sdkconfig.defaults -@@ -1,5 +1,5 @@ - # This file was generated using idf.py save-defconfig. It can be edited manually. --# Espressif IoT Development Framework (ESP-IDF) 5.3.1 Project Minimal Configuration -+# Espressif IoT Development Framework (ESP-IDF) Project Minimal Configuration - # - CONFIG_BOOTLOADER_LOG_LEVEL_NONE=y - CONFIG_BOOTLOADER_APP_ROLLBACK_ENABLE=y @@ -28,15 +28,20 @@ CONFIG_BTDM_BLE_ADV_REPORT_FLOW_CTRL_NUM=50 CONFIG_ADC_CAL_EFUSE_TP_ENABLE=n diff --git a/variants/esp32-spiram/sdkconfig.defaults.patch b/variants/esp32-spiram/sdkconfig.defaults.patch index 5c330fc..2a286f4 100644 --- a/variants/esp32-spiram/sdkconfig.defaults.patch +++ b/variants/esp32-spiram/sdkconfig.defaults.patch @@ -1,12 +1,5 @@ --- toit/toolchains/esp32/sdkconfig.defaults +++ synthesized/esp32-spiram/sdkconfig.defaults -@@ -1,5 +1,5 @@ - # This file was generated using idf.py save-defconfig. It can be edited manually. --# Espressif IoT Development Framework (ESP-IDF) 5.3.1 Project Minimal Configuration -+# Espressif IoT Development Framework (ESP-IDF) Project Minimal Configuration - # - CONFIG_BOOTLOADER_LOG_LEVEL_NONE=y - CONFIG_BOOTLOADER_APP_ROLLBACK_ENABLE=y @@ -28,25 +28,25 @@ CONFIG_BTDM_BLE_ADV_REPORT_FLOW_CTRL_NUM=50 CONFIG_ADC_CAL_EFUSE_TP_ENABLE=n diff --git a/variants/esp32-tls-server/sdkconfig.defaults.patch b/variants/esp32-tls-server/sdkconfig.defaults.patch index 9c2e3fa..1c8d309 100644 --- a/variants/esp32-tls-server/sdkconfig.defaults.patch +++ b/variants/esp32-tls-server/sdkconfig.defaults.patch @@ -1,12 +1,5 @@ --- toit/toolchains/esp32/sdkconfig.defaults +++ synthesized/esp32-tls-server/sdkconfig.defaults -@@ -1,5 +1,5 @@ - # This file was generated using idf.py save-defconfig. It can be edited manually. --# Espressif IoT Development Framework (ESP-IDF) 5.3.1 Project Minimal Configuration -+# Espressif IoT Development Framework (ESP-IDF) Project Minimal Configuration - # - CONFIG_BOOTLOADER_LOG_LEVEL_NONE=y - CONFIG_BOOTLOADER_APP_ROLLBACK_ENABLE=y @@ -28,9 +28,9 @@ CONFIG_BTDM_BLE_ADV_REPORT_FLOW_CTRL_NUM=50 CONFIG_ADC_CAL_EFUSE_TP_ENABLE=n diff --git a/variants/esp32s3-consibio-spiram-octo/sdkconfig.defaults.patch b/variants/esp32s3-consibio-spiram-octo/sdkconfig.defaults.patch index 77bb603..ad91477 100644 --- a/variants/esp32s3-consibio-spiram-octo/sdkconfig.defaults.patch +++ b/variants/esp32s3-consibio-spiram-octo/sdkconfig.defaults.patch @@ -1,12 +1,6 @@ --- toit/toolchains/esp32s3/sdkconfig.defaults +++ synthesized/esp32s3-consibio-spiram-octo/sdkconfig.defaults -@@ -1,37 +1,27 @@ - # This file was generated using idf.py save-defconfig. It can be edited manually. --# Espressif IoT Development Framework (ESP-IDF) 5.3.1 Project Minimal Configuration -+# Espressif IoT Development Framework (ESP-IDF) Project Minimal Configuration - # - CONFIG_IDF_TARGET="esp32s3" - CONFIG_BOOTLOADER_LOG_LEVEL_NONE=y +@@ -6,32 +6,22 @@ CONFIG_BOOTLOADER_APP_ROLLBACK_ENABLE=y CONFIG_BOOTLOADER_SKIP_VALIDATE_IN_DEEP_SLEEP=y CONFIG_APP_COMPILE_TIME_DATE=n diff --git a/variants/esp32s3-no-ble/sdkconfig.defaults.patch b/variants/esp32s3-no-ble/sdkconfig.defaults.patch index 8ff12ca..1eade98 100644 --- a/variants/esp32s3-no-ble/sdkconfig.defaults.patch +++ b/variants/esp32s3-no-ble/sdkconfig.defaults.patch @@ -1,12 +1,5 @@ --- toit/toolchains/esp32s3/sdkconfig.defaults +++ synthesized/esp32s3-no-ble/sdkconfig.defaults -@@ -1,5 +1,5 @@ - # This file was generated using idf.py save-defconfig. It can be edited manually. --# Espressif IoT Development Framework (ESP-IDF) 5.3.1 Project Minimal Configuration -+# Espressif IoT Development Framework (ESP-IDF) Project Minimal Configuration - # - CONFIG_IDF_TARGET="esp32s3" - CONFIG_BOOTLOADER_LOG_LEVEL_NONE=y @@ -10,22 +10,9 @@ CONFIG_PARTITION_TABLE_CUSTOM=y CONFIG_COMPILER_OPTIMIZATION_SIZE=y diff --git a/variants/esp32s3-spiram-octo/sdkconfig.defaults.patch b/variants/esp32s3-spiram-octo/sdkconfig.defaults.patch index 67ed7c9..81478c6 100644 --- a/variants/esp32s3-spiram-octo/sdkconfig.defaults.patch +++ b/variants/esp32s3-spiram-octo/sdkconfig.defaults.patch @@ -1,12 +1,5 @@ --- toit/toolchains/esp32s3/sdkconfig.defaults +++ synthesized/esp32s3-spiram-octo/sdkconfig.defaults -@@ -1,5 +1,5 @@ - # This file was generated using idf.py save-defconfig. It can be edited manually. --# Espressif IoT Development Framework (ESP-IDF) 5.3.1 Project Minimal Configuration -+# Espressif IoT Development Framework (ESP-IDF) Project Minimal Configuration - # - CONFIG_IDF_TARGET="esp32s3" - CONFIG_BOOTLOADER_LOG_LEVEL_NONE=y @@ -23,15 +23,16 @@ CONFIG_BT_NIMBLE_SVC_GAP_APPEARANCE=0x0 CONFIG_BT_NIMBLE_TRANSPORT_ACL_FROM_LL_COUNT=10 diff --git a/variants/esp32s3-synap/sdkconfig.defaults.patch b/variants/esp32s3-synap/sdkconfig.defaults.patch index c17012b..9c945f4 100644 --- a/variants/esp32s3-synap/sdkconfig.defaults.patch +++ b/variants/esp32s3-synap/sdkconfig.defaults.patch @@ -1,12 +1,6 @@ --- toit/toolchains/esp32s3/sdkconfig.defaults +++ synthesized/esp32s3-synap/sdkconfig.defaults -@@ -1,31 +1,18 @@ - # This file was generated using idf.py save-defconfig. It can be edited manually. --# Espressif IoT Development Framework (ESP-IDF) 5.3.1 Project Minimal Configuration -+# Espressif IoT Development Framework (ESP-IDF) Project Minimal Configuration - # - CONFIG_IDF_TARGET="esp32s3" - CONFIG_BOOTLOADER_LOG_LEVEL_NONE=y +@@ -6,26 +6,13 @@ CONFIG_BOOTLOADER_APP_ROLLBACK_ENABLE=y CONFIG_BOOTLOADER_SKIP_VALIDATE_IN_DEEP_SLEEP=y CONFIG_APP_COMPILE_TIME_DATE=n From db6e05130beaef0edd82532b137d85999de0a09c Mon Sep 17 00:00:00 2001 From: Florian Loitsch Date: Wed, 4 Dec 2024 18:08:38 +0100 Subject: [PATCH 5/5] Use correct Toit SDK branch. --- .../esp32-consibio/sdkconfig.defaults.patch | 25 ++++++++++++------ .../sdkconfig.defaults.patch | 19 ++++++++------ .../sdkconfig.defaults.patch | 17 +++++++----- .../sdkconfig.defaults.patch | 19 ++++++++------ .../sdkconfig.defaults.patch | 17 +++++++----- .../esp32-no-ble/sdkconfig.defaults.patch | 20 +++++++------- variants/esp32-qemu/sdkconfig.defaults.patch | 26 ++++++++++++------- .../esp32-sedisto/sdkconfig.defaults.patch | 19 ++++++++------ .../esp32-spiram/sdkconfig.defaults.patch | 23 +++++++--------- .../esp32-tls-server/sdkconfig.defaults.patch | 18 +++++-------- .../sdkconfig.defaults.patch | 24 ++++++++++++----- .../esp32s3-no-ble/sdkconfig.defaults.patch | 23 +++++++++++----- .../sdkconfig.defaults.patch | 21 +++++++-------- .../esp32s3-synap/sdkconfig.defaults.patch | 23 +++++++++++----- 14 files changed, 175 insertions(+), 119 deletions(-) diff --git a/variants/esp32-consibio/sdkconfig.defaults.patch b/variants/esp32-consibio/sdkconfig.defaults.patch index f6100cc..bb8fdbb 100644 --- a/variants/esp32-consibio/sdkconfig.defaults.patch +++ b/variants/esp32-consibio/sdkconfig.defaults.patch @@ -1,6 +1,6 @@ --- toit/toolchains/esp32/sdkconfig.defaults +++ synthesized/esp32-consibio/sdkconfig.defaults -@@ -5,32 +5,15 @@ +@@ -5,27 +5,10 @@ CONFIG_BOOTLOADER_APP_ROLLBACK_ENABLE=y CONFIG_BOOTLOADER_SKIP_VALIDATE_IN_DEEP_SLEEP=y CONFIG_APP_COMPILE_TIME_DATE=n @@ -28,13 +28,7 @@ -CONFIG_BTDM_BLE_ADV_REPORT_FLOW_CTRL_NUM=50 CONFIG_ADC_CAL_EFUSE_TP_ENABLE=n CONFIG_ADC_CAL_LUT_ENABLE=n --CONFIG_ESP_ERR_TO_NAME_LOOKUP=n CONFIG_SPI_SLAVE_ISR_IN_IRAM=n - CONFIG_UART_ISR_IN_IRAM=y -+CONFIG_ESP_ERR_TO_NAME_LOOKUP=n - CONFIG_ETH_SPI_ETHERNET_DM9051=y - CONFIG_ETH_SPI_ETHERNET_W5500=y - CONFIG_ESP_HTTP_CLIENT_ENABLE_HTTPS=n @@ -46,7 +29,6 @@ CONFIG_ESP_WIFI_NVS_ENABLED=n CONFIG_ESP_WIFI_TASK_PINNED_TO_CORE_1=y @@ -43,7 +37,22 @@ CONFIG_FATFS_LFN_HEAP=y CONFIG_FREERTOS_THREAD_LOCAL_STORAGE_POINTERS=3 CONFIG_FREERTOS_IDLE_TASK_STACKSIZE=1024 -@@ -75,4 +57,3 @@ +@@ -60,14 +42,12 @@ + CONFIG_LWIP_TCP_MSS=1410 + CONFIG_LWIP_TCP_SND_BUF_DEFAULT=5640 + CONFIG_LWIP_TCP_WND_DEFAULT=5640 +-CONFIG_LWIP_HOOK_IP6_INPUT_NONE=y + CONFIG_MBEDTLS_SSL_IN_CONTENT_LEN=7800 + CONFIG_MBEDTLS_SSL_OUT_CONTENT_LEN=3700 + CONFIG_MBEDTLS_X509_TRUSTED_CERT_CALLBACK=y + CONFIG_MBEDTLS_ECP_RESTARTABLE=y + CONFIG_MBEDTLS_HARDWARE_MPI=n + CONFIG_MBEDTLS_TLS_CLIENT_ONLY=y +-CONFIG_MBEDTLS_ECP_FIXED_POINT_OPTIM=y + CONFIG_MBEDTLS_POLY1305_C=y + CONFIG_MBEDTLS_CHACHA20_C=y + CONFIG_MBEDTLS_CHACHAPOLY_C=y +@@ -77,4 +57,3 @@ CONFIG_SPI_FLASH_LOG_FAILED_WRITE=y CONFIG_SPI_FLASH_WARN_SETTING_ZERO_TO_ONE=y CONFIG_WS_TRANSPORT=n diff --git a/variants/esp32-eth-clk-out0-spiram/sdkconfig.defaults.patch b/variants/esp32-eth-clk-out0-spiram/sdkconfig.defaults.patch index 831e01a..6dfa59b 100644 --- a/variants/esp32-eth-clk-out0-spiram/sdkconfig.defaults.patch +++ b/variants/esp32-eth-clk-out0-spiram/sdkconfig.defaults.patch @@ -1,13 +1,9 @@ --- toit/toolchains/esp32/sdkconfig.defaults +++ synthesized/esp32-eth-clk-out0-spiram/sdkconfig.defaults -@@ -28,15 +28,20 @@ - CONFIG_BTDM_BLE_ADV_REPORT_FLOW_CTRL_NUM=50 - CONFIG_ADC_CAL_EFUSE_TP_ENABLE=n - CONFIG_ADC_CAL_LUT_ENABLE=n --CONFIG_ESP_ERR_TO_NAME_LOOKUP=n +@@ -31,12 +31,17 @@ CONFIG_SPI_SLAVE_ISR_IN_IRAM=n CONFIG_UART_ISR_IN_IRAM=y -+CONFIG_ESP_ERR_TO_NAME_LOOKUP=n + CONFIG_ESP_ERR_TO_NAME_LOOKUP=n +CONFIG_ETH_RMII_CLK_OUTPUT=y +CONFIG_ETH_RMII_CLK_OUTPUT_GPIO0=y CONFIG_ETH_SPI_ETHERNET_DM9051=y @@ -31,15 +27,22 @@ CONFIG_FATFS_LFN_HEAP=y CONFIG_FREERTOS_THREAD_LOCAL_STORAGE_POINTERS=3 CONFIG_FREERTOS_IDLE_TASK_STACKSIZE=1024 -@@ -63,7 +66,6 @@ +@@ -60,14 +63,11 @@ + CONFIG_LWIP_TCP_MSS=1410 + CONFIG_LWIP_TCP_SND_BUF_DEFAULT=5640 + CONFIG_LWIP_TCP_WND_DEFAULT=5640 +-CONFIG_LWIP_HOOK_IP6_INPUT_NONE=y CONFIG_MBEDTLS_SSL_IN_CONTENT_LEN=7800 CONFIG_MBEDTLS_SSL_OUT_CONTENT_LEN=3700 CONFIG_MBEDTLS_X509_TRUSTED_CERT_CALLBACK=y -CONFIG_MBEDTLS_ECP_RESTARTABLE=y CONFIG_MBEDTLS_HARDWARE_MPI=n CONFIG_MBEDTLS_TLS_CLIENT_ONLY=y +-CONFIG_MBEDTLS_ECP_FIXED_POINT_OPTIM=y CONFIG_MBEDTLS_POLY1305_C=y -@@ -75,4 +77,5 @@ + CONFIG_MBEDTLS_CHACHA20_C=y + CONFIG_MBEDTLS_CHACHAPOLY_C=y +@@ -77,4 +77,5 @@ CONFIG_SPI_FLASH_LOG_FAILED_WRITE=y CONFIG_SPI_FLASH_WARN_SETTING_ZERO_TO_ONE=y CONFIG_WS_TRANSPORT=n diff --git a/variants/esp32-eth-clk-out0/sdkconfig.defaults.patch b/variants/esp32-eth-clk-out0/sdkconfig.defaults.patch index 0f12bd0..fea8f05 100644 --- a/variants/esp32-eth-clk-out0/sdkconfig.defaults.patch +++ b/variants/esp32-eth-clk-out0/sdkconfig.defaults.patch @@ -1,13 +1,9 @@ --- toit/toolchains/esp32/sdkconfig.defaults +++ synthesized/esp32-eth-clk-out0/sdkconfig.defaults -@@ -28,9 +28,11 @@ - CONFIG_BTDM_BLE_ADV_REPORT_FLOW_CTRL_NUM=50 - CONFIG_ADC_CAL_EFUSE_TP_ENABLE=n - CONFIG_ADC_CAL_LUT_ENABLE=n --CONFIG_ESP_ERR_TO_NAME_LOOKUP=n +@@ -31,6 +31,8 @@ CONFIG_SPI_SLAVE_ISR_IN_IRAM=n CONFIG_UART_ISR_IN_IRAM=y -+CONFIG_ESP_ERR_TO_NAME_LOOKUP=n + CONFIG_ESP_ERR_TO_NAME_LOOKUP=n +CONFIG_ETH_RMII_CLK_OUTPUT=y +CONFIG_ETH_RMII_CLK_OUTPUT_GPIO0=y CONFIG_ETH_SPI_ETHERNET_DM9051=y @@ -21,11 +17,18 @@ CONFIG_FATFS_LFN_HEAP=y CONFIG_FREERTOS_THREAD_LOCAL_STORAGE_POINTERS=3 CONFIG_FREERTOS_IDLE_TASK_STACKSIZE=1024 -@@ -63,7 +64,6 @@ +@@ -60,14 +61,11 @@ + CONFIG_LWIP_TCP_MSS=1410 + CONFIG_LWIP_TCP_SND_BUF_DEFAULT=5640 + CONFIG_LWIP_TCP_WND_DEFAULT=5640 +-CONFIG_LWIP_HOOK_IP6_INPUT_NONE=y CONFIG_MBEDTLS_SSL_IN_CONTENT_LEN=7800 CONFIG_MBEDTLS_SSL_OUT_CONTENT_LEN=3700 CONFIG_MBEDTLS_X509_TRUSTED_CERT_CALLBACK=y -CONFIG_MBEDTLS_ECP_RESTARTABLE=y CONFIG_MBEDTLS_HARDWARE_MPI=n CONFIG_MBEDTLS_TLS_CLIENT_ONLY=y +-CONFIG_MBEDTLS_ECP_FIXED_POINT_OPTIM=y CONFIG_MBEDTLS_POLY1305_C=y + CONFIG_MBEDTLS_CHACHA20_C=y + CONFIG_MBEDTLS_CHACHAPOLY_C=y diff --git a/variants/esp32-eth-clk-out17-spiram/sdkconfig.defaults.patch b/variants/esp32-eth-clk-out17-spiram/sdkconfig.defaults.patch index d09408c..a7306da 100644 --- a/variants/esp32-eth-clk-out17-spiram/sdkconfig.defaults.patch +++ b/variants/esp32-eth-clk-out17-spiram/sdkconfig.defaults.patch @@ -1,13 +1,9 @@ --- toit/toolchains/esp32/sdkconfig.defaults +++ synthesized/esp32-eth-clk-out17-spiram/sdkconfig.defaults -@@ -28,15 +28,19 @@ - CONFIG_BTDM_BLE_ADV_REPORT_FLOW_CTRL_NUM=50 - CONFIG_ADC_CAL_EFUSE_TP_ENABLE=n - CONFIG_ADC_CAL_LUT_ENABLE=n --CONFIG_ESP_ERR_TO_NAME_LOOKUP=n +@@ -31,12 +31,16 @@ CONFIG_SPI_SLAVE_ISR_IN_IRAM=n CONFIG_UART_ISR_IN_IRAM=y -+CONFIG_ESP_ERR_TO_NAME_LOOKUP=n + CONFIG_ESP_ERR_TO_NAME_LOOKUP=n +CONFIG_ETH_RMII_CLK_OUTPUT=y CONFIG_ETH_SPI_ETHERNET_DM9051=y CONFIG_ETH_SPI_ETHERNET_W5500=y @@ -30,15 +26,22 @@ CONFIG_FATFS_LFN_HEAP=y CONFIG_FREERTOS_THREAD_LOCAL_STORAGE_POINTERS=3 CONFIG_FREERTOS_IDLE_TASK_STACKSIZE=1024 -@@ -63,7 +65,6 @@ +@@ -60,14 +62,11 @@ + CONFIG_LWIP_TCP_MSS=1410 + CONFIG_LWIP_TCP_SND_BUF_DEFAULT=5640 + CONFIG_LWIP_TCP_WND_DEFAULT=5640 +-CONFIG_LWIP_HOOK_IP6_INPUT_NONE=y CONFIG_MBEDTLS_SSL_IN_CONTENT_LEN=7800 CONFIG_MBEDTLS_SSL_OUT_CONTENT_LEN=3700 CONFIG_MBEDTLS_X509_TRUSTED_CERT_CALLBACK=y -CONFIG_MBEDTLS_ECP_RESTARTABLE=y CONFIG_MBEDTLS_HARDWARE_MPI=n CONFIG_MBEDTLS_TLS_CLIENT_ONLY=y +-CONFIG_MBEDTLS_ECP_FIXED_POINT_OPTIM=y CONFIG_MBEDTLS_POLY1305_C=y -@@ -75,4 +76,5 @@ + CONFIG_MBEDTLS_CHACHA20_C=y + CONFIG_MBEDTLS_CHACHAPOLY_C=y +@@ -77,4 +76,5 @@ CONFIG_SPI_FLASH_LOG_FAILED_WRITE=y CONFIG_SPI_FLASH_WARN_SETTING_ZERO_TO_ONE=y CONFIG_WS_TRANSPORT=n diff --git a/variants/esp32-eth-clk-out17/sdkconfig.defaults.patch b/variants/esp32-eth-clk-out17/sdkconfig.defaults.patch index 4831075..618f401 100644 --- a/variants/esp32-eth-clk-out17/sdkconfig.defaults.patch +++ b/variants/esp32-eth-clk-out17/sdkconfig.defaults.patch @@ -1,13 +1,9 @@ --- toit/toolchains/esp32/sdkconfig.defaults +++ synthesized/esp32-eth-clk-out17/sdkconfig.defaults -@@ -28,9 +28,10 @@ - CONFIG_BTDM_BLE_ADV_REPORT_FLOW_CTRL_NUM=50 - CONFIG_ADC_CAL_EFUSE_TP_ENABLE=n - CONFIG_ADC_CAL_LUT_ENABLE=n --CONFIG_ESP_ERR_TO_NAME_LOOKUP=n +@@ -31,6 +31,7 @@ CONFIG_SPI_SLAVE_ISR_IN_IRAM=n CONFIG_UART_ISR_IN_IRAM=y -+CONFIG_ESP_ERR_TO_NAME_LOOKUP=n + CONFIG_ESP_ERR_TO_NAME_LOOKUP=n +CONFIG_ETH_RMII_CLK_OUTPUT=y CONFIG_ETH_SPI_ETHERNET_DM9051=y CONFIG_ETH_SPI_ETHERNET_W5500=y @@ -20,11 +16,18 @@ CONFIG_FATFS_LFN_HEAP=y CONFIG_FREERTOS_THREAD_LOCAL_STORAGE_POINTERS=3 CONFIG_FREERTOS_IDLE_TASK_STACKSIZE=1024 -@@ -63,7 +63,6 @@ +@@ -60,14 +60,11 @@ + CONFIG_LWIP_TCP_MSS=1410 + CONFIG_LWIP_TCP_SND_BUF_DEFAULT=5640 + CONFIG_LWIP_TCP_WND_DEFAULT=5640 +-CONFIG_LWIP_HOOK_IP6_INPUT_NONE=y CONFIG_MBEDTLS_SSL_IN_CONTENT_LEN=7800 CONFIG_MBEDTLS_SSL_OUT_CONTENT_LEN=3700 CONFIG_MBEDTLS_X509_TRUSTED_CERT_CALLBACK=y -CONFIG_MBEDTLS_ECP_RESTARTABLE=y CONFIG_MBEDTLS_HARDWARE_MPI=n CONFIG_MBEDTLS_TLS_CLIENT_ONLY=y +-CONFIG_MBEDTLS_ECP_FIXED_POINT_OPTIM=y CONFIG_MBEDTLS_POLY1305_C=y + CONFIG_MBEDTLS_CHACHA20_C=y + CONFIG_MBEDTLS_CHACHAPOLY_C=y diff --git a/variants/esp32-no-ble/sdkconfig.defaults.patch b/variants/esp32-no-ble/sdkconfig.defaults.patch index f7aa635..72c17a6 100644 --- a/variants/esp32-no-ble/sdkconfig.defaults.patch +++ b/variants/esp32-no-ble/sdkconfig.defaults.patch @@ -1,6 +1,6 @@ --- toit/toolchains/esp32/sdkconfig.defaults +++ synthesized/esp32-no-ble/sdkconfig.defaults -@@ -9,34 +9,20 @@ +@@ -9,23 +9,6 @@ CONFIG_PARTITION_TABLE_CUSTOM=y CONFIG_COMPILER_OPTIMIZATION_SIZE=y CONFIG_COMPILER_OPTIMIZATION_ASSERTIONS_DISABLE=y @@ -23,13 +23,8 @@ -CONFIG_BTDM_BLE_ADV_REPORT_FLOW_CTRL_NUM=50 CONFIG_ADC_CAL_EFUSE_TP_ENABLE=n CONFIG_ADC_CAL_LUT_ENABLE=n --CONFIG_ESP_ERR_TO_NAME_LOOKUP=n CONFIG_SPI_SLAVE_ISR_IN_IRAM=n - CONFIG_UART_ISR_IN_IRAM=y -+CONFIG_ESP_ERR_TO_NAME_LOOKUP=n - CONFIG_ETH_SPI_ETHERNET_DM9051=y - CONFIG_ETH_SPI_ETHERNET_W5500=y - CONFIG_ESP_HTTP_CLIENT_ENABLE_HTTPS=n +@@ -37,6 +20,9 @@ CONFIG_ESP_SLEEP_GPIO_RESET_WORKAROUND=y CONFIG_XTAL_FREQ_AUTO=y CONFIG_ESP_PHY_CALIBRATION_AND_DATA_STORAGE=n @@ -47,15 +42,22 @@ CONFIG_FATFS_LFN_HEAP=y CONFIG_FREERTOS_THREAD_LOCAL_STORAGE_POINTERS=3 CONFIG_FREERTOS_IDLE_TASK_STACKSIZE=1024 -@@ -63,7 +48,6 @@ +@@ -60,14 +45,11 @@ + CONFIG_LWIP_TCP_MSS=1410 + CONFIG_LWIP_TCP_SND_BUF_DEFAULT=5640 + CONFIG_LWIP_TCP_WND_DEFAULT=5640 +-CONFIG_LWIP_HOOK_IP6_INPUT_NONE=y CONFIG_MBEDTLS_SSL_IN_CONTENT_LEN=7800 CONFIG_MBEDTLS_SSL_OUT_CONTENT_LEN=3700 CONFIG_MBEDTLS_X509_TRUSTED_CERT_CALLBACK=y -CONFIG_MBEDTLS_ECP_RESTARTABLE=y CONFIG_MBEDTLS_HARDWARE_MPI=n CONFIG_MBEDTLS_TLS_CLIENT_ONLY=y +-CONFIG_MBEDTLS_ECP_FIXED_POINT_OPTIM=y CONFIG_MBEDTLS_POLY1305_C=y -@@ -75,4 +59,3 @@ + CONFIG_MBEDTLS_CHACHA20_C=y + CONFIG_MBEDTLS_CHACHAPOLY_C=y +@@ -77,4 +59,3 @@ CONFIG_SPI_FLASH_LOG_FAILED_WRITE=y CONFIG_SPI_FLASH_WARN_SETTING_ZERO_TO_ONE=y CONFIG_WS_TRANSPORT=n diff --git a/variants/esp32-qemu/sdkconfig.defaults.patch b/variants/esp32-qemu/sdkconfig.defaults.patch index b10ca87..f312608 100644 --- a/variants/esp32-qemu/sdkconfig.defaults.patch +++ b/variants/esp32-qemu/sdkconfig.defaults.patch @@ -1,13 +1,14 @@ --- toit/toolchains/esp32/sdkconfig.defaults +++ synthesized/esp32-qemu/sdkconfig.defaults -@@ -28,11 +28,12 @@ - CONFIG_BTDM_BLE_ADV_REPORT_FLOW_CTRL_NUM=50 - CONFIG_ADC_CAL_EFUSE_TP_ENABLE=n - CONFIG_ADC_CAL_LUT_ENABLE=n --CONFIG_ESP_ERR_TO_NAME_LOOKUP=n - CONFIG_SPI_SLAVE_ISR_IN_IRAM=n - CONFIG_UART_ISR_IN_IRAM=y -+CONFIG_ESP_ERR_TO_NAME_LOOKUP=n +@@ -1,5 +1,5 @@ + # This file was generated using idf.py save-defconfig. It can be edited manually. +-# Espressif IoT Development Framework (ESP-IDF) Project Minimal Configuration ++# Espressif IoT Development Framework (ESP-IDF) 5.3.1 Project Minimal Configuration + # + CONFIG_BOOTLOADER_LOG_LEVEL_NONE=y + CONFIG_BOOTLOADER_APP_ROLLBACK_ENABLE=y +@@ -33,6 +33,7 @@ + CONFIG_ESP_ERR_TO_NAME_LOOKUP=n CONFIG_ETH_SPI_ETHERNET_DM9051=y CONFIG_ETH_SPI_ETHERNET_W5500=y +CONFIG_ETH_USE_OPENETH=y @@ -22,11 +23,18 @@ CONFIG_FATFS_LFN_HEAP=y CONFIG_FREERTOS_THREAD_LOCAL_STORAGE_POINTERS=3 CONFIG_FREERTOS_IDLE_TASK_STACKSIZE=1024 -@@ -63,7 +63,6 @@ +@@ -60,14 +60,11 @@ + CONFIG_LWIP_TCP_MSS=1410 + CONFIG_LWIP_TCP_SND_BUF_DEFAULT=5640 + CONFIG_LWIP_TCP_WND_DEFAULT=5640 +-CONFIG_LWIP_HOOK_IP6_INPUT_NONE=y CONFIG_MBEDTLS_SSL_IN_CONTENT_LEN=7800 CONFIG_MBEDTLS_SSL_OUT_CONTENT_LEN=3700 CONFIG_MBEDTLS_X509_TRUSTED_CERT_CALLBACK=y -CONFIG_MBEDTLS_ECP_RESTARTABLE=y CONFIG_MBEDTLS_HARDWARE_MPI=n CONFIG_MBEDTLS_TLS_CLIENT_ONLY=y +-CONFIG_MBEDTLS_ECP_FIXED_POINT_OPTIM=y CONFIG_MBEDTLS_POLY1305_C=y + CONFIG_MBEDTLS_CHACHA20_C=y + CONFIG_MBEDTLS_CHACHAPOLY_C=y diff --git a/variants/esp32-sedisto/sdkconfig.defaults.patch b/variants/esp32-sedisto/sdkconfig.defaults.patch index d994f1f..6f13232 100644 --- a/variants/esp32-sedisto/sdkconfig.defaults.patch +++ b/variants/esp32-sedisto/sdkconfig.defaults.patch @@ -1,13 +1,9 @@ --- toit/toolchains/esp32/sdkconfig.defaults +++ synthesized/esp32-sedisto/sdkconfig.defaults -@@ -28,15 +28,20 @@ - CONFIG_BTDM_BLE_ADV_REPORT_FLOW_CTRL_NUM=50 - CONFIG_ADC_CAL_EFUSE_TP_ENABLE=n - CONFIG_ADC_CAL_LUT_ENABLE=n --CONFIG_ESP_ERR_TO_NAME_LOOKUP=n +@@ -31,12 +31,17 @@ CONFIG_SPI_SLAVE_ISR_IN_IRAM=n CONFIG_UART_ISR_IN_IRAM=y -+CONFIG_ESP_ERR_TO_NAME_LOOKUP=n + CONFIG_ESP_ERR_TO_NAME_LOOKUP=n +CONFIG_ETH_RMII_CLK_OUTPUT=y +CONFIG_ETH_RMII_CLK_OUTPUT_GPIO0=y CONFIG_ETH_SPI_ETHERNET_DM9051=y @@ -31,15 +27,22 @@ CONFIG_FATFS_LFN_HEAP=y CONFIG_FREERTOS_THREAD_LOCAL_STORAGE_POINTERS=3 CONFIG_FREERTOS_IDLE_TASK_STACKSIZE=1024 -@@ -63,7 +66,6 @@ +@@ -60,14 +63,11 @@ + CONFIG_LWIP_TCP_MSS=1410 + CONFIG_LWIP_TCP_SND_BUF_DEFAULT=5640 + CONFIG_LWIP_TCP_WND_DEFAULT=5640 +-CONFIG_LWIP_HOOK_IP6_INPUT_NONE=y CONFIG_MBEDTLS_SSL_IN_CONTENT_LEN=7800 CONFIG_MBEDTLS_SSL_OUT_CONTENT_LEN=3700 CONFIG_MBEDTLS_X509_TRUSTED_CERT_CALLBACK=y -CONFIG_MBEDTLS_ECP_RESTARTABLE=y CONFIG_MBEDTLS_HARDWARE_MPI=n CONFIG_MBEDTLS_TLS_CLIENT_ONLY=y +-CONFIG_MBEDTLS_ECP_FIXED_POINT_OPTIM=y CONFIG_MBEDTLS_POLY1305_C=y -@@ -75,4 +77,9 @@ + CONFIG_MBEDTLS_CHACHA20_C=y + CONFIG_MBEDTLS_CHACHAPOLY_C=y +@@ -77,4 +77,9 @@ CONFIG_SPI_FLASH_LOG_FAILED_WRITE=y CONFIG_SPI_FLASH_WARN_SETTING_ZERO_TO_ONE=y CONFIG_WS_TRANSPORT=n diff --git a/variants/esp32-spiram/sdkconfig.defaults.patch b/variants/esp32-spiram/sdkconfig.defaults.patch index 2a286f4..7217d85 100644 --- a/variants/esp32-spiram/sdkconfig.defaults.patch +++ b/variants/esp32-spiram/sdkconfig.defaults.patch @@ -1,16 +1,6 @@ --- toit/toolchains/esp32/sdkconfig.defaults +++ synthesized/esp32-spiram/sdkconfig.defaults -@@ -28,25 +28,25 @@ - CONFIG_BTDM_BLE_ADV_REPORT_FLOW_CTRL_NUM=50 - CONFIG_ADC_CAL_EFUSE_TP_ENABLE=n - CONFIG_ADC_CAL_LUT_ENABLE=n --CONFIG_ESP_ERR_TO_NAME_LOOKUP=n - CONFIG_SPI_SLAVE_ISR_IN_IRAM=n - CONFIG_UART_ISR_IN_IRAM=y -+CONFIG_ESP_ERR_TO_NAME_LOOKUP=n - CONFIG_ETH_SPI_ETHERNET_DM9051=y - CONFIG_ETH_SPI_ETHERNET_W5500=y - CONFIG_ESP_HTTP_CLIENT_ENABLE_HTTPS=n +@@ -37,16 +37,16 @@ CONFIG_ESP_SLEEP_GPIO_RESET_WORKAROUND=y CONFIG_XTAL_FREQ_AUTO=y CONFIG_ESP_PHY_CALIBRATION_AND_DATA_STORAGE=n @@ -30,15 +20,22 @@ CONFIG_FATFS_LFN_HEAP=y CONFIG_FREERTOS_THREAD_LOCAL_STORAGE_POINTERS=3 CONFIG_FREERTOS_IDLE_TASK_STACKSIZE=1024 -@@ -63,7 +63,6 @@ +@@ -60,14 +60,11 @@ + CONFIG_LWIP_TCP_MSS=1410 + CONFIG_LWIP_TCP_SND_BUF_DEFAULT=5640 + CONFIG_LWIP_TCP_WND_DEFAULT=5640 +-CONFIG_LWIP_HOOK_IP6_INPUT_NONE=y CONFIG_MBEDTLS_SSL_IN_CONTENT_LEN=7800 CONFIG_MBEDTLS_SSL_OUT_CONTENT_LEN=3700 CONFIG_MBEDTLS_X509_TRUSTED_CERT_CALLBACK=y -CONFIG_MBEDTLS_ECP_RESTARTABLE=y CONFIG_MBEDTLS_HARDWARE_MPI=n CONFIG_MBEDTLS_TLS_CLIENT_ONLY=y +-CONFIG_MBEDTLS_ECP_FIXED_POINT_OPTIM=y CONFIG_MBEDTLS_POLY1305_C=y -@@ -75,4 +74,5 @@ + CONFIG_MBEDTLS_CHACHA20_C=y + CONFIG_MBEDTLS_CHACHAPOLY_C=y +@@ -77,4 +74,5 @@ CONFIG_SPI_FLASH_LOG_FAILED_WRITE=y CONFIG_SPI_FLASH_WARN_SETTING_ZERO_TO_ONE=y CONFIG_WS_TRANSPORT=n diff --git a/variants/esp32-tls-server/sdkconfig.defaults.patch b/variants/esp32-tls-server/sdkconfig.defaults.patch index 1c8d309..1866d2a 100644 --- a/variants/esp32-tls-server/sdkconfig.defaults.patch +++ b/variants/esp32-tls-server/sdkconfig.defaults.patch @@ -1,16 +1,5 @@ --- toit/toolchains/esp32/sdkconfig.defaults +++ synthesized/esp32-tls-server/sdkconfig.defaults -@@ -28,9 +28,9 @@ - CONFIG_BTDM_BLE_ADV_REPORT_FLOW_CTRL_NUM=50 - CONFIG_ADC_CAL_EFUSE_TP_ENABLE=n - CONFIG_ADC_CAL_LUT_ENABLE=n --CONFIG_ESP_ERR_TO_NAME_LOOKUP=n - CONFIG_SPI_SLAVE_ISR_IN_IRAM=n - CONFIG_UART_ISR_IN_IRAM=y -+CONFIG_ESP_ERR_TO_NAME_LOOKUP=n - CONFIG_ETH_SPI_ETHERNET_DM9051=y - CONFIG_ETH_SPI_ETHERNET_W5500=y - CONFIG_ESP_HTTP_CLIENT_ENABLE_HTTPS=n @@ -46,7 +46,6 @@ CONFIG_ESP_WIFI_NVS_ENABLED=n CONFIG_ESP_WIFI_TASK_PINNED_TO_CORE_1=y @@ -19,13 +8,18 @@ CONFIG_FATFS_LFN_HEAP=y CONFIG_FREERTOS_THREAD_LOCAL_STORAGE_POINTERS=3 CONFIG_FREERTOS_IDLE_TASK_STACKSIZE=1024 -@@ -63,9 +62,7 @@ +@@ -60,14 +59,10 @@ + CONFIG_LWIP_TCP_MSS=1410 + CONFIG_LWIP_TCP_SND_BUF_DEFAULT=5640 + CONFIG_LWIP_TCP_WND_DEFAULT=5640 +-CONFIG_LWIP_HOOK_IP6_INPUT_NONE=y CONFIG_MBEDTLS_SSL_IN_CONTENT_LEN=7800 CONFIG_MBEDTLS_SSL_OUT_CONTENT_LEN=3700 CONFIG_MBEDTLS_X509_TRUSTED_CERT_CALLBACK=y -CONFIG_MBEDTLS_ECP_RESTARTABLE=y CONFIG_MBEDTLS_HARDWARE_MPI=n -CONFIG_MBEDTLS_TLS_CLIENT_ONLY=y +-CONFIG_MBEDTLS_ECP_FIXED_POINT_OPTIM=y CONFIG_MBEDTLS_POLY1305_C=y CONFIG_MBEDTLS_CHACHA20_C=y CONFIG_MBEDTLS_CHACHAPOLY_C=y diff --git a/variants/esp32s3-consibio-spiram-octo/sdkconfig.defaults.patch b/variants/esp32s3-consibio-spiram-octo/sdkconfig.defaults.patch index ad91477..c4276cd 100644 --- a/variants/esp32s3-consibio-spiram-octo/sdkconfig.defaults.patch +++ b/variants/esp32s3-consibio-spiram-octo/sdkconfig.defaults.patch @@ -1,6 +1,6 @@ --- toit/toolchains/esp32s3/sdkconfig.defaults +++ synthesized/esp32s3-consibio-spiram-octo/sdkconfig.defaults -@@ -6,32 +6,22 @@ +@@ -6,23 +6,12 @@ CONFIG_BOOTLOADER_APP_ROLLBACK_ENABLE=y CONFIG_BOOTLOADER_SKIP_VALIDATE_IN_DEEP_SLEEP=y CONFIG_APP_COMPILE_TIME_DATE=n @@ -24,13 +24,10 @@ -CONFIG_BT_NIMBLE_SVC_GAP_APPEARANCE=0x0 -CONFIG_BT_NIMBLE_TRANSPORT_ACL_FROM_LL_COUNT=10 -CONFIG_BT_CTRL_BLE_MAX_ACT=10 --CONFIG_ESP_ERR_TO_NAME_LOOKUP=n CONFIG_SPI_SLAVE_ISR_IN_IRAM=n CONFIG_UART_ISR_IN_IRAM=y -+CONFIG_ESP_ERR_TO_NAME_LOOKUP=n - CONFIG_ETH_SPI_ETHERNET_DM9051=y - CONFIG_ETH_SPI_ETHERNET_W5500=y - CONFIG_ESP_HTTP_CLIENT_ENABLE_HTTPS=n + CONFIG_ESP_ERR_TO_NAME_LOOKUP=n +@@ -32,6 +21,7 @@ CONFIG_ESP_PHY_CALIBRATION_AND_DATA_STORAGE=n CONFIG_ESP_PHY_REDUCE_TX_POWER=y CONFIG_SPIRAM=y @@ -46,3 +43,18 @@ CONFIG_FATFS_LFN_HEAP=y CONFIG_FREERTOS_THREAD_LOCAL_STORAGE_POINTERS=3 CONFIG_FREERTOS_IDLE_TASK_STACKSIZE=1024 +@@ -54,14 +43,12 @@ + CONFIG_LWIP_TCP_MSS=1410 + CONFIG_LWIP_TCP_SND_BUF_DEFAULT=5640 + CONFIG_LWIP_TCP_WND_DEFAULT=5640 +-CONFIG_LWIP_HOOK_IP6_INPUT_NONE=y + CONFIG_MBEDTLS_SSL_IN_CONTENT_LEN=7800 + CONFIG_MBEDTLS_SSL_OUT_CONTENT_LEN=3700 + CONFIG_MBEDTLS_X509_TRUSTED_CERT_CALLBACK=y + CONFIG_MBEDTLS_ECP_RESTARTABLE=y + CONFIG_MBEDTLS_HARDWARE_MPI=n + CONFIG_MBEDTLS_TLS_CLIENT_ONLY=y +-CONFIG_MBEDTLS_ECP_FIXED_POINT_OPTIM=y + CONFIG_MBEDTLS_POLY1305_C=y + CONFIG_MBEDTLS_CHACHA20_C=y + CONFIG_MBEDTLS_CHACHAPOLY_C=y diff --git a/variants/esp32s3-no-ble/sdkconfig.defaults.patch b/variants/esp32s3-no-ble/sdkconfig.defaults.patch index 1eade98..0b82976 100644 --- a/variants/esp32s3-no-ble/sdkconfig.defaults.patch +++ b/variants/esp32s3-no-ble/sdkconfig.defaults.patch @@ -1,6 +1,6 @@ --- toit/toolchains/esp32s3/sdkconfig.defaults +++ synthesized/esp32s3-no-ble/sdkconfig.defaults -@@ -10,22 +10,9 @@ +@@ -10,19 +10,6 @@ CONFIG_PARTITION_TABLE_CUSTOM=y CONFIG_COMPILER_OPTIMIZATION_SIZE=y CONFIG_COMPILER_OPTIMIZATION_ASSERTIONS_DISABLE=y @@ -17,13 +17,9 @@ -CONFIG_BT_NIMBLE_SVC_GAP_APPEARANCE=0x0 -CONFIG_BT_NIMBLE_TRANSPORT_ACL_FROM_LL_COUNT=10 -CONFIG_BT_CTRL_BLE_MAX_ACT=10 --CONFIG_ESP_ERR_TO_NAME_LOOKUP=n CONFIG_SPI_SLAVE_ISR_IN_IRAM=n CONFIG_UART_ISR_IN_IRAM=y -+CONFIG_ESP_ERR_TO_NAME_LOOKUP=n - CONFIG_ETH_SPI_ETHERNET_DM9051=y - CONFIG_ETH_SPI_ETHERNET_W5500=y - CONFIG_ESP_HTTP_CLIENT_ENABLE_HTTPS=n + CONFIG_ESP_ERR_TO_NAME_LOOKUP=n @@ -40,7 +27,6 @@ CONFIG_ESP_WIFI_DYNAMIC_RX_BUFFER_NUM=16 CONFIG_ESP_WIFI_NVS_ENABLED=n @@ -32,3 +28,18 @@ CONFIG_FATFS_LFN_HEAP=y CONFIG_FREERTOS_THREAD_LOCAL_STORAGE_POINTERS=3 CONFIG_FREERTOS_IDLE_TASK_STACKSIZE=1024 +@@ -54,14 +40,12 @@ + CONFIG_LWIP_TCP_MSS=1410 + CONFIG_LWIP_TCP_SND_BUF_DEFAULT=5640 + CONFIG_LWIP_TCP_WND_DEFAULT=5640 +-CONFIG_LWIP_HOOK_IP6_INPUT_NONE=y + CONFIG_MBEDTLS_SSL_IN_CONTENT_LEN=7800 + CONFIG_MBEDTLS_SSL_OUT_CONTENT_LEN=3700 + CONFIG_MBEDTLS_X509_TRUSTED_CERT_CALLBACK=y + CONFIG_MBEDTLS_ECP_RESTARTABLE=y + CONFIG_MBEDTLS_HARDWARE_MPI=n + CONFIG_MBEDTLS_TLS_CLIENT_ONLY=y +-CONFIG_MBEDTLS_ECP_FIXED_POINT_OPTIM=y + CONFIG_MBEDTLS_POLY1305_C=y + CONFIG_MBEDTLS_CHACHA20_C=y + CONFIG_MBEDTLS_CHACHAPOLY_C=y diff --git a/variants/esp32s3-spiram-octo/sdkconfig.defaults.patch b/variants/esp32s3-spiram-octo/sdkconfig.defaults.patch index 81478c6..275a3ba 100644 --- a/variants/esp32s3-spiram-octo/sdkconfig.defaults.patch +++ b/variants/esp32s3-spiram-octo/sdkconfig.defaults.patch @@ -1,16 +1,6 @@ --- toit/toolchains/esp32s3/sdkconfig.defaults +++ synthesized/esp32s3-spiram-octo/sdkconfig.defaults -@@ -23,15 +23,16 @@ - CONFIG_BT_NIMBLE_SVC_GAP_APPEARANCE=0x0 - CONFIG_BT_NIMBLE_TRANSPORT_ACL_FROM_LL_COUNT=10 - CONFIG_BT_CTRL_BLE_MAX_ACT=10 --CONFIG_ESP_ERR_TO_NAME_LOOKUP=n - CONFIG_SPI_SLAVE_ISR_IN_IRAM=n - CONFIG_UART_ISR_IN_IRAM=y -+CONFIG_ESP_ERR_TO_NAME_LOOKUP=n - CONFIG_ETH_SPI_ETHERNET_DM9051=y - CONFIG_ETH_SPI_ETHERNET_W5500=y - CONFIG_ESP_HTTP_CLIENT_ENABLE_HTTPS=n +@@ -32,6 +32,7 @@ CONFIG_ESP_PHY_CALIBRATION_AND_DATA_STORAGE=n CONFIG_ESP_PHY_REDUCE_TX_POWER=y CONFIG_SPIRAM=y @@ -26,11 +16,18 @@ CONFIG_FATFS_LFN_HEAP=y CONFIG_FREERTOS_THREAD_LOCAL_STORAGE_POINTERS=3 CONFIG_FREERTOS_IDLE_TASK_STACKSIZE=1024 -@@ -57,7 +57,6 @@ +@@ -54,14 +54,11 @@ + CONFIG_LWIP_TCP_MSS=1410 + CONFIG_LWIP_TCP_SND_BUF_DEFAULT=5640 + CONFIG_LWIP_TCP_WND_DEFAULT=5640 +-CONFIG_LWIP_HOOK_IP6_INPUT_NONE=y CONFIG_MBEDTLS_SSL_IN_CONTENT_LEN=7800 CONFIG_MBEDTLS_SSL_OUT_CONTENT_LEN=3700 CONFIG_MBEDTLS_X509_TRUSTED_CERT_CALLBACK=y -CONFIG_MBEDTLS_ECP_RESTARTABLE=y CONFIG_MBEDTLS_HARDWARE_MPI=n CONFIG_MBEDTLS_TLS_CLIENT_ONLY=y +-CONFIG_MBEDTLS_ECP_FIXED_POINT_OPTIM=y CONFIG_MBEDTLS_POLY1305_C=y + CONFIG_MBEDTLS_CHACHA20_C=y + CONFIG_MBEDTLS_CHACHAPOLY_C=y diff --git a/variants/esp32s3-synap/sdkconfig.defaults.patch b/variants/esp32s3-synap/sdkconfig.defaults.patch index 9c945f4..9c3e7bb 100644 --- a/variants/esp32s3-synap/sdkconfig.defaults.patch +++ b/variants/esp32s3-synap/sdkconfig.defaults.patch @@ -1,6 +1,6 @@ --- toit/toolchains/esp32s3/sdkconfig.defaults +++ synthesized/esp32s3-synap/sdkconfig.defaults -@@ -6,26 +6,13 @@ +@@ -6,23 +6,10 @@ CONFIG_BOOTLOADER_APP_ROLLBACK_ENABLE=y CONFIG_BOOTLOADER_SKIP_VALIDATE_IN_DEEP_SLEEP=y CONFIG_APP_COMPILE_TIME_DATE=n @@ -22,13 +22,9 @@ -CONFIG_BT_NIMBLE_SVC_GAP_APPEARANCE=0x0 -CONFIG_BT_NIMBLE_TRANSPORT_ACL_FROM_LL_COUNT=10 -CONFIG_BT_CTRL_BLE_MAX_ACT=10 --CONFIG_ESP_ERR_TO_NAME_LOOKUP=n CONFIG_SPI_SLAVE_ISR_IN_IRAM=n CONFIG_UART_ISR_IN_IRAM=y -+CONFIG_ESP_ERR_TO_NAME_LOOKUP=n - CONFIG_ETH_SPI_ETHERNET_DM9051=y - CONFIG_ETH_SPI_ETHERNET_W5500=y - CONFIG_ESP_HTTP_CLIENT_ENABLE_HTTPS=n + CONFIG_ESP_ERR_TO_NAME_LOOKUP=n @@ -34,13 +21,14 @@ CONFIG_SPIRAM=y CONFIG_SPIRAM_IGNORE_NOTFOUND=y @@ -45,3 +41,18 @@ CONFIG_FATFS_LFN_HEAP=y CONFIG_FREERTOS_THREAD_LOCAL_STORAGE_POINTERS=3 CONFIG_FREERTOS_IDLE_TASK_STACKSIZE=1024 +@@ -54,14 +42,12 @@ + CONFIG_LWIP_TCP_MSS=1410 + CONFIG_LWIP_TCP_SND_BUF_DEFAULT=5640 + CONFIG_LWIP_TCP_WND_DEFAULT=5640 +-CONFIG_LWIP_HOOK_IP6_INPUT_NONE=y + CONFIG_MBEDTLS_SSL_IN_CONTENT_LEN=7800 + CONFIG_MBEDTLS_SSL_OUT_CONTENT_LEN=3700 + CONFIG_MBEDTLS_X509_TRUSTED_CERT_CALLBACK=y + CONFIG_MBEDTLS_ECP_RESTARTABLE=y + CONFIG_MBEDTLS_HARDWARE_MPI=n + CONFIG_MBEDTLS_TLS_CLIENT_ONLY=y +-CONFIG_MBEDTLS_ECP_FIXED_POINT_OPTIM=y + CONFIG_MBEDTLS_POLY1305_C=y + CONFIG_MBEDTLS_CHACHA20_C=y + CONFIG_MBEDTLS_CHACHAPOLY_C=y