Merge pull request #5853 from tannewt/s3_config_rework

Split out target specific configs.
adafruit · Jan 14, 2022 · 7af7cd4 · 7af7cd4
2 parents 86e7247 + 869cf5e
commit 7af7cd4
Show file tree

Hide file tree

Showing 54 changed files with 1,769 additions and 215 deletions.
diff --git a/ports/espressif/Makefile b/ports/espressif/Makefile
@@ -289,13 +289,15 @@ IDF_PATH = $(realpath ./esp-idf)
 $(BUILD)/esp-idf:
 	$(Q)$(MKDIR) -p $@
 
+TARGET_SDKCONFIG = esp-idf-config/sdkconfig-$(IDF_TARGET).defaults
 FLASH_SDKCONFIG = esp-idf-config/sdkconfig-$(CIRCUITPY_ESP_FLASH_SIZE).defaults
 ifeq ($(DEBUG), 1)
 	DEBUG_SDKCONFIG = esp-idf-config/sdkconfig-debug.defaults
 else
 	DEBUG_SDKCONFIG = esp-idf-config/sdkconfig-opt.defaults
 endif
-SDKCONFIGS = esp-idf-config/sdkconfig.defaults;$(DEBUG_SDKCONFIG);$(FLASH_SDKCONFIG);boards/$(BOARD)/sdkconfig
+
+SDKCONFIGS = esp-idf-config/sdkconfig.defaults;$(DEBUG_SDKCONFIG);$(FLASH_SDKCONFIG);$(TARGET_SDKCONFIG);boards/$(BOARD)/sdkconfig
 
 # create the config headers
 $(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
 	IDF_PATH=$(IDF_PATH) ninja -C $(BUILD)/esp-idf partition_table/partition-table.bin
 
 # run menuconfig and then remove standard settings
-menuconfig: $(BUILD)/esp-idf/config
+menuconfig: $(BUILD)/esp-idf/config $(BUILD)/esp-idf/config/sdkconfig.h
 	$(Q)ninja -C $(BUILD)/esp-idf menuconfig
-	$(Q)diff --old-line-format= --unchanged-line-format= esp-idf-config/sdkconfig.defaults $(BUILD)/esp-idf/sdkconfig > $(BUILD)/sdkconfig.diff || true
-	$(Q)grep -Fvxf $(DEBUG_SDKCONFIG) -f $(FLASH_SDKCONFIG) $(BUILD)/sdkconfig.diff > boards/$(BOARD)/sdkconfig
+	# Newer versions of the idf will have save-defconfig that will only include non-default values.
+	# We should use that when available. For now, we sort out everything.
+	python tools/update_sdkconfig.py --board=$(BOARD) --debug=$(DEBUG)
 
 # qstr builds include headers so we need to make sure they are up to date
 $(HEADER_BUILD)/qstr.split: | $(BUILD)/esp-idf/config/sdkconfig.h

diff --git a/ports/espressif/boards/adafruit_feather_esp32s2/sdkconfig b/ports/espressif/boards/adafruit_feather_esp32s2/sdkconfig
@@ -1,5 +1,4 @@
 CONFIG_ESP32S2_SPIRAM_SUPPORT=y
-
 #
 # SPI RAM config
 #
@@ -8,11 +7,12 @@ CONFIG_SPIRAM_TYPE_ESPPSRAM16=y
 # CONFIG_SPIRAM_TYPE_ESPPSRAM32 is not set
 # CONFIG_SPIRAM_TYPE_ESPPSRAM64 is not set
 CONFIG_SPIRAM_SIZE=2097152
+# end of SPI RAM config
 
+CONFIG_DEFAULT_PSRAM_CLK_IO=30
 #
 # PSRAM clock and cs IO for ESP32S2
 #
-CONFIG_DEFAULT_PSRAM_CLK_IO=30
 CONFIG_DEFAULT_PSRAM_CS_IO=26
 # end of PSRAM clock and cs IO for ESP32S2
 
@@ -30,4 +30,8 @@ CONFIG_SPIRAM_USE_MEMMAP=y
 # 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
+#
+# LWIP
+#
+CONFIG_LWIP_LOCAL_HOSTNAME="espressif"
+# end of LWIP
diff --git a/ports/espressif/boards/adafruit_feather_esp32s2_tft/sdkconfig b/ports/espressif/boards/adafruit_feather_esp32s2_tft/sdkconfig
@@ -1,5 +1,4 @@
 CONFIG_ESP32S2_SPIRAM_SUPPORT=y
-
 #
 # SPI RAM config
 #
@@ -8,11 +7,12 @@ CONFIG_SPIRAM_TYPE_ESPPSRAM16=y
 # CONFIG_SPIRAM_TYPE_ESPPSRAM32 is not set
 # CONFIG_SPIRAM_TYPE_ESPPSRAM64 is not set
 CONFIG_SPIRAM_SIZE=2097152
+# end of SPI RAM config
 
+CONFIG_DEFAULT_PSRAM_CLK_IO=30
 #
 # PSRAM clock and cs IO for ESP32S2
 #
-CONFIG_DEFAULT_PSRAM_CLK_IO=30
 CONFIG_DEFAULT_PSRAM_CS_IO=26
 # end of PSRAM clock and cs IO for ESP32S2
 
@@ -30,4 +30,8 @@ CONFIG_SPIRAM_USE_MEMMAP=y
 # 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
+#
+# LWIP
+#
+CONFIG_LWIP_LOCAL_HOSTNAME="espressif"
+# end of LWIP
diff --git a/ports/espressif/boards/adafruit_feather_esp32s2_tftback_nopsram/sdkconfig b/ports/espressif/boards/adafruit_feather_esp32s2_tftback_nopsram/sdkconfig
@@ -0,0 +1,6 @@
+# CONFIG_ESP32S2_SPIRAM_SUPPORT is not set
+#
+# LWIP
+#
+CONFIG_LWIP_LOCAL_HOSTNAME="espressif"
+# end of LWIP
diff --git a/ports/espressif/boards/adafruit_funhouse/sdkconfig b/ports/espressif/boards/adafruit_funhouse/sdkconfig
@@ -1,5 +1,4 @@
 CONFIG_ESP32S2_SPIRAM_SUPPORT=y
-
 #
 # SPI RAM config
 #
@@ -8,11 +7,12 @@ CONFIG_SPIRAM_TYPE_ESPPSRAM16=y
 # CONFIG_SPIRAM_TYPE_ESPPSRAM32 is not set
 # CONFIG_SPIRAM_TYPE_ESPPSRAM64 is not set
 CONFIG_SPIRAM_SIZE=2097152
+# end of SPI RAM config
 
+CONFIG_DEFAULT_PSRAM_CLK_IO=30
 #
 # PSRAM clock and cs IO for ESP32S2
 #
-CONFIG_DEFAULT_PSRAM_CLK_IO=30
 CONFIG_DEFAULT_PSRAM_CS_IO=26
 # end of PSRAM clock and cs IO for ESP32S2
 
@@ -30,4 +30,8 @@ CONFIG_SPIRAM_USE_MEMMAP=y
 # 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
+#
+# LWIP
+#
+CONFIG_LWIP_LOCAL_HOSTNAME="espressif"
+# end of LWIP
diff --git a/ports/espressif/boards/adafruit_magtag_2.9_grayscale/sdkconfig b/ports/espressif/boards/adafruit_magtag_2.9_grayscale/sdkconfig
@@ -1,5 +1,4 @@
 CONFIG_ESP32S2_SPIRAM_SUPPORT=y
-
 #
 # SPI RAM config
 #
@@ -8,11 +7,12 @@ CONFIG_SPIRAM_TYPE_ESPPSRAM16=y
 # CONFIG_SPIRAM_TYPE_ESPPSRAM32 is not set
 # CONFIG_SPIRAM_TYPE_ESPPSRAM64 is not set
 CONFIG_SPIRAM_SIZE=2097152
+# end of SPI RAM config
 
+CONFIG_DEFAULT_PSRAM_CLK_IO=30
 #
 # PSRAM clock and cs IO for ESP32S2
 #
-CONFIG_DEFAULT_PSRAM_CLK_IO=30
 CONFIG_DEFAULT_PSRAM_CS_IO=26
 # end of PSRAM clock and cs IO for ESP32S2
 
@@ -30,4 +30,8 @@ CONFIG_SPIRAM_USE_MEMMAP=y
 # 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
+#
+# LWIP
+#
+CONFIG_LWIP_LOCAL_HOSTNAME="espressif"
+# end of LWIP
diff --git a/ports/espressif/boards/adafruit_metro_esp32s2/sdkconfig b/ports/espressif/boards/adafruit_metro_esp32s2/sdkconfig
@@ -1,5 +1,4 @@
 CONFIG_ESP32S2_SPIRAM_SUPPORT=y
-
 #
 # SPI RAM config
 #
@@ -8,11 +7,12 @@ CONFIG_SPIRAM_TYPE_ESPPSRAM16=y
 # CONFIG_SPIRAM_TYPE_ESPPSRAM32 is not set
 # CONFIG_SPIRAM_TYPE_ESPPSRAM64 is not set
 CONFIG_SPIRAM_SIZE=2097152
+# end of SPI RAM config
 
+CONFIG_DEFAULT_PSRAM_CLK_IO=30
 #
 # PSRAM clock and cs IO for ESP32S2
 #
-CONFIG_DEFAULT_PSRAM_CLK_IO=30
 CONFIG_DEFAULT_PSRAM_CS_IO=26
 # end of PSRAM clock and cs IO for ESP32S2
 
@@ -30,8 +30,6 @@ CONFIG_SPIRAM_USE_MEMMAP=y
 # 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
-
 #
 # LWIP
 #

diff --git a/ports/espressif/boards/adafruit_qtpy_esp32s2/sdkconfig b/ports/espressif/boards/adafruit_qtpy_esp32s2/sdkconfig
@@ -1,5 +1,4 @@
 CONFIG_ESP32S2_SPIRAM_SUPPORT=y
-
 #
 # SPI RAM config
 #
@@ -8,11 +7,12 @@ CONFIG_SPIRAM_TYPE_ESPPSRAM16=y
 # CONFIG_SPIRAM_TYPE_ESPPSRAM32 is not set
 # CONFIG_SPIRAM_TYPE_ESPPSRAM64 is not set
 CONFIG_SPIRAM_SIZE=2097152
+# end of SPI RAM config
 
+CONFIG_DEFAULT_PSRAM_CLK_IO=30
 #
 # PSRAM clock and cs IO for ESP32S2
 #
-CONFIG_DEFAULT_PSRAM_CLK_IO=30
 CONFIG_DEFAULT_PSRAM_CS_IO=26
 # end of PSRAM clock and cs IO for ESP32S2
 
@@ -30,4 +30,8 @@ CONFIG_SPIRAM_USE_MEMMAP=y
 # 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
+#
+# LWIP
+#
+CONFIG_LWIP_LOCAL_HOSTNAME="espressif"
+# end of LWIP
diff --git a/ports/espressif/boards/ai_thinker_esp_12k_nodemcu/sdkconfig b/ports/espressif/boards/ai_thinker_esp_12k_nodemcu/sdkconfig
@@ -1,18 +1,18 @@
 CONFIG_ESP32S2_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_ESPPSRAM64=y
-CONFIG_SPIRAM_SIZE=4194304
+CONFIG_SPIRAM_SIZE=8388608
+# end of SPI RAM config
 
+CONFIG_DEFAULT_PSRAM_CLK_IO=30
 #
 # PSRAM clock and cs IO for ESP32S2
 #
-CONFIG_DEFAULT_PSRAM_CLK_IO=30
 CONFIG_DEFAULT_PSRAM_CS_IO=26
 # end of PSRAM clock and cs IO for ESP32S2
 
@@ -30,4 +30,8 @@ CONFIG_SPIRAM_USE_MEMMAP=y
 # 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
+#
+# LWIP
+#
+CONFIG_LWIP_LOCAL_HOSTNAME="espressif"
+# end of LWIP
diff --git a/ports/espressif/boards/artisense_rd00/sdkconfig b/ports/espressif/boards/artisense_rd00/sdkconfig
@@ -1,5 +1,4 @@
 CONFIG_ESP32S2_SPIRAM_SUPPORT=y
-
 #
 # SPI RAM config
 #
@@ -8,11 +7,12 @@ CONFIG_SPIRAM_TYPE_ESPPSRAM16=y
 # CONFIG_SPIRAM_TYPE_ESPPSRAM32 is not set
 # CONFIG_SPIRAM_TYPE_ESPPSRAM64 is not set
 CONFIG_SPIRAM_SIZE=2097152
+# end of SPI RAM config
 
+CONFIG_DEFAULT_PSRAM_CLK_IO=30
 #
 # PSRAM clock and cs IO for ESP32S2
 #
-CONFIG_DEFAULT_PSRAM_CLK_IO=30
 CONFIG_DEFAULT_PSRAM_CS_IO=26
 # end of PSRAM clock and cs IO for ESP32S2
 
@@ -30,8 +30,6 @@ CONFIG_SPIRAM_USE_MEMMAP=y
 # 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
-
 #
 # LWIP
 #

diff --git a/ports/espressif/boards/atmegazero_esp32s2/sdkconfig b/ports/espressif/boards/atmegazero_esp32s2/sdkconfig
@@ -1,5 +1,4 @@
 CONFIG_ESP32S2_SPIRAM_SUPPORT=y
-
 #
 # SPI RAM config
 #
@@ -8,11 +7,12 @@ CONFIG_ESP32S2_SPIRAM_SUPPORT=y
 # CONFIG_SPIRAM_TYPE_ESPPSRAM32 is not set
 CONFIG_SPIRAM_TYPE_ESPPSRAM64=y
 CONFIG_SPIRAM_SIZE=8388608
+# end of SPI RAM config
 
+CONFIG_DEFAULT_PSRAM_CLK_IO=30
 #
 # PSRAM clock and cs IO for ESP32S2
 #
-CONFIG_DEFAULT_PSRAM_CLK_IO=30
 CONFIG_DEFAULT_PSRAM_CS_IO=26
 # end of PSRAM clock and cs IO for ESP32S2
 
@@ -30,8 +30,6 @@ CONFIG_SPIRAM_USE_MEMMAP=y
 # 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
-
 #
 # LWIP
 #

diff --git a/ports/espressif/boards/crumpspace_crumps2/sdkconfig b/ports/espressif/boards/crumpspace_crumps2/sdkconfig
@@ -1,5 +1,4 @@
 CONFIG_ESP32S2_SPIRAM_SUPPORT=y
-
 #
 # SPI RAM config
 #
@@ -8,11 +7,12 @@ CONFIG_SPIRAM_TYPE_ESPPSRAM16=y
 # CONFIG_SPIRAM_TYPE_ESPPSRAM32 is not set
 # CONFIG_SPIRAM_TYPE_ESPPSRAM64 is not set
 CONFIG_SPIRAM_SIZE=2097152
+# end of SPI RAM config
 
+CONFIG_DEFAULT_PSRAM_CLK_IO=30
 #
 # PSRAM clock and cs IO for ESP32S2
 #
-CONFIG_DEFAULT_PSRAM_CLK_IO=30
 CONFIG_DEFAULT_PSRAM_CS_IO=26
 # end of PSRAM clock and cs IO for ESP32S2
 
@@ -30,8 +30,6 @@ CONFIG_SPIRAM_USE_MEMMAP=y
 # 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
-
 #
 # LWIP
 #

diff --git a/ports/espressif/boards/electroniccats_bastwifi/sdkconfig b/ports/espressif/boards/electroniccats_bastwifi/sdkconfig
@@ -0,0 +1,6 @@
+# CONFIG_ESP32S2_SPIRAM_SUPPORT is not set
+#
+# LWIP
+#
+CONFIG_LWIP_LOCAL_HOSTNAME="espressif"
+# end of LWIP
diff --git a/ports/espressif/boards/espressif_esp32s3_box/sdkconfig b/ports/espressif/boards/espressif_esp32s3_box/sdkconfig
@@ -1,9 +1,37 @@
 CONFIG_ESP32S3_SPIRAM_SUPPORT=y
-CONFIG_LWIP_LOCAL_HOSTNAME="espressif-esp32s3"
-CONFIG_SPIRAM_BOOT_INIT=y
-CONFIG_SPIRAM_MEMTEST=y
+#
+# SPI RAM config
+#
+# CONFIG_SPIRAM_MODE_QUAD is not set
 CONFIG_SPIRAM_MODE_OCT=y
-CONFIG_SPIRAM_SPEED_80M=y
 CONFIG_SPIRAM_TYPE_AUTO=y
-CONFIG_SPIRAM_USE_MALLOC=n
+# CONFIG_SPIRAM_TYPE_ESPPSRAM64 is not set
+CONFIG_SPIRAM_SIZE=-1
+# end of SPI RAM config
+
+CONFIG_DEFAULT_PSRAM_CLK_IO=30
+#
+# PSRAM Clock and CS IO for ESP32S3
+#
+CONFIG_DEFAULT_PSRAM_CS_IO=26
+# end of PSRAM Clock and CS IO for ESP32S3
+
+# CONFIG_SPIRAM_FETCH_INSTRUCTIONS is not set
+# CONFIG_SPIRAM_RODATA is not set
+CONFIG_SPIRAM_SPEED_80M=y
+# CONFIG_SPIRAM_SPEED_40M is not set
 CONFIG_SPIRAM=y
+CONFIG_SPIRAM_BOOT_INIT=y
+# CONFIG_SPIRAM_IGNORE_NOTFOUND is not set
+# CONFIG_SPIRAM_USE_MEMMAP is not set
+# CONFIG_SPIRAM_USE_CAPS_ALLOC is not set
+CONFIG_SPIRAM_USE_MALLOC=y
+CONFIG_SPIRAM_MEMTEST=y
+CONFIG_SPIRAM_MALLOC_ALWAYSINTERNAL=16384
+# CONFIG_SPIRAM_TRY_ALLOCATE_WIFI_LWIP is not set
+CONFIG_SPIRAM_MALLOC_RESERVE_INTERNAL=32768
+#
+# LWIP
+#
+CONFIG_LWIP_LOCAL_HOSTNAME="espressif-esp32s3"
+# end of LWIP
diff --git a/ports/espressif/boards/espressif_esp32s3_devkitc_1_n8/sdkconfig b/ports/espressif/boards/espressif_esp32s3_devkitc_1_n8/sdkconfig
@@ -1,8 +1,6 @@
-CONFIG_ESP32S3_SPIRAM_SUPPORT=n
-
+# CONFIG_ESP32S3_SPIRAM_SUPPORT is not set
 #
 # LWIP
 #
 CONFIG_LWIP_LOCAL_HOSTNAME="espressif-esp32s3"
 # end of LWIP
-