Merge pull request #9583 from RetiredWizard/uartbootloop

dhalbert · web-flow · commit dee71a930fff · 2024-09-17T21:25:26.000-04:00
Remove ESP_CONSOLE_UART from sdkconfig for 666 S3 Display panels
diff --git a/ports/espressif/boards/espressif_esp32s3_devkitc_1_n8r8_hacktablet/sdkconfig b/ports/espressif/boards/espressif_esp32s3_devkitc_1_n8r8_hacktablet/sdkconfig
@@ -4,19 +4,6 @@
 #
 # Component config
 #
-#
-# ESP System Settings
-#
-CONFIG_ESP_CONSOLE_UART_CUSTOM=y
-# CONFIG_ESP_CONSOLE_NONE is not set
-CONFIG_ESP_CONSOLE_UART=y
-CONFIG_ESP_CONSOLE_UART_CUSTOM_NUM_0=y
-CONFIG_ESP_CONSOLE_UART_NUM=0
-CONFIG_ESP_CONSOLE_UART_TX_GPIO=43
-CONFIG_ESP_CONSOLE_UART_RX_GPIO=44
-CONFIG_ESP_CONSOLE_UART_BAUDRATE=115200
-# end of ESP System Settings
-
 #
 # LWIP
 #
diff --git a/ports/espressif/boards/espressif_esp32s3_lcd_ev/sdkconfig b/ports/espressif/boards/espressif_esp32s3_lcd_ev/sdkconfig
@@ -4,23 +4,10 @@
 #
 # Component config
 #
-#
-# ESP System Settings
-#
-CONFIG_ESP_CONSOLE_UART_CUSTOM=y
-# CONFIG_ESP_CONSOLE_NONE is not set
-CONFIG_ESP_CONSOLE_UART=y
-CONFIG_ESP_CONSOLE_UART_CUSTOM_NUM_0=y
-CONFIG_ESP_CONSOLE_UART_NUM=0
-CONFIG_ESP_CONSOLE_UART_TX_GPIO=43
-CONFIG_ESP_CONSOLE_UART_RX_GPIO=44
-CONFIG_ESP_CONSOLE_UART_BAUDRATE=115200
-# end of ESP System Settings
-
 #
 # LWIP
 #
-CONFIG_LWIP_LOCAL_HOSTNAME="circuitpy"
+CONFIG_LWIP_LOCAL_HOSTNAME="espressif-esp32s3-lcd-ev"
 # end of LWIP
 
 # end of Component config
diff --git a/ports/espressif/boards/makerfabs_tft7/sdkconfig b/ports/espressif/boards/makerfabs_tft7/sdkconfig
@@ -4,19 +4,6 @@
 #
 # Component config
 #
-#
-# ESP System Settings
-#
-CONFIG_ESP_CONSOLE_UART_CUSTOM=y
-# CONFIG_ESP_CONSOLE_NONE is not set
-CONFIG_ESP_CONSOLE_UART=y
-CONFIG_ESP_CONSOLE_UART_CUSTOM_NUM_0=y
-CONFIG_ESP_CONSOLE_UART_NUM=0
-CONFIG_ESP_CONSOLE_UART_TX_GPIO=43
-CONFIG_ESP_CONSOLE_UART_RX_GPIO=44
-CONFIG_ESP_CONSOLE_UART_BAUDRATE=115200
-# end of ESP System Settings
-
 #
 # LWIP
 #

Original file line number	Diff line number	Diff line change
`@@ -4,19 +4,6 @@`
`4`	`4`	`#`
`5`	`5`	`# Component config`
`6`	`6`	`#`
`7`		`-#`
`8`		`-# ESP System Settings`
`9`		`-#`
`10`		`-CONFIG_ESP_CONSOLE_UART_CUSTOM=y`
`11`		`-# CONFIG_ESP_CONSOLE_NONE is not set`
`12`		`-CONFIG_ESP_CONSOLE_UART=y`
`13`		`-CONFIG_ESP_CONSOLE_UART_CUSTOM_NUM_0=y`
`14`		`-CONFIG_ESP_CONSOLE_UART_NUM=0`
`15`		`-CONFIG_ESP_CONSOLE_UART_TX_GPIO=43`
`16`		`-CONFIG_ESP_CONSOLE_UART_RX_GPIO=44`
`17`		`-CONFIG_ESP_CONSOLE_UART_BAUDRATE=115200`
`18`		`-# end of ESP System Settings`
`19`		`-`
`20`	`7`	`#`
`21`	`8`	`# LWIP`
`22`	`9`	`#`
Original file line number	Diff line number	Diff line change
`@@ -4,23 +4,10 @@`
`4`	`4`	`#`
`5`	`5`	`# Component config`
`6`	`6`	`#`
`7`		`-#`
`8`		`-# ESP System Settings`
`9`		`-#`
`10`		`-CONFIG_ESP_CONSOLE_UART_CUSTOM=y`
`11`		`-# CONFIG_ESP_CONSOLE_NONE is not set`
`12`		`-CONFIG_ESP_CONSOLE_UART=y`
`13`		`-CONFIG_ESP_CONSOLE_UART_CUSTOM_NUM_0=y`
`14`		`-CONFIG_ESP_CONSOLE_UART_NUM=0`
`15`		`-CONFIG_ESP_CONSOLE_UART_TX_GPIO=43`
`16`		`-CONFIG_ESP_CONSOLE_UART_RX_GPIO=44`
`17`		`-CONFIG_ESP_CONSOLE_UART_BAUDRATE=115200`
`18`		`-# end of ESP System Settings`
`19`		`-`
`20`	`7`	`#`
`21`	`8`	`# LWIP`
`22`	`9`	`#`
`23`		`-CONFIG_LWIP_LOCAL_HOSTNAME="circuitpy"`
	`10`	`+CONFIG_LWIP_LOCAL_HOSTNAME="espressif-esp32s3-lcd-ev"`
`24`	`11`	`# end of LWIP`
`25`	`12`
`26`	`13`	`# end of Component config`