Merge branch 'espressif:master' into main_work

.github/ISSUE_TEMPLATE/issue-with-hw.yml

@@ -7,7 +7,7 @@ body:
       value: |
         * Most failures to connect, flash, etc. are problems with the hardware.
         * Please check any guide that came with your hardware, and also check [the esptool troubleshooting guide](https://docs.espressif.com/projects/esptool/en/latest/troubleshooting.html).
-        * If your board is a custom design, consider using our [free-of-charge schematic and PCB review service](https://www.espressif.com/en/contact-us/circuit-schematic-pcb-design-review).
+        * If your board is a custom design, check the [ESP Hardware Design Guidelines](https://docs.espressif.com/projects/esp-hardware-design-guidelines/) and consider using our [free-of-charge schematic and PCB review service](https://www.espressif.com/en/contact-us/circuit-schematic-pcb-design-review).
         * If still experiencing the issue, please provide as many details as possible below about your hardware and computer setup.
   - type: input
     id: os

docs/en/troubleshooting.rst

@@ -5,7 +5,9 @@
 Troubleshooting
 ===============
 
-Flashing problems can be fiddly to troubleshoot. Try the suggestions here if you're having problems:
+Flashing problems can be fiddly to troubleshoot. The underlying issue can be caused by the drivers, OS, hardware, or even a combination of these. If your board is a custom design, check the `ESP Hardware Design Guidelines <https://docs.espressif.com/projects/esp-hardware-design-guidelines/>`_ or consider using our `free-of-charge schematic and PCB review service <https://www.espressif.com/en/contact-us/circuit-schematic-pcb-design-review>`_.
+
+Try the following suggestions if your issues persist:
 
 Bootloader Won't Respond
 ------------------------

esptool/__init__.py

@@ -496,7 +496,7 @@ def add_spi_flash_subparsers(
         "quantity. This will make the other segments invisible to the ROM "
         "loader. Use this argument with care because the ROM loader will load "
         "only the RAM segments although the other segments being present in "
-        "the output.",
+        "the output. Implies --dont-append-digest",
         action="store_true",
         default=None,
     )

esptool/cmds.py

@@ -1050,7 +1050,10 @@ def elf2image(args):
         image.min_rev_full = args.min_rev_full
         image.max_rev_full = args.max_rev_full
         image.ram_only_header = args.ram_only_header
-        image.append_digest = args.append_digest
+        if image.ram_only_header:
+            image.append_digest = False
+        else:
+            image.append_digest = args.append_digest
     elif args.version == "1":  # ESP8266
         image = ESP8266ROMFirmwareImage()
     elif args.version == "2":
@@ -1075,7 +1078,10 @@ def elf2image(args):
         image.elf_sha256_offset = args.elf_sha256_offset
 
     if args.ram_only_header:
-        print("ROM segments hidden - only RAM segments are visible to the ROM loader!")
+        print(
+            "Image has only RAM segments visible. "
+            "ROM segments are hidden and SHA256 digest is not appended."
+        )
         image.sort_segments()
 
     before = len(image.segments)