From 018a4cd3d6392e0db51450bdb3de99e20300daac Mon Sep 17 00:00:00 2001 From: Ivan Grokhotkov Date: Fri, 22 Aug 2025 11:20:15 +0200 Subject: [PATCH] fix(tools): use nvram.esp32s3.efuse device in qemu_ext.py Related to https://github.com/espressif/esp-idf/issues/17258 --- tools/idf_py_actions/qemu_ext.py | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/tools/idf_py_actions/qemu_ext.py b/tools/idf_py_actions/qemu_ext.py index 5375b28cd1..ded018fad0 100644 --- a/tools/idf_py_actions/qemu_ext.py +++ b/tools/idf_py_actions/qemu_ext.py @@ -43,7 +43,6 @@ class QemuTarget: qemu_args: str # chip-specific arguments to pass to QEMU default_efuse: bytes # default efuse values for the target boot_mode_arg: str = '' # additional arguments to pass to QEMU when booting in download mode - efuse_device: str = '' # efuse device name, if different from the target nvram.{target}.efuse # To generate the default eFuse values, follow the instructions in @@ -62,8 +61,7 @@ QEMU_TARGETS: Dict[str, QemuTarget] = { '00000000000000000000000000000000000000000000000000000000000000000000000000000000' '00000000'), '-global driver=esp32.gpio,property=strap_mode,value=0x0f', - 'nvram.esp32.efuse'), - + ), 'esp32c3': QemuTarget( 'esp32c3', 'qemu-system-riscv32', @@ -98,8 +96,7 @@ QEMU_TARGETS: Dict[str, QemuTarget] = { '00000000000000000000000000000000000000000000000000000000000000000000000000000000' '000000000000000000000000000000000000000000000000'), '-global driver=esp32c3.gpio,property=strap_mode,value=0x02', - 'nvram.esp32c3.efuse'), - + ), 'esp32s3': QemuTarget( 'esp32s3', 'qemu-system-xtensa', @@ -134,7 +131,7 @@ QEMU_TARGETS: Dict[str, QemuTarget] = { '00000000000000000000000000000000000000000000000000000000000000000000000000000000' '000000000000000000000000000000000000000000000000'), '-global driver=esp32s3.gpio,property=strap_mode,value=0x07', - 'nvram.esp32c3.efuse'), # Not esp32s3, QEMU-201 + ), } @@ -268,9 +265,12 @@ def action_extensions(base_actions: Dict, project_path: str) -> Dict: ] qemu_args += [ - '-drive', f'file={efuse_bin_path},if=none,format=raw,id=efuse', - '-global', f'driver={qemu_target_info.efuse_device},property=drive,value=efuse', - '-global', f'driver=timer.{target}.timg,property=wdt_disable,value=true', + '-drive', + f'file={efuse_bin_path},if=none,format=raw,id=efuse', + '-global', + f'driver=nvram.{target}.efuse,property=drive,value=efuse', + '-global', + f'driver=timer.{target}.timg,property=wdt_disable,value=true', ] # Quad PSRAM should work by default; octal requires a flag