Skip to content

Commit

Permalink
Merge branch 'bugfix/add_allow_stack_external_config_when_use_psram' …
Browse files Browse the repository at this point in the history
…into 'master'

examples: Add allow stack external memory config when use spiram

See merge request adf/esp-adf-internal!1213
  • Loading branch information
jason-mao committed Jul 19, 2023
2 parents 103cf62 + 5b3546a commit 49e63cd
Show file tree
Hide file tree
Showing 48 changed files with 196 additions and 16 deletions.
1 change: 1 addition & 0 deletions examples/advanced_examples/dlna/sdkconfig.defaults
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ CONFIG_SPIRAM_USE_MALLOC=y
CONFIG_SPIRAM_SPEED_80M=y
CONFIG_SPIRAM_ALLOW_STACK_EXTERNAL_MEMORY=y
CONFIG_WIFI_LWIP_ALLOCATION_FROM_SPIRAM_FIRST=y
CONFIG_SPIRAM_TRY_ALLOCATE_WIFI_LWIP=y

# Increase default app partition size to accommodate console example
# by providing new partition table in "partitions_dlna_example.csv"
Expand Down
5 changes: 5 additions & 0 deletions examples/advanced_examples/dlna/sdkconfig.defaults.esp32s2
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,11 @@ CONFIG_SDK_TOOLPREFIX="xtensa-esp32s2-elf-"
# CONFIG_SDK_TOOLCHAIN_SUPPORTS_TIME_WIDE_64_BITS is not set
# end of SDK tool configuration

#
# SPI RAM config
#
CONFIG_ESP32S2_SPIRAM_SUPPORT=y

#
# Audio HAL
#
Expand Down
6 changes: 6 additions & 0 deletions examples/advanced_examples/dlna/sdkconfig.defaults.esp32s3
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,12 @@ CONFIG_SDK_TOOLPREFIX="xtensa-esp32s3-elf-"
# CONFIG_SDK_TOOLCHAIN_SUPPORTS_TIME_WIDE_64_BITS is not set
# end of SDK tool configuration

#
# SPI RAM config
#
CONFIG_ESP32S3_SPIRAM_SUPPORT=y
CONFIG_SPIRAM_MODE_OCT=y

#
# Audio HAL
#
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,8 @@ CONFIG_SPIRAM_MALLOC_RESERVE_INTERNAL=32768
CONFIG_SPIRAM_ALLOW_BSS_SEG_EXTERNAL_MEMORY=y
CONFIG_FREERTOS_HZ=1000
CONFIG_FREERTOS_ENABLE_BACKWARD_COMPATIBILITY=y
CONFIG_SPIRAM_ALLOW_STACK_EXTERNAL_MEMORY=y
CONFIG_SPIRAM_TRY_ALLOCATE_WIFI_LWIP=y


# Increase default app partition size to accommodate downmix pipeline example
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,12 @@ CONFIG_SDK_TOOLPREFIX="xtensa-esp32s3-elf-"
# CONFIG_SDK_TOOLCHAIN_SUPPORTS_TIME_WIDE_64_BITS is not set
# end of SDK tool configuration

#
# SPI RAM config
#
CONFIG_ESP32S3_SPIRAM_SUPPORT=y
CONFIG_SPIRAM_MODE_OCT=y

#
# Audio HAL
#
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,12 @@ CONFIG_SDK_TOOLPREFIX="xtensa-esp32s3-elf-"
# CONFIG_SDK_TOOLCHAIN_SUPPORTS_TIME_WIDE_64_BITS is not set
# end of SDK tool configuration

#
# SPI RAM config
#
CONFIG_ESP32S3_SPIRAM_SUPPORT=y
CONFIG_SPIRAM_MODE_OCT=y

#
# Audio HAL
#
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,8 @@ CONFIG_WIFI_LWIP_ALLOCATION_FROM_SPIRAM_FIRST=y
CONFIG_SPIRAM_MALLOC_RESERVE_INTERNAL=32768
CONFIG_FREERTOS_HZ=1000
CONFIG_FREERTOS_ENABLE_BACKWARD_COMPATIBILITY=y
CONFIG_SPIRAM_ALLOW_STACK_EXTERNAL_MEMORY=y
CONFIG_SPIRAM_TRY_ALLOCATE_WIFI_LWIP=y

# Increase default app partition size to accommodate flexible pipeline example
# by providing new partition table in "partitions_flexible_example.csv"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,12 @@ CONFIG_SDK_TOOLPREFIX="xtensa-esp32s3-elf-"
# CONFIG_SDK_TOOLCHAIN_SUPPORTS_TIME_WIDE_64_BITS is not set
# end of SDK tool configuration

#
# SPI RAM config
#
CONFIG_ESP32S3_SPIRAM_SUPPORT=y
CONFIG_SPIRAM_MODE_OCT=y

#
# Audio HAL
#
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,8 @@ CONFIG_SPIRAM_CACHE_WORKAROUND=y
CONFIG_SPIRAM_MALLOC_ALWAYSINTERNAL=16384
CONFIG_WIFI_LWIP_ALLOCATION_FROM_SPIRAM_FIRST=y
CONFIG_SPIRAM_MALLOC_RESERVE_INTERNAL=32768
CONFIG_SPIRAM_ALLOW_STACK_EXTERNAL_MEMORY=y
CONFIG_SPIRAM_TRY_ALLOCATE_WIFI_LWIP=y
CONFIG_FREERTOS_HZ=1000

CONFIG_FREERTOS_ENABLE_BACKWARD_COMPATIBILITY=y
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,12 @@ CONFIG_SDK_TOOLPREFIX="xtensa-esp32s3-elf-"
# CONFIG_SDK_TOOLCHAIN_SUPPORTS_TIME_WIDE_64_BITS is not set
# end of SDK tool configuration

#
# SPI RAM config
#
CONFIG_ESP32S3_SPIRAM_SUPPORT=y
CONFIG_SPIRAM_MODE_OCT=y

#
# Audio HAL
#
Expand Down
1 change: 1 addition & 0 deletions examples/advanced_examples/multi-room/sdkconfig.defaults
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ CONFIG_SPIRAM_USE_MALLOC=y
CONFIG_SPIRAM_SPEED_80M=y
CONFIG_SPIRAM_ALLOW_BSS_SEG_EXTERNAL_MEMORY=y
CONFIG_SPIRAM_ALLOW_STACK_EXTERNAL_MEMORY=y
CONFIG_SPIRAM_TRY_ALLOCATE_WIFI_LWIP=y
CONFIG_WIFI_LWIP_ALLOCATION_FROM_SPIRAM_FIRST=y

#
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,11 @@ CONFIG_SDK_TOOLPREFIX="xtensa-esp32s2-elf-"
# CONFIG_SDK_TOOLCHAIN_SUPPORTS_TIME_WIDE_64_BITS is not set
# end of SDK tool configuration

#
# SPI RAM config
#
CONFIG_ESP32S2_SPIRAM_SUPPORT=y

#
# Audio HAL
#
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,12 @@ CONFIG_SDK_TOOLPREFIX="xtensa-esp32s3-elf-"
# CONFIG_SDK_TOOLCHAIN_SUPPORTS_TIME_WIDE_64_BITS is not set
# end of SDK tool configuration

#
# SPI RAM config
#
CONFIG_ESP32S3_SPIRAM_SUPPORT=y
CONFIG_SPIRAM_MODE_OCT=y

#
# Audio HAL
#
Expand Down
3 changes: 2 additions & 1 deletion examples/advanced_examples/nvs_dispatcher/sdkconfig.defaults
Original file line number Diff line number Diff line change
Expand Up @@ -8,5 +8,6 @@ CONFIG_SPIRAM_SUPPORT=y
# SPI RAM config
#
CONFIG_SPIRAM_ALLOW_STACK_EXTERNAL_MEMORY=y

CONFIG_SPIRAM_TRY_ALLOCATE_WIFI_LWIP=y
CONFIG_FREERTOS_ENABLE_BACKWARD_COMPATIBILITY=y
CONFIG_SPIRAM_SPEED_80M=y
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,11 @@ CONFIG_SDK_TOOLPREFIX="xtensa-esp32s2-elf-"
# CONFIG_SDK_TOOLCHAIN_SUPPORTS_TIME_WIDE_64_BITS is not set
# end of SDK tool configuration

#
# SPI RAM config
#
CONFIG_ESP32S2_SPIRAM_SUPPORT=y

#
# Audio HAL
#
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,12 @@ CONFIG_SDK_TOOLPREFIX="xtensa-esp32s3-elf-"
# CONFIG_SDK_TOOLCHAIN_SUPPORTS_TIME_WIDE_64_BITS is not set
# end of SDK tool configuration

#
# SPI RAM config
#
CONFIG_ESP32S3_SPIRAM_SUPPORT=y
CONFIG_SPIRAM_MODE_OCT=y

#
# Audio HAL
#
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -71,6 +71,7 @@ CONFIG_SPIRAM_ALLOW_BSS_SEG_EXTERNAL_MEMORY=y
CONFIG_SPIRAM_ALLOW_NOINIT_SEG_EXTERNAL_MEMORY=y
CONFIG_SPIRAM_CACHE_WORKAROUND=y
CONFIG_SPIRAM_CACHE_WORKAROUND_STRATEGY_MEMW=y
CONFIG_SPIRAM_ALLOW_STACK_EXTERNAL_MEMORY=y

CONFIG_FREERTOS_ENABLE_BACKWARD_COMPATIBILITY=y
CONFIG_MBEDTLS_DHM_C=y
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,8 @@ CONFIG_FATFS_CODEPAGE_936=y
CONFIG_FATFS_LFN_HEAP=y
CONFIG_FATFS_MAX_LFN=255
CONFIG_FATFS_FS_LOCK=5

CONFIG_SPIRAM_ALLOW_STACK_EXTERNAL_MEMORY=y
CONFIG_SPIRAM_TRY_ALLOCATE_WIFI_LWIP=y
CONFIG_FREERTOS_ENABLE_BACKWARD_COMPATIBILITY=y


Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,12 @@ CONFIG_SDK_TOOLPREFIX="xtensa-esp32s3-elf-"
# CONFIG_SDK_TOOLCHAIN_SUPPORTS_TIME_WIDE_64_BITS is not set
# end of SDK tool configuration

#
# SPI RAM config
#
CONFIG_ESP32S3_SPIRAM_SUPPORT=y
CONFIG_SPIRAM_MODE_OCT=y

#
# Audio HAL
#
Expand Down
2 changes: 2 additions & 0 deletions examples/cli/sdkconfig.defaults
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,8 @@ CONFIG_FATFS_FS_LOCK=20
CONFIG_MAIN_TASK_STACK_SIZE=3072
CONFIG_SPIRAM_SUPPORT=y
CONFIG_SPIRAM_IGNORE_NOTFOUND=y
CONFIG_SPIRAM_ALLOW_STACK_EXTERNAL_MEMORY=y
CONFIG_SPIRAM_TRY_ALLOCATE_WIFI_LWIP=y

# Increase default app partition size to accommodate console example
# by providing new partition table in "partitions_console_example.csv"
Expand Down
5 changes: 5 additions & 0 deletions examples/cli/sdkconfig.defaults.esp32s2
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,11 @@ CONFIG_SDK_TOOLPREFIX="xtensa-esp32s2-elf-"
# CONFIG_SDK_TOOLCHAIN_SUPPORTS_TIME_WIDE_64_BITS is not set
# end of SDK tool configuration

#
# SPI RAM config
#
CONFIG_ESP32S2_SPIRAM_SUPPORT=y

#
# Audio HAL
#
Expand Down
6 changes: 6 additions & 0 deletions examples/cli/sdkconfig.defaults.esp32s3
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,12 @@ CONFIG_SDK_TOOLPREFIX="xtensa-esp32s3-elf-"
# CONFIG_SDK_TOOLCHAIN_SUPPORTS_TIME_WIDE_64_BITS is not set
# end of SDK tool configuration

#
# SPI RAM config
#
CONFIG_ESP32S3_SPIRAM_SUPPORT=y
CONFIG_SPIRAM_MODE_OCT=y

#
# Audio HAL
#
Expand Down
2 changes: 2 additions & 0 deletions examples/display/lcd_camera/sdkconfig.defaults
Original file line number Diff line number Diff line change
Expand Up @@ -20,3 +20,5 @@ CONFIG_SPIRAM_SPEED_80M=y
CONFIG_SPIRAM=y
CONFIG_SPIRAM_BOOT_INIT=y
CONFIG_SPIRAM_IGNORE_NOTFOUND=y
CONFIG_SPIRAM_ALLOW_STACK_EXTERNAL_MEMORY=y
CONFIG_SPIRAM_TRY_ALLOCATE_WIFI_LWIP=y
1 change: 1 addition & 0 deletions examples/dueros/sdkconfig.defaults.esp32s3
Original file line number Diff line number Diff line change
Expand Up @@ -111,5 +111,6 @@ CONFIG_SPIRAM_MEMTEST=y
CONFIG_SPIRAM_MALLOC_ALWAYSINTERNAL=4096
CONFIG_SPIRAM_TRY_ALLOCATE_WIFI_LWIP=y
CONFIG_SPIRAM_MALLOC_RESERVE_INTERNAL=32768
CONFIG_SPIRAM_ALLOW_STACK_EXTERNAL_MEMORY=y
# end of SPI RAM config
# end of ESP32S3-Specific
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ CONFIG_BT_BLE_DYNAMIC_ENV_MEMORY=y
CONFIG_ESP32_DEFAULT_CPU_FREQ_240=y
CONFIG_ESP32_DEFAULT_CPU_FREQ_MHZ=240
CONFIG_SPIRAM_SUPPORT=y
CONFIG_SPIRAM_ALLOW_STACK_EXTERNAL_MEMORY=y

CONFIG_FREERTOS_ENABLE_BACKWARD_COMPATIBILITY=y

Expand Down
2 changes: 1 addition & 1 deletion examples/player/pipeline_bt_source/sdkconfig.defaults
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ CONFIG_ESP32_DEFAULT_CPU_FREQ_240=y
CONFIG_ESP32_DEFAULT_CPU_FREQ_MHZ=240
CONFIG_SPIRAM_SUPPORT=y
CONFIG_BT_BLE_BLUFI_ENABLE=y

CONFIG_SPIRAM_ALLOW_STACK_EXTERNAL_MEMORY=y
CONFIG_FREERTOS_ENABLE_BACKWARD_COMPATIBILITY=y
CONFIG_MBEDTLS_DHM_C=y

Expand Down
3 changes: 3 additions & 0 deletions examples/player/pipeline_flash_tone/sdkconfig.defaults
Original file line number Diff line number Diff line change
Expand Up @@ -18,3 +18,6 @@ CONFIG_FREERTOS_ENABLE_BACKWARD_COMPATIBILITY=y
#
CONFIG_SPIRAM_BOOT_INIT=y
CONFIG_SPIRAM_ALLOW_STACK_EXTERNAL_MEMORY=y
CONFIG_SPIRAM_USE_MALLOC=y
CONFIG_SPIRAM_TRY_ALLOCATE_WIFI_LWIP=y
CONFIG_SPIRAM_TYPE_AUTO=y
5 changes: 5 additions & 0 deletions examples/player/pipeline_flash_tone/sdkconfig.defaults.esp32
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,11 @@ CONFIG_SDK_TOOLPREFIX="xtensa-esp32-elf-"
# CONFIG_SDK_TOOLCHAIN_SUPPORTS_TIME_WIDE_64_BITS is not set
# end of SDK tool configuration

#
# SPI RAM config
#
CONFIG_ESP32_SPIRAM_SUPPORT=y

#
# Audio HAL
#
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,11 @@ CONFIG_SDK_TOOLPREFIX="xtensa-esp32s2-elf-"
# CONFIG_SDK_TOOLCHAIN_SUPPORTS_TIME_WIDE_64_BITS is not set
# end of SDK tool configuration

#
# SPI RAM config
#
CONFIG_ESP32S2_SPIRAM_SUPPORT=y

#
# Audio HAL
#
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,12 @@ CONFIG_SDK_TOOLPREFIX="xtensa-esp32s3-elf-"
# CONFIG_SDK_TOOLCHAIN_SUPPORTS_TIME_WIDE_64_BITS is not set
# end of SDK tool configuration

#
# SPI RAM config
#
CONFIG_ESP32S3_SPIRAM_SUPPORT=y
CONFIG_SPIRAM_MODE_OCT=y

#
# Audio HAL
#
Expand Down
9 changes: 9 additions & 0 deletions examples/player/pipeline_http_mp3/sdkconfig.defaults
Original file line number Diff line number Diff line change
Expand Up @@ -7,3 +7,12 @@ CONFIG_ESP_TLS_SKIP_SERVER_CERT_VERIFY=y

CONFIG_ESP_SYSTEM_EVENT_TASK_STACK_SIZE=3072
CONFIG_FREERTOS_ENABLE_BACKWARD_COMPATIBILITY=y

#
# SPI RAM config
#
CONFIG_SPIRAM_BOOT_INIT=y
CONFIG_SPIRAM_ALLOW_STACK_EXTERNAL_MEMORY=y
CONFIG_SPIRAM_USE_MALLOC=y
CONFIG_SPIRAM_TRY_ALLOCATE_WIFI_LWIP=y
CONFIG_SPIRAM_TYPE_AUTO=y
5 changes: 5 additions & 0 deletions examples/player/pipeline_http_mp3/sdkconfig.defaults.esp32
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,11 @@ CONFIG_SDK_TOOLPREFIX="xtensa-esp32-elf-"
# CONFIG_SDK_TOOLCHAIN_SUPPORTS_TIME_WIDE_64_BITS is not set
# end of SDK tool configuration

#
# SPI RAM config
#
CONFIG_ESP32_SPIRAM_SUPPORT=y

#
# Audio HAL
#
Expand Down
11 changes: 6 additions & 5 deletions examples/player/pipeline_http_mp3/sdkconfig.defaults.esp32s2
Original file line number Diff line number Diff line change
Expand Up @@ -11,13 +11,14 @@ CONFIG_SDK_TOOLPREFIX="xtensa-esp32s2-elf-"
# CONFIG_SDK_TOOLCHAIN_SUPPORTS_TIME_WIDE_64_BITS is not set
# end of SDK tool configuration

#
# Audio HAL
#
CONFIG_ESP32_S2_KALUGA_1_V1_2_BOARD=y

#
# SPI RAM config
#
CONFIG_ESP32S2_SPIRAM_SUPPORT=y
CONFIG_SPIRAM_MALLOC_ALWAYSINTERNAL=1024

#
# Audio HAL
#
CONFIG_ESP32_S2_KALUGA_1_V1_2_BOARD=y

6 changes: 6 additions & 0 deletions examples/player/pipeline_http_mp3/sdkconfig.defaults.esp32s3
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,12 @@ CONFIG_SDK_TOOLPREFIX="xtensa-esp32s3-elf-"
# CONFIG_SDK_TOOLCHAIN_SUPPORTS_TIME_WIDE_64_BITS is not set
# end of SDK tool configuration

#
# SPI RAM config
#
CONFIG_ESP32S3_SPIRAM_SUPPORT=y
CONFIG_SPIRAM_MODE_OCT=y

#
# Audio HAL
#
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ CONFIG_SPIRAM_IGNORE_NOTFOUND=y
CONFIG_SPIRAM_SPEED_80M=y
CONFIG_SPIRAM_ALLOW_STACK_EXTERNAL_MEMORY=y
CONFIG_SPIRAM_ALLOW_BSS_SEG_EXTERNAL_MEMORY=y
CONFIG_SPIRAM_TRY_ALLOCATE_WIFI_LWIP=y

# Increase default app partition size to accommodate SPIRAM
# by providing new partition table in "partitions_http_select_decoder_example.csv"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,11 @@ CONFIG_SDK_TOOLPREFIX="xtensa-esp32s2-elf-"
# CONFIG_SDK_TOOLCHAIN_SUPPORTS_TIME_WIDE_64_BITS is not set
# end of SDK tool configuration

#
# SPI RAM config
#
CONFIG_ESP32S2_SPIRAM_SUPPORT=y

#
# Audio HAL
#
Expand Down
Loading

0 comments on commit 49e63cd

Please sign in to comment.