Skip to content

Commit 49e63cd

Browse files
committed
Merge branch 'bugfix/add_allow_stack_external_config_when_use_psram' into 'master'
examples: Add allow stack external memory config when use spiram See merge request adf/esp-adf-internal!1213
2 parents 103cf62 + 5b3546a commit 49e63cd

File tree

48 files changed

+196
-16
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

48 files changed

+196
-16
lines changed

examples/advanced_examples/dlna/sdkconfig.defaults

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@ CONFIG_SPIRAM_USE_MALLOC=y
2626
CONFIG_SPIRAM_SPEED_80M=y
2727
CONFIG_SPIRAM_ALLOW_STACK_EXTERNAL_MEMORY=y
2828
CONFIG_WIFI_LWIP_ALLOCATION_FROM_SPIRAM_FIRST=y
29+
CONFIG_SPIRAM_TRY_ALLOCATE_WIFI_LWIP=y
2930

3031
# Increase default app partition size to accommodate console example
3132
# by providing new partition table in "partitions_dlna_example.csv"

examples/advanced_examples/dlna/sdkconfig.defaults.esp32s2

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,11 @@ CONFIG_SDK_TOOLPREFIX="xtensa-esp32s2-elf-"
1111
# CONFIG_SDK_TOOLCHAIN_SUPPORTS_TIME_WIDE_64_BITS is not set
1212
# end of SDK tool configuration
1313

14+
#
15+
# SPI RAM config
16+
#
17+
CONFIG_ESP32S2_SPIRAM_SUPPORT=y
18+
1419
#
1520
# Audio HAL
1621
#

examples/advanced_examples/dlna/sdkconfig.defaults.esp32s3

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,12 @@ CONFIG_SDK_TOOLPREFIX="xtensa-esp32s3-elf-"
1111
# CONFIG_SDK_TOOLCHAIN_SUPPORTS_TIME_WIDE_64_BITS is not set
1212
# end of SDK tool configuration
1313

14+
#
15+
# SPI RAM config
16+
#
17+
CONFIG_ESP32S3_SPIRAM_SUPPORT=y
18+
CONFIG_SPIRAM_MODE_OCT=y
19+
1420
#
1521
# Audio HAL
1622
#

examples/advanced_examples/downmix_pipeline/sdkconfig.defaults

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,8 @@ CONFIG_SPIRAM_MALLOC_RESERVE_INTERNAL=32768
2020
CONFIG_SPIRAM_ALLOW_BSS_SEG_EXTERNAL_MEMORY=y
2121
CONFIG_FREERTOS_HZ=1000
2222
CONFIG_FREERTOS_ENABLE_BACKWARD_COMPATIBILITY=y
23+
CONFIG_SPIRAM_ALLOW_STACK_EXTERNAL_MEMORY=y
24+
CONFIG_SPIRAM_TRY_ALLOCATE_WIFI_LWIP=y
2325

2426

2527
# Increase default app partition size to accommodate downmix pipeline example

examples/advanced_examples/downmix_pipeline/sdkconfig.defaults.esp32s3

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,12 @@ CONFIG_SDK_TOOLPREFIX="xtensa-esp32s3-elf-"
1111
# CONFIG_SDK_TOOLCHAIN_SUPPORTS_TIME_WIDE_64_BITS is not set
1212
# end of SDK tool configuration
1313

14+
#
15+
# SPI RAM config
16+
#
17+
CONFIG_ESP32S3_SPIRAM_SUPPORT=y
18+
CONFIG_SPIRAM_MODE_OCT=y
19+
1420
#
1521
# Audio HAL
1622
#

examples/advanced_examples/esp_dispatcher_dueros/sdkconfig.defaults.esp32s3

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,12 @@ CONFIG_SDK_TOOLPREFIX="xtensa-esp32s3-elf-"
1111
# CONFIG_SDK_TOOLCHAIN_SUPPORTS_TIME_WIDE_64_BITS is not set
1212
# end of SDK tool configuration
1313

14+
#
15+
# SPI RAM config
16+
#
17+
CONFIG_ESP32S3_SPIRAM_SUPPORT=y
18+
CONFIG_SPIRAM_MODE_OCT=y
19+
1420
#
1521
# Audio HAL
1622
#

examples/advanced_examples/flexible_pipeline/sdkconfig.defaults

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,8 @@ CONFIG_WIFI_LWIP_ALLOCATION_FROM_SPIRAM_FIRST=y
1919
CONFIG_SPIRAM_MALLOC_RESERVE_INTERNAL=32768
2020
CONFIG_FREERTOS_HZ=1000
2121
CONFIG_FREERTOS_ENABLE_BACKWARD_COMPATIBILITY=y
22+
CONFIG_SPIRAM_ALLOW_STACK_EXTERNAL_MEMORY=y
23+
CONFIG_SPIRAM_TRY_ALLOCATE_WIFI_LWIP=y
2224

2325
# Increase default app partition size to accommodate flexible pipeline example
2426
# by providing new partition table in "partitions_flexible_example.csv"

examples/advanced_examples/flexible_pipeline/sdkconfig.defaults.esp32s3

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,12 @@ CONFIG_SDK_TOOLPREFIX="xtensa-esp32s3-elf-"
1111
# CONFIG_SDK_TOOLCHAIN_SUPPORTS_TIME_WIDE_64_BITS is not set
1212
# end of SDK tool configuration
1313

14+
#
15+
# SPI RAM config
16+
#
17+
CONFIG_ESP32S3_SPIRAM_SUPPORT=y
18+
CONFIG_SPIRAM_MODE_OCT=y
19+
1420
#
1521
# Audio HAL
1622
#

examples/advanced_examples/http_play_and_save_to_file/sdkconfig.defaults

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,8 @@ CONFIG_SPIRAM_CACHE_WORKAROUND=y
1818
CONFIG_SPIRAM_MALLOC_ALWAYSINTERNAL=16384
1919
CONFIG_WIFI_LWIP_ALLOCATION_FROM_SPIRAM_FIRST=y
2020
CONFIG_SPIRAM_MALLOC_RESERVE_INTERNAL=32768
21+
CONFIG_SPIRAM_ALLOW_STACK_EXTERNAL_MEMORY=y
22+
CONFIG_SPIRAM_TRY_ALLOCATE_WIFI_LWIP=y
2123
CONFIG_FREERTOS_HZ=1000
2224

2325
CONFIG_FREERTOS_ENABLE_BACKWARD_COMPATIBILITY=y

examples/advanced_examples/http_play_and_save_to_file/sdkconfig.defaults.esp32s3

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,12 @@ CONFIG_SDK_TOOLPREFIX="xtensa-esp32s3-elf-"
1111
# CONFIG_SDK_TOOLCHAIN_SUPPORTS_TIME_WIDE_64_BITS is not set
1212
# end of SDK tool configuration
1313

14+
#
15+
# SPI RAM config
16+
#
17+
CONFIG_ESP32S3_SPIRAM_SUPPORT=y
18+
CONFIG_SPIRAM_MODE_OCT=y
19+
1420
#
1521
# Audio HAL
1622
#

0 commit comments

Comments
 (0)