alex/esp-idf
alex/esp-idf
1
0
Fork 0
mirror of https://github.com/espressif/esp-idf.git synced 2024-10-05 20:47:46 -04:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

tool: Fix 'idf.py bootloader' error if Secure Boot is enabled

Browse Source 
If Secure Boot is enabled, there's no bootloader flasher arguments in the
project (to encourage careful manual flashing), so this command would
fail with a KeyError.
This commit is contained in:
Angus Gratton 2020-07-23 15:37:27 +10:00 committed by bot
parent 35007bd443
commit cc2b5b4e13
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
tools/idf.py
View File

@ -461,8 +461,6 @@ def init_cli(verbose_output=None):
# Otherwise, if we built any binaries print a message about # Otherwise, if we built any binaries print a message about
# how to flash them # how to flash them
def print_flashing_message(title, key): def print_flashing_message(title, key):
print("\n%s build complete. To flash, run this command:" % title)
with open(os.path.join(args.build_dir, "flasher_args.json")) as f: with open(os.path.join(args.build_dir, "flasher_args.json")) as f:
flasher_args = json.load(f) flasher_args = json.load(f)
@ -470,6 +468,10 @@ def init_cli(verbose_output=None):
return _safe_relpath(os.path.join(args.build_dir, f)) return _safe_relpath(os.path.join(args.build_dir, f))
if key != "project": # flashing a single item if key != "project": # flashing a single item
if key not in flasher_args:
# This is the case for 'idf.py bootloader' if Secure Boot is on, need to follow manual flashing steps
print("\n%s build complete." % title)
return
cmd = "" cmd = ""
if (key == "bootloader"): # bootloader needs --flash-mode, etc to be passed in if (key == "bootloader"): # bootloader needs --flash-mode, etc to be passed in
cmd = " ".join(flasher_args["write_flash_args"]) + " " cmd = " ".join(flasher_args["write_flash_args"]) + " "
@ -485,6 +487,8 @@ def init_cli(verbose_output=None):
for o, f in flash_items: for o, f in flash_items:
cmd += o + " " + flasher_path(f) + " " cmd += o + " " + flasher_path(f) + " "
print("\n%s build complete. To flash, run this command:" % title)
print( print(
"%s %s -p %s -b %s --before %s --after %s --chip %s %s write_flash %s" % ( "%s %s -p %s -b %s --before %s --after %s --chip %s %s write_flash %s" % (
PYTHON, PYTHON,