Skip to content

Commit 931ed7c

Browse files
microdev1tannewt
microdev1
authored and
tannewt
committed
conditionally include esp_psram and fix sdkconfig
1 parent a18e015 commit 931ed7c

144 files changed

Lines changed: 171 additions & 99 deletions

File tree

Some content is hidden

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

‎ports/espressif/Makefile‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -395,7 +395,7 @@ ifeq ($(IDF_TARGET),esp32)
395395
BINARY_BLOBS += esp-idf/components/esp_phy/lib/$(IDF_TARGET)/librtc.a
396396
endif
397397

398-
ESP_IDF_COMPONENTS_LINK = $(IDF_TARGET_ARCH) app_update bootloader_support driver efuse esp_adc esp_app_format esp_common esp_event esp_hw_support esp_netif esp_partition esp_phy esp_pm esp_psram esp_ringbuf esp_rom esp_system esp_timer esp-tls esp_wifi freertos hal heap log lwip mbedtls mdns newlib nvs_flash pthread soc spi_flash vfs wpa_supplicant
398+
ESP_IDF_COMPONENTS_LINK = $(IDF_TARGET_ARCH) app_update bootloader_support driver efuse esp_adc esp_app_format esp_common esp_event esp_hw_support esp_netif esp_partition esp_phy esp_pm esp_ringbuf esp_rom esp_system esp_timer esp-tls esp_wifi freertos hal heap log lwip mbedtls mdns newlib nvs_flash pthread soc spi_flash vfs wpa_supplicant
399399
ifneq ($(CIRCUITPY_BLEIO),0)
400400
ESP_IDF_COMPONENTS_LINK += bt
401401
BINARY_BLOBS += esp-idf/components/esp_phy/lib/$(IDF_TARGET)/libbtbb.a \
@@ -404,6 +404,9 @@ endif
404404
ifneq ($(CIRCUITPY_ESPULP),0)
405405
ESP_IDF_COMPONENTS_LINK += ulp
406406
endif
407+
ifneq ($(CIRCUITPY_ESP_PSRAM_SIZE),0)
408+
ESP_IDF_COMPONENTS_LINK += esp_psram
409+
endif
407410
ifneq ($(CIRCUITPY_DOTCLOCKFRAMEBUFFER),0)
408411
ESP_IDF_COMPONENTS_LINK += esp_lcd
409412
endif

‎ports/espressif/boards/adafruit_feather_esp32_v2/mpconfigboard.mk‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,3 +6,5 @@ IDF_TARGET = esp32
66
CIRCUITPY_ESP_FLASH_MODE = dio
77
CIRCUITPY_ESP_FLASH_FREQ = 40m
88
CIRCUITPY_ESP_FLASH_SIZE = 8MB
9+
10+
CIRCUITPY_ESP_PSRAM_SIZE = 2MB

‎ports/espressif/boards/adafruit_feather_esp32_v2/sdkconfig‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
CONFIG_ESP32_SPIRAM_SUPPORT=y
21
# SPI RAM config
32
#
43
# CONFIG_SPIRAM_TYPE_AUTO is not set

‎ports/espressif/boards/adafruit_feather_esp32s2/mpconfigboard.mk‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,3 +8,5 @@ IDF_TARGET = esp32s2
88
CIRCUITPY_ESP_FLASH_MODE = dio
99
CIRCUITPY_ESP_FLASH_FREQ = 40m
1010
CIRCUITPY_ESP_FLASH_SIZE = 4MB
11+
12+
CIRCUITPY_ESP_PSRAM_SIZE = 2MB

‎ports/espressif/boards/adafruit_feather_esp32s2/sdkconfig‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,6 @@
44
#
55
# ESP32S2-specific
66
#
7-
CONFIG_ESP32S2_SPIRAM_SUPPORT=y
8-
#
97
# SPI RAM config
108
#
119
# CONFIG_SPIRAM_TYPE_AUTO is not set

‎ports/espressif/boards/adafruit_feather_esp32s2_reverse_tft/mpconfigboard.mk‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,3 +9,5 @@ IDF_TARGET = esp32s2
99
CIRCUITPY_ESP_FLASH_MODE = dio
1010
CIRCUITPY_ESP_FLASH_FREQ = 40m
1111
CIRCUITPY_ESP_FLASH_SIZE = 4MB
12+
13+
CIRCUITPY_ESP_PSRAM_SIZE = 2MB

‎ports/espressif/boards/adafruit_feather_esp32s2_tft/mpconfigboard.mk‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,3 +9,5 @@ IDF_TARGET = esp32s2
99
CIRCUITPY_ESP_FLASH_MODE = dio
1010
CIRCUITPY_ESP_FLASH_FREQ = 40m
1111
CIRCUITPY_ESP_FLASH_SIZE = 4MB
12+
13+
CIRCUITPY_ESP_PSRAM_SIZE = 2MB

‎ports/espressif/boards/adafruit_feather_esp32s2_tft/sdkconfig‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
CONFIG_ESP32S2_SPIRAM_SUPPORT=y
21
#
32
# SPI RAM config
43
#

‎ports/espressif/boards/adafruit_feather_esp32s2_tftback_nopsram/sdkconfig‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
#
2+
# LWIP
3+
#
4+
CONFIG_LWIP_LOCAL_HOSTNAME="espressif"
5+
# end of LWIP

‎ports/espressif/boards/adafruit_feather_esp32s3_4mbflash_2mbpsram/mpconfigboard.mk‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,4 +9,7 @@ CIRCUITPY_ESP_FLASH_MODE = qio
99
CIRCUITPY_ESP_FLASH_FREQ = 40m
1010
CIRCUITPY_ESP_FLASH_SIZE = 4MB
1111

12+
OPTIMIZATION_FLAGS = -Os
1213
CIRCUITPY_ESPCAMERA = 0
14+
15+
CIRCUITPY_ESP_PSRAM_SIZE = 2MB

0 commit comments

Comments
 (0)