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

fix(esp32-s3): Allow stub flasher execution with active Secure Boot

Browse Source
This commit is contained in:
Radim Karniš
2025-07-28 22:00:27 +02:00
parent 5338ea054e
commit 7ba285bb03
1 changed files with 24 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
esptool/loader.py
View File

@@ -1284,6 +1284,10 @@ class ESPLoader(object):
log.print("Stub flasher is already running. No upload is necessary.") log.print("Stub flasher is already running. No upload is necessary.")
return self.STUB_CLASS(self) if self.STUB_CLASS is not None else self return self.STUB_CLASS(self) if self.STUB_CLASS is not None else self
secure_boot_workflow = (
self.CHIP_NAME == "ESP32-S3" and self.get_secure_boot_enabled()
)
# Upload # Upload
log.print("Uploading stub flasher...") log.print("Uploading stub flasher...")
for field in [stub.text, stub.data]: for field in [stub.text, stub.data]:
@@ -1296,8 +1300,24 @@ class ESPLoader(object):
from_offs = seq * self.ESP_RAM_BLOCK from_offs = seq * self.ESP_RAM_BLOCK
to_offs = from_offs + self.ESP_RAM_BLOCK to_offs = from_offs + self.ESP_RAM_BLOCK
self.mem_block(field[from_offs:to_offs], seq) self.mem_block(field[from_offs:to_offs], seq)
log.print("Running stub flasher...") log.print("Running stub flasher...")
self.mem_finish(stub.entry) if not secure_boot_workflow:
self.mem_finish(stub.entry)
else:
# Bug in ESP32-S3 ROM prevents stub execution if secure boot is enabled
# Hijack the `read` function in ROM to point to the stub entrypoint
# got with GDB - p &rom_spiflash_legacy_funcs.read
rom_spiflash_legacy_funcs_read_ptr = 0x3FCEF688
self.mem_finish(0) # Finish uploading to RAM but don't run the stub yet
stored_read_pointer = self.read_reg(rom_spiflash_legacy_funcs_read_ptr)
self.write_reg(rom_spiflash_legacy_funcs_read_ptr, stub.entry)
self.command( # Trigger the `read` in ROM to jump to the stub entrypoint
self.ESP_CMDS["READ_FLASH_SLOW"],
struct.pack("<II", 0, 0),
wait_response=False,
)
try: try:
p = self.read() p = self.read()
except StopIteration: except StopIteration:
@@ -1309,6 +1329,9 @@ class ESPLoader(object):
if p != b"OHAI": if p != b"OHAI":
raise FatalError(f"Failed to start stub flasher. Unexpected response: {p}") raise FatalError(f"Failed to start stub flasher. Unexpected response: {p}")
if secure_boot_workflow:
# Restore the original `read` function pointer
self.write_reg(rom_spiflash_legacy_funcs_read_ptr, stored_read_pointer)
log.stage(finish=True) log.stage(finish=True)
log.print("Stub flasher running.") log.print("Stub flasher running.")
return self.STUB_CLASS(self) if self.STUB_CLASS is not None else self return self.STUB_CLASS(self) if self.STUB_CLASS is not None else self