Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: toitlang/envelopes
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: v2.0.0-alpha.167
Choose a base ref
...
head repository: toitlang/envelopes
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: main
Choose a head ref
  • 4 commits
  • 17 files changed
  • 1 contributor

Commits on Nov 21, 2024

  1. Copy the full SHA
    4eb4f05 View commit details

Commits on Dec 4, 2024

  1. Copy the full SHA
    8a41225 View commit details

Commits on Dec 9, 2024

  1. Copy the full SHA
    906586b View commit details
  2. Add esp32c6. (#72)

    floitsch authored Dec 9, 2024
    Copy the full SHA
    dba3567 View commit details
2 changes: 1 addition & 1 deletion .github/workflows/build.yml
Original file line number Diff line number Diff line change
@@ -112,7 +112,7 @@ jobs:
- name: Setting the variants
run: |
VARIANTS=${{ github.event.inputs.variant }}
VARIANTS="${{ github.event.inputs.variant }}"
if [ -z "$VARIANTS" ]; then
if ! [ -z "${{ github.event.inputs.gist }}" ]; then
VARIANTS="gist"
21 changes: 13 additions & 8 deletions variants/README.md
Original file line number Diff line number Diff line change
@@ -17,6 +17,13 @@ This variant supports Ethernet, but without the clock output.

An ESP32 variant for boards with SPIRAM. Otherwise the same as the ESP32 variant.

## esp32-no-ble

A [variant](esp32-no-ble/) for ESP32 boards. This variant
saves some RAM and flash space by removing the Bluetooth stack.
The saved IRAM enables us to make the Toit interpreter a little faster
and add support for external RAM (PSRAM, aka SPIRAM).

## esp32-eth-clk-out0 and esp32-eth-clk-out17

A variant for ESP32 boards with Ethernet and a clock output on pin 0/17.
@@ -26,9 +33,14 @@ Olimex boards with Ethernet should use this variant. The WROOM versions need

## esp32c3

A generic [ESP32-C3 variant](esp32c). This is the default variant
A generic [ESP32-C3 variant](esp32c3). This is the default variant
when using Toit on ESP32-C3 boards.

## esp32c6

A generic [ESP32-C6 variant](esp32c6). This is the default variant
when using Toit on ESP32-C6 boards.

## esp32s2

A generic [ESP32-S2 variant](esp32s2). This is the default variant
@@ -47,10 +59,3 @@ A [variant](esp32s3-spiram-octo/) for ESP32-S3 boards with external
octal PSRAM.

These boards are faster, but often more expensive.

## esp32-no-ble

A [variant](esp32-no-ble/) for ESP32 boards. This variant
saves some RAM and flash space by removing the Bluetooth stack.
The saved IRAM enables us to make the Toit interpreter a little faster
and add support for external RAM (PSRAM, aka SPIRAM).
37 changes: 18 additions & 19 deletions variants/esp32-consibio/sdkconfig.defaults.patch
Original file line number Diff line number Diff line change
@@ -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_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_TLS_CLIENT_ONLY=y
CONFIG_MBEDTLS_POLY1305_C=y
@@ -73,4 +58,3 @@
CONFIG_ADC_CAL_EFUSE_TP_ENABLE=n
CONFIG_ADC_CAL_LUT_ENABLE=n
CONFIG_ESP_ERR_TO_NAME_LOOKUP=n
@@ -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
@@ -75,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
39 changes: 24 additions & 15 deletions variants/esp32-eth-clk-out0-spiram/sdkconfig.defaults.patch
Original file line number Diff line number Diff line change
@@ -1,34 +1,43 @@
--- 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_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 is not set
+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
@@ -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_INT_WDT=n
CONFIG_ESP_TASK_WDT_INIT=n
@@ -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 @@
@@ -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_POLY1305_C=y
@@ -75,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
22 changes: 19 additions & 3 deletions variants/esp32-eth-clk-out0/sdkconfig.defaults.patch
Original file line number Diff line number Diff line change
@@ -1,11 +1,27 @@
--- 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_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 is not set
+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
@@ -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
@@ -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_POLY1305_C=y
39 changes: 24 additions & 15 deletions variants/esp32-eth-clk-out17-spiram/sdkconfig.defaults.patch
Original file line number Diff line number Diff line change
@@ -1,33 +1,42 @@
--- 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_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 is not set
+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
@@ -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_INT_WDT=n
CONFIG_ESP_TASK_WDT_INIT=n
@@ -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 @@
@@ -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_POLY1305_C=y
@@ -75,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
22 changes: 19 additions & 3 deletions variants/esp32-eth-clk-out17/sdkconfig.defaults.patch
Original file line number Diff line number Diff line change
@@ -1,10 +1,26 @@
--- 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_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 is not set
+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
@@ -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
@@ -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_POLY1305_C=y
40 changes: 28 additions & 12 deletions variants/esp32-no-ble/sdkconfig.defaults.patch
Original file line number Diff line number Diff line change
@@ -15,27 +15,43 @@
-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_ESP_ERR_TO_NAME_LOOKUP=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
@@ -73,4 +59,3 @@
CONFIG_ESP_INT_WDT=n
CONFIG_ESP_TASK_WDT_INIT=n
@@ -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
@@ -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_POLY1305_C=y
@@ -75,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
20 changes: 18 additions & 2 deletions variants/esp32-qemu/sdkconfig.defaults.patch
Original file line number Diff line number Diff line change
@@ -1,10 +1,26 @@
--- toit/toolchains/esp32/sdkconfig.defaults
+++ synthesized/esp32-qemu/sdkconfig.defaults
@@ -33,6 +33,7 @@
# CONFIG_ESP_ERR_TO_NAME_LOOKUP is not set
CONFIG_UART_ISR_IN_IRAM=y
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
@@ -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
@@ -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_POLY1305_C=y
47 changes: 28 additions & 19 deletions variants/esp32-sedisto/sdkconfig.defaults.patch
Original file line number Diff line number Diff line change
@@ -1,38 +1,47 @@
--- toit/toolchains/esp32/sdkconfig.defaults
+++ synthesized/esp32-sedisto/sdkconfig.defaults
@@ -31,12 +31,17 @@
# CONFIG_SPI_SLAVE_ISR_IN_IRAM is not set
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 is not set
+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
@@ -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_INT_WDT=n
CONFIG_ESP_TASK_WDT_INIT=n
@@ -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 @@
@@ -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_POLY1305_C=y
@@ -75,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
39 changes: 24 additions & 15 deletions variants/esp32-spiram/sdkconfig.defaults.patch
Original file line number Diff line number Diff line change
@@ -1,27 +1,36 @@
--- 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 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_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 @@
@@ -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_POLY1305_C=y
@@ -75,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
14 changes: 12 additions & 2 deletions variants/esp32-tls-server/sdkconfig.defaults.patch
Original file line number Diff line number Diff line change
@@ -1,9 +1,19 @@
--- 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
@@ -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_HARDWARE_MPI is not set
-CONFIG_MBEDTLS_ECP_RESTARTABLE=y
CONFIG_MBEDTLS_HARDWARE_MPI=n
-CONFIG_MBEDTLS_TLS_CLIENT_ONLY=y
CONFIG_MBEDTLS_POLY1305_C=y
CONFIG_MBEDTLS_CHACHA20_C=y
Empty file added variants/esp32c6/.keep
Empty file.
28 changes: 14 additions & 14 deletions variants/esp32s3-consibio-spiram-octo/sdkconfig.defaults.patch
Original file line number Diff line number Diff line change
@@ -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_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 is not set
@@ -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_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_TLS_CLIENT_ONLY=y
CONFIG_MBEDTLS_POLY1305_C=y
CONFIG_ESP_INT_WDT=n
@@ -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
22 changes: 11 additions & 11 deletions variants/esp32s3-no-ble/sdkconfig.defaults.patch
Original file line number Diff line number Diff line change
@@ -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_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 is not set
@@ -57,6 +44,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_TLS_CLIENT_ONLY=y
CONFIG_MBEDTLS_POLY1305_C=y
@@ -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
20 changes: 18 additions & 2 deletions variants/esp32s3-spiram-octo/sdkconfig.defaults.patch
Original file line number Diff line number Diff line change
@@ -1,10 +1,26 @@
--- 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
@@ -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
@@ -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_POLY1305_C=y
32 changes: 15 additions & 17 deletions variants/esp32s3-synap/sdkconfig.defaults.patch
Original file line number Diff line number Diff line change
@@ -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,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_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 is not set
@@ -35,6 +22,8 @@
@@ -34,13 +21,14 @@
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 @@
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_TLS_CLIENT_ONLY=y
CONFIG_MBEDTLS_POLY1305_C=y
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