From 757fdf75c3461d54c9226450e76f0d11d9feb220 Mon Sep 17 00:00:00 2001 From: Ivan Kravets Date: Fri, 11 May 2018 02:31:11 +0300 Subject: [PATCH] Make extra images independent from a prog tool --- builder/frameworks/espidf.py | 7 +++---- builder/main.py | 2 +- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/builder/frameworks/espidf.py b/builder/frameworks/espidf.py index a01816c..edc2e90 100644 --- a/builder/frameworks/espidf.py +++ b/builder/frameworks/espidf.py @@ -304,10 +304,9 @@ env.Append( "-T", "esp32.rom.spiram_incompatible_fns.ld" ], - EXTRA_ESPTOOL_UPLOADFLAGS=[ - "0x1000", join("$BUILD_DIR", "bootloader.bin"), - "0x8000", join("$BUILD_DIR", "partitions_table.bin"), - "0x10000" + FLASH_EXTRA_IMAGES=[ + ("0x1000", join("$BUILD_DIR", "bootloader.bin")), + ("0x8000", join("$BUILD_DIR", "partitions_table.bin")) ] ) diff --git a/builder/main.py b/builder/main.py index d6f1ed5..e3f6c4e 100644 --- a/builder/main.py +++ b/builder/main.py @@ -236,7 +236,7 @@ if upload_protocol == "esptool": "$UPLOAD_FLAGS" ], - UPLOADCMD='"$PYTHONEXE" "$UPLOADER" $UPLOADERFLAGS $EXTRA_ESPTOOL_UPLOADFLAGS $SOURCE', + UPLOADCMD='"$PYTHONEXE" "$UPLOADER" $UPLOADERFLAGS $FLASH_EXTRA_IMAGES 0x10000 $SOURCE', UPLOADOTACMD='"$PYTHONEXE" "$UPLOADEROTA" $UPLOADEROTAFLAGS -f $SOURCE', )