Skip to content

Commit 7af7cd4

Browse files
tannewttannewt
authored
Merge pull request #5853 from tannewt/s3_config_rework
Split out target specific configs.
2 parents 86e7247 + 869cf5e commit 7af7cd4

File tree

54 files changed

+1769
-215
lines changed

Some content is hidden

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

54 files changed

+1769
-215
lines changed

‎ports/espressif/Makefile

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -289,13 +289,15 @@ IDF_PATH = $(realpath ./esp-idf)
289289
$(BUILD)/esp-idf:
290290
$(Q)$(MKDIR) -p $@
291291

292+
TARGET_SDKCONFIG = esp-idf-config/sdkconfig-$(IDF_TARGET).defaults
292293
FLASH_SDKCONFIG = esp-idf-config/sdkconfig-$(CIRCUITPY_ESP_FLASH_SIZE).defaults
293294
ifeq ($(DEBUG), 1)
294295
DEBUG_SDKCONFIG = esp-idf-config/sdkconfig-debug.defaults
295296
else
296297
DEBUG_SDKCONFIG = esp-idf-config/sdkconfig-opt.defaults
297298
endif
298-
SDKCONFIGS = esp-idf-config/sdkconfig.defaults;$(DEBUG_SDKCONFIG);$(FLASH_SDKCONFIG);boards/$(BOARD)/sdkconfig
299+
300+
SDKCONFIGS = esp-idf-config/sdkconfig.defaults;$(DEBUG_SDKCONFIG);$(FLASH_SDKCONFIG);$(TARGET_SDKCONFIG);boards/$(BOARD)/sdkconfig
299301

300302
# create the config headers
301303
$(BUILD)/esp-idf/config/sdkconfig.h: boards/$(BOARD)/sdkconfig | $(BUILD)/esp-idf
@@ -316,10 +318,11 @@ $(BUILD)/esp-idf/partition_table/partition-table.bin: $(BUILD)/esp-idf/config/sd
316318
IDF_PATH=$(IDF_PATH) ninja -C $(BUILD)/esp-idf partition_table/partition-table.bin
317319

318320
# run menuconfig and then remove standard settings
319-
menuconfig: $(BUILD)/esp-idf/config
321+
menuconfig: $(BUILD)/esp-idf/config $(BUILD)/esp-idf/config/sdkconfig.h
320322
$(Q)ninja -C $(BUILD)/esp-idf menuconfig
321-
$(Q)diff --old-line-format= --unchanged-line-format= esp-idf-config/sdkconfig.defaults $(BUILD)/esp-idf/sdkconfig > $(BUILD)/sdkconfig.diff || true
322-
$(Q)grep -Fvxf $(DEBUG_SDKCONFIG) -f $(FLASH_SDKCONFIG) $(BUILD)/sdkconfig.diff > boards/$(BOARD)/sdkconfig
323+
# Newer versions of the idf will have save-defconfig that will only include non-default values.
324+
# We should use that when available. For now, we sort out everything.
325+
python tools/update_sdkconfig.py --board=$(BOARD) --debug=$(DEBUG)
323326

324327
# qstr builds include headers so we need to make sure they are up to date
325328
$(HEADER_BUILD)/qstr.split: | $(BUILD)/esp-idf/config/sdkconfig.h

‎ports/espressif/boards/adafruit_feather_esp32s2/sdkconfig

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
CONFIG_ESP32S2_SPIRAM_SUPPORT=y
2-
32
#
43
# SPI RAM config
54
#
@@ -8,11 +7,12 @@ CONFIG_SPIRAM_TYPE_ESPPSRAM16=y
87
# CONFIG_SPIRAM_TYPE_ESPPSRAM32 is not set
98
# CONFIG_SPIRAM_TYPE_ESPPSRAM64 is not set
109
CONFIG_SPIRAM_SIZE=2097152
10+
# end of SPI RAM config
1111

12+
CONFIG_DEFAULT_PSRAM_CLK_IO=30
1213
#
1314
# PSRAM clock and cs IO for ESP32S2
1415
#
15-
CONFIG_DEFAULT_PSRAM_CLK_IO=30
1616
CONFIG_DEFAULT_PSRAM_CS_IO=26
1717
# end of PSRAM clock and cs IO for ESP32S2
1818

@@ -30,4 +30,8 @@ CONFIG_SPIRAM_USE_MEMMAP=y
3030
# CONFIG_SPIRAM_USE_MALLOC is not set
3131
CONFIG_SPIRAM_MEMTEST=y
3232
# CONFIG_SPIRAM_ALLOW_BSS_SEG_EXTERNAL_MEMORY is not set
33-
# end of SPI RAM config
33+
#
34+
# LWIP
35+
#
36+
CONFIG_LWIP_LOCAL_HOSTNAME="espressif"
37+
# end of LWIP

‎ports/espressif/boards/adafruit_feather_esp32s2_tft/sdkconfig

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
CONFIG_ESP32S2_SPIRAM_SUPPORT=y
2-
32
#
43
# SPI RAM config
54
#
@@ -8,11 +7,12 @@ CONFIG_SPIRAM_TYPE_ESPPSRAM16=y
87
# CONFIG_SPIRAM_TYPE_ESPPSRAM32 is not set
98
# CONFIG_SPIRAM_TYPE_ESPPSRAM64 is not set
109
CONFIG_SPIRAM_SIZE=2097152
10+
# end of SPI RAM config
1111

12+
CONFIG_DEFAULT_PSRAM_CLK_IO=30
1213
#
1314
# PSRAM clock and cs IO for ESP32S2
1415
#
15-
CONFIG_DEFAULT_PSRAM_CLK_IO=30
1616
CONFIG_DEFAULT_PSRAM_CS_IO=26
1717
# end of PSRAM clock and cs IO for ESP32S2
1818

@@ -30,4 +30,8 @@ CONFIG_SPIRAM_USE_MEMMAP=y
3030
# CONFIG_SPIRAM_USE_MALLOC is not set
3131
CONFIG_SPIRAM_MEMTEST=y
3232
# CONFIG_SPIRAM_ALLOW_BSS_SEG_EXTERNAL_MEMORY is not set
33-
# end of SPI RAM config
33+
#
34+
# LWIP
35+
#
36+
CONFIG_LWIP_LOCAL_HOSTNAME="espressif"
37+
# end of LWIP

‎ports/espressif/boards/adafruit_feather_esp32s2_tftback_nopsram/sdkconfig

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

‎ports/espressif/boards/adafruit_funhouse/sdkconfig

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
CONFIG_ESP32S2_SPIRAM_SUPPORT=y
2-
32
#
43
# SPI RAM config
54
#
@@ -8,11 +7,12 @@ CONFIG_SPIRAM_TYPE_ESPPSRAM16=y
87
# CONFIG_SPIRAM_TYPE_ESPPSRAM32 is not set
98
# CONFIG_SPIRAM_TYPE_ESPPSRAM64 is not set
109
CONFIG_SPIRAM_SIZE=2097152
10+
# end of SPI RAM config
1111

12+
CONFIG_DEFAULT_PSRAM_CLK_IO=30
1213
#
1314
# PSRAM clock and cs IO for ESP32S2
1415
#
15-
CONFIG_DEFAULT_PSRAM_CLK_IO=30
1616
CONFIG_DEFAULT_PSRAM_CS_IO=26
1717
# end of PSRAM clock and cs IO for ESP32S2
1818

@@ -30,4 +30,8 @@ CONFIG_SPIRAM_USE_MEMMAP=y
3030
# CONFIG_SPIRAM_USE_MALLOC is not set
3131
CONFIG_SPIRAM_MEMTEST=y
3232
# CONFIG_SPIRAM_ALLOW_BSS_SEG_EXTERNAL_MEMORY is not set
33-
# end of SPI RAM config
33+
#
34+
# LWIP
35+
#
36+
CONFIG_LWIP_LOCAL_HOSTNAME="espressif"
37+
# end of LWIP

‎ports/espressif/boards/adafruit_magtag_2.9_grayscale/sdkconfig

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
CONFIG_ESP32S2_SPIRAM_SUPPORT=y
2-
32
#
43
# SPI RAM config
54
#
@@ -8,11 +7,12 @@ CONFIG_SPIRAM_TYPE_ESPPSRAM16=y
87
# CONFIG_SPIRAM_TYPE_ESPPSRAM32 is not set
98
# CONFIG_SPIRAM_TYPE_ESPPSRAM64 is not set
109
CONFIG_SPIRAM_SIZE=2097152
10+
# end of SPI RAM config
1111

12+
CONFIG_DEFAULT_PSRAM_CLK_IO=30
1213
#
1314
# PSRAM clock and cs IO for ESP32S2
1415
#
15-
CONFIG_DEFAULT_PSRAM_CLK_IO=30
1616
CONFIG_DEFAULT_PSRAM_CS_IO=26
1717
# end of PSRAM clock and cs IO for ESP32S2
1818

@@ -30,4 +30,8 @@ CONFIG_SPIRAM_USE_MEMMAP=y
3030
# CONFIG_SPIRAM_USE_MALLOC is not set
3131
CONFIG_SPIRAM_MEMTEST=y
3232
# CONFIG_SPIRAM_ALLOW_BSS_SEG_EXTERNAL_MEMORY is not set
33-
# end of SPI RAM config
33+
#
34+
# LWIP
35+
#
36+
CONFIG_LWIP_LOCAL_HOSTNAME="espressif"
37+
# end of LWIP

‎ports/espressif/boards/adafruit_metro_esp32s2/sdkconfig

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
CONFIG_ESP32S2_SPIRAM_SUPPORT=y
2-
32
#
43
# SPI RAM config
54
#
@@ -8,11 +7,12 @@ CONFIG_SPIRAM_TYPE_ESPPSRAM16=y
87
# CONFIG_SPIRAM_TYPE_ESPPSRAM32 is not set
98
# CONFIG_SPIRAM_TYPE_ESPPSRAM64 is not set
109
CONFIG_SPIRAM_SIZE=2097152
10+
# end of SPI RAM config
1111

12+
CONFIG_DEFAULT_PSRAM_CLK_IO=30
1213
#
1314
# PSRAM clock and cs IO for ESP32S2
1415
#
15-
CONFIG_DEFAULT_PSRAM_CLK_IO=30
1616
CONFIG_DEFAULT_PSRAM_CS_IO=26
1717
# end of PSRAM clock and cs IO for ESP32S2
1818

@@ -30,8 +30,6 @@ CONFIG_SPIRAM_USE_MEMMAP=y
3030
# CONFIG_SPIRAM_USE_MALLOC is not set
3131
CONFIG_SPIRAM_MEMTEST=y
3232
# CONFIG_SPIRAM_ALLOW_BSS_SEG_EXTERNAL_MEMORY is not set
33-
# end of SPI RAM config
34-
3533
#
3634
# LWIP
3735
#

‎ports/espressif/boards/adafruit_qtpy_esp32s2/sdkconfig

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
CONFIG_ESP32S2_SPIRAM_SUPPORT=y
2-
32
#
43
# SPI RAM config
54
#
@@ -8,11 +7,12 @@ CONFIG_SPIRAM_TYPE_ESPPSRAM16=y
87
# CONFIG_SPIRAM_TYPE_ESPPSRAM32 is not set
98
# CONFIG_SPIRAM_TYPE_ESPPSRAM64 is not set
109
CONFIG_SPIRAM_SIZE=2097152
10+
# end of SPI RAM config
1111

12+
CONFIG_DEFAULT_PSRAM_CLK_IO=30
1213
#
1314
# PSRAM clock and cs IO for ESP32S2
1415
#
15-
CONFIG_DEFAULT_PSRAM_CLK_IO=30
1616
CONFIG_DEFAULT_PSRAM_CS_IO=26
1717
# end of PSRAM clock and cs IO for ESP32S2
1818

@@ -30,4 +30,8 @@ CONFIG_SPIRAM_USE_MEMMAP=y
3030
# CONFIG_SPIRAM_USE_MALLOC is not set
3131
CONFIG_SPIRAM_MEMTEST=y
3232
# CONFIG_SPIRAM_ALLOW_BSS_SEG_EXTERNAL_MEMORY is not set
33-
# end of SPI RAM config
33+
#
34+
# LWIP
35+
#
36+
CONFIG_LWIP_LOCAL_HOSTNAME="espressif"
37+
# end of LWIP

‎ports/espressif/boards/ai_thinker_esp_12k_nodemcu/sdkconfig

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,18 @@
11
CONFIG_ESP32S2_SPIRAM_SUPPORT=y
2-
32
#
43
# SPI RAM config
54
#
65
# CONFIG_SPIRAM_TYPE_AUTO is not set
76
# CONFIG_SPIRAM_TYPE_ESPPSRAM16 is not set
87
# CONFIG_SPIRAM_TYPE_ESPPSRAM32 is not set
98
CONFIG_SPIRAM_TYPE_ESPPSRAM64=y
10-
CONFIG_SPIRAM_SIZE=4194304
9+
CONFIG_SPIRAM_SIZE=8388608
10+
# end of SPI RAM config
1111

12+
CONFIG_DEFAULT_PSRAM_CLK_IO=30
1213
#
1314
# PSRAM clock and cs IO for ESP32S2
1415
#
15-
CONFIG_DEFAULT_PSRAM_CLK_IO=30
1616
CONFIG_DEFAULT_PSRAM_CS_IO=26
1717
# end of PSRAM clock and cs IO for ESP32S2
1818

@@ -30,4 +30,8 @@ CONFIG_SPIRAM_USE_MEMMAP=y
3030
# CONFIG_SPIRAM_USE_MALLOC is not set
3131
CONFIG_SPIRAM_MEMTEST=y
3232
# CONFIG_SPIRAM_ALLOW_BSS_SEG_EXTERNAL_MEMORY is not set
33-
# end of SPI RAM config
33+
#
34+
# LWIP
35+
#
36+
CONFIG_LWIP_LOCAL_HOSTNAME="espressif"
37+
# end of LWIP

‎ports/espressif/boards/artisense_rd00/sdkconfig

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
CONFIG_ESP32S2_SPIRAM_SUPPORT=y
2-
32
#
43
# SPI RAM config
54
#
@@ -8,11 +7,12 @@ CONFIG_SPIRAM_TYPE_ESPPSRAM16=y
87
# CONFIG_SPIRAM_TYPE_ESPPSRAM32 is not set
98
# CONFIG_SPIRAM_TYPE_ESPPSRAM64 is not set
109
CONFIG_SPIRAM_SIZE=2097152
10+
# end of SPI RAM config
1111

12+
CONFIG_DEFAULT_PSRAM_CLK_IO=30
1213
#
1314
# PSRAM clock and cs IO for ESP32S2
1415
#
15-
CONFIG_DEFAULT_PSRAM_CLK_IO=30
1616
CONFIG_DEFAULT_PSRAM_CS_IO=26
1717
# end of PSRAM clock and cs IO for ESP32S2
1818

@@ -30,8 +30,6 @@ CONFIG_SPIRAM_USE_MEMMAP=y
3030
# CONFIG_SPIRAM_USE_MALLOC is not set
3131
CONFIG_SPIRAM_MEMTEST=y
3232
# CONFIG_SPIRAM_ALLOW_BSS_SEG_EXTERNAL_MEMORY is not set
33-
# end of SPI RAM config
34-
3533
#
3634
# LWIP
3735
#

‎ports/espressif/boards/atmegazero_esp32s2/sdkconfig

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
CONFIG_ESP32S2_SPIRAM_SUPPORT=y
2-
32
#
43
# SPI RAM config
54
#
@@ -8,11 +7,12 @@ CONFIG_ESP32S2_SPIRAM_SUPPORT=y
87
# CONFIG_SPIRAM_TYPE_ESPPSRAM32 is not set
98
CONFIG_SPIRAM_TYPE_ESPPSRAM64=y
109
CONFIG_SPIRAM_SIZE=8388608
10+
# end of SPI RAM config
1111

12+
CONFIG_DEFAULT_PSRAM_CLK_IO=30
1213
#
1314
# PSRAM clock and cs IO for ESP32S2
1415
#
15-
CONFIG_DEFAULT_PSRAM_CLK_IO=30
1616
CONFIG_DEFAULT_PSRAM_CS_IO=26
1717
# end of PSRAM clock and cs IO for ESP32S2
1818

@@ -30,8 +30,6 @@ CONFIG_SPIRAM_USE_MEMMAP=y
3030
# CONFIG_SPIRAM_USE_MALLOC is not set
3131
CONFIG_SPIRAM_MEMTEST=y
3232
# CONFIG_SPIRAM_ALLOW_BSS_SEG_EXTERNAL_MEMORY is not set
33-
# end of SPI RAM config
34-
3533
#
3634
# LWIP
3735
#

‎ports/espressif/boards/crumpspace_crumps2/sdkconfig

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
CONFIG_ESP32S2_SPIRAM_SUPPORT=y
2-
32
#
43
# SPI RAM config
54
#
@@ -8,11 +7,12 @@ CONFIG_SPIRAM_TYPE_ESPPSRAM16=y
87
# CONFIG_SPIRAM_TYPE_ESPPSRAM32 is not set
98
# CONFIG_SPIRAM_TYPE_ESPPSRAM64 is not set
109
CONFIG_SPIRAM_SIZE=2097152
10+
# end of SPI RAM config
1111

12+
CONFIG_DEFAULT_PSRAM_CLK_IO=30
1213
#
1314
# PSRAM clock and cs IO for ESP32S2
1415
#
15-
CONFIG_DEFAULT_PSRAM_CLK_IO=30
1616
CONFIG_DEFAULT_PSRAM_CS_IO=26
1717
# end of PSRAM clock and cs IO for ESP32S2
1818

@@ -30,8 +30,6 @@ CONFIG_SPIRAM_USE_MEMMAP=y
3030
# CONFIG_SPIRAM_USE_MALLOC is not set
3131
CONFIG_SPIRAM_MEMTEST=y
3232
# CONFIG_SPIRAM_ALLOW_BSS_SEG_EXTERNAL_MEMORY is not set
33-
# end of SPI RAM config
34-
3533
#
3634
# LWIP
3735
#

‎ports/espressif/boards/electroniccats_bastwifi/sdkconfig

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

‎ports/espressif/boards/espressif_esp32s3_box/sdkconfig

Lines changed: 33 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,37 @@
11
CONFIG_ESP32S3_SPIRAM_SUPPORT=y
2-
CONFIG_LWIP_LOCAL_HOSTNAME="espressif-esp32s3"
3-
CONFIG_SPIRAM_BOOT_INIT=y
4-
CONFIG_SPIRAM_MEMTEST=y
2+
#
3+
# SPI RAM config
4+
#
5+
# CONFIG_SPIRAM_MODE_QUAD is not set
56
CONFIG_SPIRAM_MODE_OCT=y
6-
CONFIG_SPIRAM_SPEED_80M=y
77
CONFIG_SPIRAM_TYPE_AUTO=y
8-
CONFIG_SPIRAM_USE_MALLOC=n
8+
# CONFIG_SPIRAM_TYPE_ESPPSRAM64 is not set
9+
CONFIG_SPIRAM_SIZE=-1
10+
# end of SPI RAM config
11+
12+
CONFIG_DEFAULT_PSRAM_CLK_IO=30
13+
#
14+
# PSRAM Clock and CS IO for ESP32S3
15+
#
16+
CONFIG_DEFAULT_PSRAM_CS_IO=26
17+
# end of PSRAM Clock and CS IO for ESP32S3
18+
19+
# CONFIG_SPIRAM_FETCH_INSTRUCTIONS is not set
20+
# CONFIG_SPIRAM_RODATA is not set
21+
CONFIG_SPIRAM_SPEED_80M=y
22+
# CONFIG_SPIRAM_SPEED_40M is not set
923
CONFIG_SPIRAM=y
24+
CONFIG_SPIRAM_BOOT_INIT=y
25+
# CONFIG_SPIRAM_IGNORE_NOTFOUND is not set
26+
# CONFIG_SPIRAM_USE_MEMMAP is not set
27+
# CONFIG_SPIRAM_USE_CAPS_ALLOC is not set
28+
CONFIG_SPIRAM_USE_MALLOC=y
29+
CONFIG_SPIRAM_MEMTEST=y
30+
CONFIG_SPIRAM_MALLOC_ALWAYSINTERNAL=16384
31+
# CONFIG_SPIRAM_TRY_ALLOCATE_WIFI_LWIP is not set
32+
CONFIG_SPIRAM_MALLOC_RESERVE_INTERNAL=32768
33+
#
34+
# LWIP
35+
#
36+
CONFIG_LWIP_LOCAL_HOSTNAME="espressif-esp32s3"
37+
# end of LWIP

‎ports/espressif/boards/espressif_esp32s3_devkitc_1_n8/sdkconfig

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
1-
CONFIG_ESP32S3_SPIRAM_SUPPORT=n
2-
1+
# CONFIG_ESP32S3_SPIRAM_SUPPORT is not set
32
#
43
# LWIP
54
#
65
CONFIG_LWIP_LOCAL_HOSTNAME="espressif-esp32s3"
76
# end of LWIP
8-

0 commit comments

Comments
 (0)