Skip to content

Increase S3 without PSRAM heap size and fix S2 builds #5884

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Jan 19, 2022
Merged

Increase S3 without PSRAM heap size and fix S2 builds #5884

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
679f4b3
Tweak heap sizes for different targets
tannewt Jan 18, 2022
c839d9b
Fix S2 builds by not turning on USB with wifi
tannewt Jan 18, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 4 additions & 8 deletions ports/espressif/esp-idf-config/sdkconfig-esp32s2.defaults
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,12 +83,12 @@ CONFIG_ESP_SLEEP_POWER_DOWN_FLASH=y
# end of Sleep Config

#
# ESP System Settings
# PHY
#
CONFIG_ESP_SYSTEM_SINGLE_CORE_MODE=y
# end of ESP System Settings
# CONFIG_ESP_PHY_ENABLE_USB is not set
# end of PHY

CONFIG_ESP_SYSTEM_MEMPROT_DEPCHECK=y
CONFIG_ESP_SYSTEM_SINGLE_CORE_MODE=y
#
# Memory protection
#
Expand Down Expand Up @@ -151,10 +151,6 @@ CONFIG_ESP32_PHY_CALIBRATION_AND_DATA_STORAGE=y
# CONFIG_ESP32_PHY_INIT_DATA_IN_PARTITION is not set
CONFIG_ESP32_PHY_MAX_WIFI_TX_POWER=20
CONFIG_ESP32_PHY_MAX_TX_POWER=20
CONFIG_ESP32S2_PANIC_PRINT_HALT=y
# CONFIG_ESP32S2_PANIC_PRINT_REBOOT is not set
# CONFIG_ESP32S2_PANIC_SILENT_REBOOT is not set
# CONFIG_ESP32S2_PANIC_GDBSTUB is not set
CONFIG_ESP32S2_ALLOW_RTC_FAST_MEM_AS_HEAP=y
CONFIG_ESP32H2_MEMPROT_FEATURE=y
CONFIG_ESP32H2_MEMPROT_FEATURE_LOCK=y
Expand Down
6 changes: 2 additions & 4 deletions ports/espressif/esp-idf-config/sdkconfig-esp32s3.defaults
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,6 +86,8 @@ CONFIG_ESP32S3_UNIVERSAL_MAC_ADDRESSES=4
# end of MAC Config

CONFIG_ESP_SLEEP_GPIO_RESET_WORKAROUND=y

CONFIG_ESP_PHY_ENABLE_USB=y
# CONFIG_ESP_MAIN_TASK_AFFINITY_CPU0 is not set
CONFIG_ESP_MAIN_TASK_AFFINITY_CPU1=y
# CONFIG_ESP_MAIN_TASK_AFFINITY_NO_AFFINITY is not set
Expand Down Expand Up @@ -130,10 +132,6 @@ CONFIG_ESP32_PHY_CALIBRATION_AND_DATA_STORAGE=y
# CONFIG_ESP32_PHY_INIT_DATA_IN_PARTITION is not set
CONFIG_ESP32_PHY_MAX_WIFI_TX_POWER=20
CONFIG_ESP32_PHY_MAX_TX_POWER=20
# CONFIG_ESP32S2_PANIC_PRINT_HALT is not set
# CONFIG_ESP32S2_PANIC_PRINT_REBOOT is not set
CONFIG_ESP32S2_PANIC_SILENT_REBOOT=y
# CONFIG_ESP32S2_PANIC_GDBSTUB is not set
CONFIG_ESP32S2_ALLOW_RTC_FAST_MEM_AS_HEAP=y
# CONFIG_ESP32_ENABLE_COREDUMP_TO_FLASH is not set
# CONFIG_ESP32_ENABLE_COREDUMP_TO_UART is not set
Expand Down
4 changes: 4 additions & 0 deletions ports/espressif/esp-idf-config/sdkconfig-opt.defaults
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,6 +75,10 @@ CONFIG_COMPILER_OPTIMIZATION_LEVEL_RELEASE=y
CONFIG_OPTIMIZATION_ASSERTIONS_SILENT=y
# CONFIG_OPTIMIZATION_ASSERTIONS_DISABLED is not set
CONFIG_OPTIMIZATION_ASSERTION_LEVEL=1
# CONFIG_ESP32S2_PANIC_PRINT_HALT is not set
# CONFIG_ESP32S2_PANIC_PRINT_REBOOT is not set
CONFIG_ESP32S2_PANIC_SILENT_REBOOT=y
# CONFIG_ESP32S2_PANIC_GDBSTUB is not set
# CONFIG_CONSOLE_UART_DEFAULT is not set
# CONFIG_CONSOLE_UART_CUSTOM is not set
CONFIG_ESP_CONSOLE_UART_NONE=y
Expand Down
1 change: 0 additions & 1 deletion ports/espressif/esp-idf-config/sdkconfig.defaults
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -246,7 +246,6 @@ CONFIG_ESP_PHY_CALIBRATION_AND_DATA_STORAGE=y
# CONFIG_ESP_PHY_INIT_DATA_IN_PARTITION is not set
CONFIG_ESP_PHY_MAX_WIFI_TX_POWER=20
CONFIG_ESP_PHY_MAX_TX_POWER=20
CONFIG_ESP_PHY_ENABLE_USB=y
# end of PHY

# CONFIG_PM_ENABLE is not set
Expand Down
10 changes: 10 additions & 0 deletions ports/espressif/supervisor/port.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,17 @@
#include "esp32/spiram.h"
#endif

// Heap sizes for when there is no external RAM for CircuitPython to use
// exclusively.
#ifdef CONFIG_IDF_TARGET_ESP32S2
#define HEAP_SIZE (48 * 1024)
#endif
#ifdef CONFIG_IDF_TARGET_ESP32S3
#define HEAP_SIZE (176 * 1024)
#endif
#ifdef CONFIG_IDF_TARGET_ESP32C3
#define HEAP_SIZE (88 * 1024)
#endif

uint32_t *heap;
uint32_t heap_size;
Expand Down
1 change: 1 addition & 0 deletions ports/espressif/tools/update_sdkconfig.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,7 @@
"CONFIG_SDK_TOOLPREFIX",
"CONFIG_TOOLPREFIX",
"ESP_SLEEP_GPIO_RESET_WORKAROUND",
"CONFIG_ESP_PHY_ENABLE_USB",
]

BOARD_SETTINGS = [
Expand Down