From 88a478d28e5cbdef18de7318e359771872bd1c70 Mon Sep 17 00:00:00 2001 From: fvanroie Date: Sat, 12 Mar 2022 14:32:09 +0100 Subject: [PATCH] Use correct mcu chip for S2 bootloader #250 --- tools/esp_merge_bin.py | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/tools/esp_merge_bin.py b/tools/esp_merge_bin.py index 12862dba..727dddec 100644 --- a/tools/esp_merge_bin.py +++ b/tools/esp_merge_bin.py @@ -49,7 +49,10 @@ def copy_merge_bins(source, target, env): name = name.replace('_4MB', '').replace('_8MB', '').replace('_16MB', '').replace('_32MB', '') flash_size = env.GetProjectOption("board_upload.flash_size") - bootloader = "{}tools{}sdk{}esp32{}bin{}bootloader_dio_40m.bin".format(FRAMEWORK_DIR, os.path.sep, os.path.sep, os.path.sep, os.path.sep, os.path.sep) + board = env.BoardConfig() + mcu = board.get("build.mcu", "esp32") + + bootloader = "{}tools{}sdk{}{}{}bin{}bootloader_dio_40m.bin".format(FRAMEWORK_DIR, os.path.sep, os.path.sep, mcu, os.path.sep, os.path.sep, os.path.sep) if not os.path.isfile(bootloader): bootloader = "{}tools{}sdk{}bin{}bootloader_dio_40m.bin".format(FRAMEWORK_DIR, os.path.sep, os.path.sep, os.path.sep, os.path.sep, os.path.sep) partitions = "{}{}partitions.bin".format(env.subst("$BUILD_DIR"), os.path.sep) @@ -77,7 +80,7 @@ def copy_merge_bins(source, target, env): print(firmware_dst) print(flash_size) - process = subprocess.Popen(['python', 'tools/esptool_with_merge_bin.py', '--chip', 'esp32', 'merge_bin', '--output', firmware_dst, '--flash_mode', 'dio', '--flash_size', flash_size, '0x1000', bootloader, '0x8000', partitions, '0xe000', boot_app0, '0x10000', firmware_src], + process = subprocess.Popen(['python', 'tools/esptool_with_merge_bin.py', '--chip', mcu, 'merge_bin', '--output', firmware_dst, '--flash_mode', 'dio', '--flash_size', flash_size, '0x1000', bootloader, '0x8000', partitions, '0xe000', boot_app0, '0x10000', firmware_src], stdout=subprocess.PIPE, stderr=subprocess.PIPE) stdout, stderr = process.communicate()