Merge pull request #7245 from dhalbert/c3-sdkconfig

microdev1 · web-flow · commit e7c87a4acd58 · 2022-11-22T09:15:30.000+05:30
Simplify some ESP32-C3 board sdkconfig files
diff --git a/ports/espressif/boards/adafruit_qtpy_esp32c3/sdkconfig b/ports/espressif/boards/adafruit_qtpy_esp32c3/sdkconfig
@@ -1,70 +1,5 @@
-# Automatically generated file. DO NOT EDIT.
-# Espressif IoT Development Framework (ESP-IDF) Project Configuration
-#
-# Bootloader config
-#
-CONFIG_BOOTLOADER_LOG_LEVEL_NONE=y
-# CONFIG_BOOTLOADER_LOG_LEVEL_INFO is not set
-CONFIG_BOOTLOADER_LOG_LEVEL=0
-# end of Bootloader config
-
-#
-# Serial flasher config
-#
-# CONFIG_ESPTOOLPY_FLASHFREQ_26M is not set
-# end of Serial flasher config
-
-#
-# Partition Table
-#
-CONFIG_PARTITION_TABLE_CUSTOM_FILENAME="esp-idf-config/partitions-4MB-no-uf2.csv"
-CONFIG_PARTITION_TABLE_FILENAME="esp-idf-config/partitions-4MB-no-uf2.csv"
-# end of Partition Table
-
-#
-# Compiler options
-#
-# CONFIG_COMPILER_SAVE_RESTORE_LIBCALLS is not set
-# end of Compiler options
-
-#
-# Component config
-#
-#
-
-#
-# PHY
-#
-CONFIG_ESP_PHY_ENABLE_USB=y
-# end of PHY
-
-#
-# ESP System Settings
-#
-# CONFIG_ESP_SYSTEM_USE_EH_FRAME is not set
-CONFIG_ESP_CONSOLE_SECONDARY_NONE=y
-# CONFIG_ESP_CONSOLE_SECONDARY_USB_SERIAL_JTAG is not set
-# CONFIG_ESP_DEBUG_STUBS_ENABLE is not set
-# end of ESP System Settings
-
 #
 # LWIP
 #
 CONFIG_LWIP_LOCAL_HOSTNAME="Adafruit-QTPy-ESP32C3"
 # end of LWIP
-
-#
-# SPI Flash driver
-#
-# CONFIG_SPI_FLASH_AUTO_SUSPEND is not set
-# end of SPI Flash driver
-
-# end of Component config
-
-#
-# Deprecated options for backward compatibility
-#
-# CONFIG_LOG_BOOTLOADER_LEVEL_INFO is not set
-CONFIG_LOG_BOOTLOADER_LEVEL=0
-# CONFIG_COMPILER_OPTIMIZATION_LEVEL_DEBUG is not set
-# end of Deprecated options for backward compatibility
diff --git a/ports/espressif/boards/beetle-esp32-c3/sdkconfig b/ports/espressif/boards/beetle-esp32-c3/sdkconfig
@@ -1,13 +1,5 @@
-#
-# PHY
-#
-CONFIG_ESP_PHY_ENABLE_USB=y
-# end of PHY
-
 #
 # LWIP
 #
 CONFIG_LWIP_LOCAL_HOSTNAME="beetle-esp32-c3
 # end of LWIP
-
-
diff --git a/ports/espressif/boards/lolin_c3_mini/sdkconfig b/ports/espressif/boards/lolin_c3_mini/sdkconfig
@@ -1,13 +1,5 @@
-#
-# PHY
-#
-CONFIG_ESP_PHY_ENABLE_USB=y
-# end of PHY
-
 #
 # LWIP
 #
 CONFIG_LWIP_LOCAL_HOSTNAME="lolin-c3-mini"
 # end of LWIP
-
-
diff --git a/ports/espressif/boards/microdev_micro_c3/sdkconfig b/ports/espressif/boards/microdev_micro_c3/sdkconfig
@@ -1,70 +1,5 @@
-# Automatically generated file. DO NOT EDIT.
-# Espressif IoT Development Framework (ESP-IDF) Project Configuration
-#
-# Bootloader config
-#
-CONFIG_BOOTLOADER_LOG_LEVEL_NONE=y
-# CONFIG_BOOTLOADER_LOG_LEVEL_INFO is not set
-CONFIG_BOOTLOADER_LOG_LEVEL=0
-# end of Bootloader config
-
-#
-# Serial flasher config
-#
-# CONFIG_ESPTOOLPY_FLASHFREQ_26M is not set
-# end of Serial flasher config
-
-#
-# Partition Table
-#
-CONFIG_PARTITION_TABLE_CUSTOM_FILENAME="esp-idf-config/partitions-4MB-no-uf2.csv"
-CONFIG_PARTITION_TABLE_FILENAME="esp-idf-config/partitions-4MB-no-uf2.csv"
-# end of Partition Table
-
-#
-# Compiler options
-#
-# CONFIG_COMPILER_SAVE_RESTORE_LIBCALLS is not set
-# end of Compiler options
-
-#
-# Component config
-#
-#
-
-#
-# PHY
-#
-CONFIG_ESP_PHY_ENABLE_USB=y
-# end of PHY
-
-#
-# ESP System Settings
-#
-# CONFIG_ESP_SYSTEM_USE_EH_FRAME is not set
-CONFIG_ESP_CONSOLE_SECONDARY_NONE=y
-# CONFIG_ESP_CONSOLE_SECONDARY_USB_SERIAL_JTAG is not set
-# CONFIG_ESP_DEBUG_STUBS_ENABLE is not set
-# end of ESP System Settings
-
 #
 # LWIP
 #
 CONFIG_LWIP_LOCAL_HOSTNAME="MicroDev-microC3"
 # end of LWIP
-
-#
-# SPI Flash driver
-#
-# CONFIG_SPI_FLASH_AUTO_SUSPEND is not set
-# end of SPI Flash driver
-
-# end of Component config
-
-#
-# Deprecated options for backward compatibility
-#
-# CONFIG_LOG_BOOTLOADER_LEVEL_INFO is not set
-CONFIG_LOG_BOOTLOADER_LEVEL=0
-# CONFIG_COMPILER_OPTIMIZATION_LEVEL_DEBUG is not set
-# end of Deprecated options for backward compatibility
diff --git a/ports/espressif/esp-idf-config/sdkconfig-esp32c3.defaults b/ports/espressif/esp-idf-config/sdkconfig-esp32c3.defaults
@@ -80,6 +80,12 @@ CONFIG_ESP_SLEEP_GPIO_RESET_WORKAROUND=y
 
 # end of Hardware Settings
 
+#
+# PHY
+#
+CONFIG_ESP_PHY_ENABLE_USB=y
+# end of PHY
+
 #
 # ESP System Settings
 #
@@ -97,8 +103,12 @@ CONFIG_ESP_SYSTEM_MEMPROT_MEM_ALIGN_SIZE=512
 CONFIG_ESP_MAIN_TASK_AFFINITY_CPU0=y
 # CONFIG_ESP_MAIN_TASK_AFFINITY_NO_AFFINITY is not set
 CONFIG_ESP_MAIN_TASK_AFFINITY=0x0
+
+CONFIG_ESP_CONSOLE_SECONDARY_NONE=y
+# CONFIG_ESP_CONSOLE_SECONDARY_USB_SERIAL_JTAG is not set
 # end of ESP System Settings
 
+
 #
 # Wi-Fi
 #

Original file line number	Diff line number	Diff line change
`@@ -1,13 +1,5 @@`
`1`		`-#`
`2`		`-# PHY`
`3`		`-#`
`4`		`-CONFIG_ESP_PHY_ENABLE_USB=y`
`5`		`-# end of PHY`
`6`		`-`
`7`	`1`	`#`
`8`	`2`	`# LWIP`
`9`	`3`	`#`
`10`	`4`	`CONFIG_LWIP_LOCAL_HOSTNAME="beetle-esp32-c3`
`11`	`5`	`# end of LWIP`
`12`		`-`
`13`		`-`
Original file line number	Diff line number	Diff line change
`@@ -80,6 +80,12 @@ CONFIG_ESP_SLEEP_GPIO_RESET_WORKAROUND=y`
`80`	`80`
`81`	`81`	`# end of Hardware Settings`
`82`	`82`
	`83`	`+#`
	`84`	`+# PHY`
	`85`	`+#`
	`86`	`+CONFIG_ESP_PHY_ENABLE_USB=y`
	`87`	`+# end of PHY`
	`88`	`+`
`83`	`89`	`#`
`84`	`90`	`# ESP System Settings`
`85`	`91`	`#`
`@@ -97,8 +103,12 @@ CONFIG_ESP_SYSTEM_MEMPROT_MEM_ALIGN_SIZE=512`
`97`	`103`	`CONFIG_ESP_MAIN_TASK_AFFINITY_CPU0=y`
`98`	`104`	`# CONFIG_ESP_MAIN_TASK_AFFINITY_NO_AFFINITY is not set`
`99`	`105`	`CONFIG_ESP_MAIN_TASK_AFFINITY=0x0`
	`106`	`+`
	`107`	`+CONFIG_ESP_CONSOLE_SECONDARY_NONE=y`
	`108`	`+# CONFIG_ESP_CONSOLE_SECONDARY_USB_SERIAL_JTAG is not set`
`100`	`109`	`# end of ESP System Settings`
`101`	`110`
	`111`	`+`
`102`	`112`	`#`
`103`	`113`	`# Wi-Fi`
`104`	`114`	`#`