Skip to content
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

espressif: Allow one build to work with psram & non-psram versions of a board #5678

Closed
wants to merge 2 commits into from
Closed

espressif: Allow one build to work with psram & non-psram versions of a board #5678

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
1b300de
work on psram / no-psram boards with a single artifact
jepler Dec 7, 2021
4c38a2e
nopsram variant is not useful anymore
jepler Dec 7, 2021
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
13 changes: 2 additions & 11 deletions ports/espressif/boards/espressif_esp32s3_devkitc_1/sdkconfig
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,5 @@
CONFIG_ESP32S3_SPIRAM_SUPPORT=y

#
# SPI RAM config
#
# CONFIG_SPIRAM_TYPE_AUTO is not set
# CONFIG_SPIRAM_TYPE_ESPPSRAM16 is not set
# CONFIG_SPIRAM_TYPE_ESPPSRAM32 is not set
CONFIG_SPIRAM_TYPE_ESPPSRAM16=y
CONFIG_SPIRAM_SIZE=2097152
CONFIG_SPIRAM_TYPE_AUTO=y

#
# PSRAM clock and cs IO for ESP32S3
Expand All @@ -24,11 +16,10 @@ CONFIG_SPIRAM_SPEED_80M=y
# CONFIG_SPIRAM_SPEED_20M is not set
CONFIG_SPIRAM=y
CONFIG_SPIRAM_BOOT_INIT=y
# CONFIG_SPIRAM_IGNORE_NOTFOUND is not set
CONFIG_SPIRAM_IGNORE_NOTFOUND=y
CONFIG_SPIRAM_USE_MEMMAP=y
# CONFIG_SPIRAM_USE_CAPS_ALLOC is not set
# CONFIG_SPIRAM_USE_MALLOC is not set
CONFIG_SPIRAM_MEMTEST=y
# CONFIG_SPIRAM_ALLOW_BSS_SEG_EXTERNAL_MEMORY is not set
# end of SPI RAM config

Expand Down
61 changes: 0 additions & 61 deletions ports/espressif/boards/espressif_esp32s3_devkitc_1_nopsram/board.c
View file
Open in desktop

This file was deleted.

38 changes: 0 additions & 38 deletions ports/espressif/boards/espressif_esp32s3_devkitc_1_nopsram/mpconfigboard.h
View file
Open in desktop

This file was deleted.

17 changes: 0 additions & 17 deletions ports/espressif/boards/espressif_esp32s3_devkitc_1_nopsram/mpconfigboard.mk
View file
Open in desktop

This file was deleted.

45 changes: 0 additions & 45 deletions ports/espressif/boards/espressif_esp32s3_devkitc_1_nopsram/pins.c
View file
Open in desktop

This file was deleted.

8 changes: 0 additions & 8 deletions ports/espressif/boards/espressif_esp32s3_devkitc_1_nopsram/sdkconfig
View file
Open in desktop

This file was deleted.