espressif/esptool
1
0
Fork 0
mirror of https://github.com/espressif/esptool.git synced 2025-10-21 23:30:34 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix: Set flash parameters even with --flash_size keep

Browse Source 
Related to https://github.com/espressif/esp-idf/issues/10788

Related to https://github.com/espressif/esp-idf/issues/10959
This commit is contained in:
radim.karnis
2023-03-30 14:52:45 +02:00
committed by Radim Karniš
parent 4dfbeb38d3
commit 0e9c85ed2a
2 changed files with 33 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
esptool/__init__.py
View File

@@ -811,11 +811,17 @@ def main(argv=None, esp=None):
if hasattr(args, "flash_size"): if hasattr(args, "flash_size"):
print("Configuring flash size...") print("Configuring flash size...")
detect_flash_size(esp, args) if args.flash_size == "detect":
if args.flash_size != "keep": # TODO: should set this even with 'keep' flash_size = detect_flash_size(esp, args)
esp.flash_set_parameters(flash_size_bytes(args.flash_size)) elif args.flash_size == "keep":
flash_size = detect_flash_size(esp, args=None)
else:
flash_size = args.flash_size
if flash_size is not None: # Secure download mode
esp.flash_set_parameters(flash_size_bytes(flash_size))
# Check if stub supports chosen flash size # Check if stub supports chosen flash size
if esp.IS_STUB and args.flash_size in ("32MB", "64MB", "128MB"): if esp.IS_STUB and flash_size in ("32MB", "64MB", "128MB"):
print( print(
"WARNING: Flasher stub doesn't fully support flash size larger " "WARNING: Flasher stub doesn't fully support flash size larger "
"than 16MB, in case of failure use --no-stub." "than 16MB, in case of failure use --no-stub."

38
esptool/cmds.py
View File

@@ -208,24 +208,30 @@ def dump_mem(esp, args):
print("Done!") print("Done!")
def detect_flash_size(esp, args): def detect_flash_size(esp, args=None):
if args.flash_size == "detect": # TODO: Remove the dependency on args in the next major release (v5.0)
if esp.secure_download_mode: if esp.secure_download_mode:
if args is not None and args.flash_size == "detect":
raise FatalError( raise FatalError(
"Detecting flash size is not supported in secure download mode. " "Detecting flash size is not supported in secure download mode. "
"Need to manually specify flash size." "Need to manually specify flash size."
) )
flash_id = esp.flash_id()
size_id = flash_id >> 16
args.flash_size = DETECTED_FLASH_SIZES.get(size_id)
if args.flash_size is None:
print(
"Warning: Could not auto-detect Flash size (FlashID=0x%x, SizeID=0x%x),"
" defaulting to 4MB" % (flash_id, size_id)
)
args.flash_size = "4MB"
else: else:
print("Auto-detected Flash size:", args.flash_size) return None
flash_id = esp.flash_id()
size_id = flash_id >> 16
flash_size = DETECTED_FLASH_SIZES.get(size_id)
if args is not None and args.flash_size == "detect":
if flash_size is None:
flash_size = "4MB"
print(
"Warning: Could not auto-detect Flash size "
f"(FlashID={flash_id:#x}, SizeID={size_id:#x}), defaulting to 4MB"
)
else:
print("Auto-detected Flash size:", flash_size)
args.flash_size = flash_size
return flash_size
def _update_image_flash_params(esp, address, args, image): def _update_image_flash_params(esp, address, args, image):
@@ -456,8 +462,10 @@ def write_flash(esp, args):
) )
# verify file sizes fit in flash # verify file sizes fit in flash
if args.flash_size != "keep": # TODO: check this even with 'keep' flash_end = flash_size_bytes(
flash_end = flash_size_bytes(args.flash_size) detect_flash_size(esp) if args.flash_size == "keep" else args.flash_size
)
if flash_end is not None: # Secure download mode
for address, argfile in args.addr_filename: for address, argfile in args.addr_filename:
argfile.seek(0, os.SEEK_END) argfile.seek(0, os.SEEK_END)
if address + argfile.tell() > flash_end: if address + argfile.tell() > flash_end: