Added flash_mode=dio to avoid boot loop when flashing using merge.bin - #2570
Merged
liamcottle merged 1 commit intoJun 26, 2026
Merged
Conversation
|
I found the same issue on the m5 UNIT-C6L (#2552), I thought it was just an artifact of the implementation of the UNIT-C6L. Quad spi is indeed part of the schematic, but I could not get it to work with the esp32 bootloader. |
Contributor
Author
|
Glad it helps you too. :) |
This was referenced May 26, 2026
ViezeVingertjes
approved these changes
Jun 26, 2026
hermes-gadget
added a commit
to gadgethd/MeshCore-MQTT
that referenced
this pull request
Jun 27, 2026
Upstream dev: 3d4eec4..5ff39c6 (10 commits) - Merge PR meshcore-dev#2570: fix flash mode XiaoC6 - Merge PR meshcore-dev#2639: fix typos in comments - Merge PR meshcore-dev#2844: fix rx boosted gain - always save boosted gain setting - fix: report error when rxgain setting is unsupported/rejected - return bool when setting rx boost - remove guard on MyMesh::setRxBoostedGain() - fix: fix typos in source code comments (x2) - Added flash_mode=dio to avoid boot loop on merge.bin flash Integration work: - Resolved CommonCLI.cpp conflict: kept packPrefs/unpackPrefs architecture (upstream didn't touch CommonCLI.h in this window, --theirs was sufficient) - Squash merge of origin/main (all MQTT additions preserved) - Removed firmware binaries from webflasher/ - Added gitignore patterns All MQTT additions preserved.
3 tasks
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
4 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
This patch is for Xiao C6.
Without this patch, Xiao C6 will hit below boot loop when flashing using merge.bin and Web Flasher.
Tested working fine now with my Xiao C6.
PowerSaving is at 5.9mA too.