Use correct flash defaults

ports/espressif/boards/adafruit_feather_esp32s3_nopsram/sdkconfig

@@ -1,5 +1,15 @@
 #
+# Espressif IoT Development Framework Configuration
+#
+#
+# Component config
+#
+#
 # LWIP
 #
 CONFIG_LWIP_LOCAL_HOSTNAME="espressif-esp32s3"
 # end of LWIP
+
+# end of Component config
+
+# end of Espressif IoT Development Framework Configuration

ports/espressif/boards/adafruit_qtpy_esp32c3/sdkconfig

@@ -1,5 +1,15 @@
 #
+# Espressif IoT Development Framework Configuration
+#
+#
+# Component config
+#
+#
 # LWIP
 #
 CONFIG_LWIP_LOCAL_HOSTNAME="Adafruit-QTPy-ESP32C3"
 # end of LWIP
+
+# end of Component config
+
+# end of Espressif IoT Development Framework Configuration

ports/espressif/boards/adafruit_qtpy_esp32s3_nopsram/sdkconfig

@@ -1,5 +1,15 @@
 #
+# Espressif IoT Development Framework Configuration
+#
+#
+# Component config
+#
+#
 # LWIP
 #
 CONFIG_LWIP_LOCAL_HOSTNAME="espressif-esp32s3"
 # end of LWIP
+
+# end of Component config
+
+# end of Espressif IoT Development Framework Configuration

ports/espressif/boards/ai_thinker_esp32-c3s-2m/sdkconfig

@@ -1,5 +1,15 @@
 #
+# Espressif IoT Development Framework Configuration
+#
+#
+# Component config
+#
+#
 # LWIP
 #
 CONFIG_LWIP_LOCAL_HOSTNAME="AIThinker-ESP32C3S-2M"
 # end of LWIP
+
+# end of Component config
+
+# end of Espressif IoT Development Framework Configuration

ports/espressif/boards/ai_thinker_esp32-c3s/sdkconfig

@@ -1,5 +1,15 @@
 #
+# Espressif IoT Development Framework Configuration
+#
+#
+# Component config
+#
+#
 # LWIP
 #
 CONFIG_LWIP_LOCAL_HOSTNAME="AIThinker-ESP32C3S"
 # end of LWIP
+
+# end of Component config
+
+# end of Espressif IoT Development Framework Configuration

ports/espressif/boards/beetle-esp32-c3/sdkconfig

@@ -1,5 +1,15 @@
 #
+# Espressif IoT Development Framework Configuration
+#
+#
+# Component config
+#
+#
 # LWIP
 #
 CONFIG_LWIP_LOCAL_HOSTNAME="beetle-esp32-c3"
 # end of LWIP
+
+# end of Component config
+
+# end of Espressif IoT Development Framework Configuration

ports/espressif/boards/espressif_esp32c3_devkitm_1_n4/sdkconfig

@@ -1,5 +1,15 @@
 #
+# Espressif IoT Development Framework Configuration
+#
+#
+# Component config
+#
+#
 # LWIP
 #
 CONFIG_LWIP_LOCAL_HOSTNAME="ESP32-C3-DevKitM-1"
 # end of LWIP
+
+# end of Component config
+
+# end of Espressif IoT Development Framework Configuration

ports/espressif/boards/espressif_esp32s3_devkitc_1_n8/sdkconfig

@@ -1,5 +1,15 @@
 #
+# Espressif IoT Development Framework Configuration
+#
+#
+# Component config
+#
+#
 # LWIP
 #
 CONFIG_LWIP_LOCAL_HOSTNAME="espressif-esp32s3"
 # end of LWIP
+
+# end of Component config
+
+# end of Espressif IoT Development Framework Configuration

ports/espressif/boards/espressif_esp32s3_devkitm_1_n8/sdkconfig

@@ -1,5 +1,15 @@
 #
+# Espressif IoT Development Framework Configuration
+#
+#
+# Component config
+#
+#
 # LWIP
 #
 CONFIG_LWIP_LOCAL_HOSTNAME="espressif-esp32s3"
 # end of LWIP
+
+# end of Component config
+
+# end of Espressif IoT Development Framework Configuration

ports/espressif/boards/espressif_esp32s3_usb_otg_n8/sdkconfig

@@ -1,5 +1,15 @@
 #
+# Espressif IoT Development Framework Configuration
+#
+#
+# Component config
+#
+#
 # LWIP
 #
 CONFIG_LWIP_LOCAL_HOSTNAME="espressif-esp32s3"
 # end of LWIP
+
+# end of Component config
+
+# end of Espressif IoT Development Framework Configuration

ports/espressif/tools/update_sdkconfig.py

@@ -206,7 +206,15 @@ def update(debug, board, update_all):
     else:
         opt_config = pathlib.Path("esp-idf-config/sdkconfig-opt.defaults")
     sdkconfigs.append(opt_config)
-    flash_size_config = pathlib.Path(f"esp-idf-config/sdkconfig-flash-{flash_size}.defaults")
+    size_options = ""
+    if flash_size == "2MB":
+        size_options = "-no-ota-no-uf2"
+    elif target in ("esp32", "esp32c3"):
+        # These boards don't have native USB.
+        size_options = "-no-uf2"
+    flash_size_config = pathlib.Path(
+        f"esp-idf-config/sdkconfig-flash-{flash_size}{size_options}.defaults"
+    )
     flash_mode_config = pathlib.Path(f"esp-idf-config/sdkconfig-flash-{flash_mode}.defaults")
     flash_freq_config = pathlib.Path(f"esp-idf-config/sdkconfig-flash-{flash_freq}.defaults")
     sdkconfigs.extend((flash_size_config, flash_mode_config, flash_freq_config))