Skip to content

Commit 39639ec

Browse files
tannewttannewt
committed
Rework configs to take target into account
New script will filter settings to different tiers.
1 parent 2233026 commit 39639ec

File tree

53 files changed

+1759
-210
lines changed

Some content is hidden

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

53 files changed

+1759
-210
lines changed

‎ports/espressif/Makefile

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -295,7 +295,8 @@ ifeq ($(DEBUG), 1)
295295
else
296296
DEBUG_SDKCONFIG = esp-idf-config/sdkconfig-opt.defaults
297297
endif
298-
SDKCONFIGS = esp-idf-config/sdkconfig.defaults;$(DEBUG_SDKCONFIG);$(FLASH_SDKCONFIG);boards/$(BOARD)/sdkconfig
298+
299+
SDKCONFIGS = esp-idf-config/sdkconfig.defaults;$(DEBUG_SDKCONFIG);$(FLASH_SDKCONFIG);$(TARGET_SDKCONFIG);boards/$(BOARD)/sdkconfig
299300

300301
# create the config headers
301302
$(BUILD)/esp-idf/config/sdkconfig.h: boards/$(BOARD)/sdkconfig | $(BUILD)/esp-idf

‎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
#

0 commit comments

Comments
 (0)