From 19d5be32d9f26badb9551c78a899ebd58c07f819 Mon Sep 17 00:00:00 2001 From: Ivan Kravets Date: Sat, 25 Nov 2017 01:07:05 +0200 Subject: [PATCH 1/2] Use real flash mode and frequency for bootloader --- tools/platformio-build.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/platformio-build.py b/tools/platformio-build.py index 09e345c0f6c..06ef8077865 100644 --- a/tools/platformio-build.py +++ b/tools/platformio-build.py @@ -118,7 +118,7 @@ ], UPLOADERFLAGS=[ - "0x1000", '"%s"' % join(FRAMEWORK_DIR, "tools", "sdk", "bin", "bootloader_dio_40m.bin"), + "0x1000", '"%s"' % join(FRAMEWORK_DIR, "tools", "sdk", "bin", "bootloader_${BOARD_FLASH_MODE}_${__get_board_f_flash(__env__)}.bin"), "0x8000", '"%s"' % join("$BUILD_DIR", "partitions.bin"), "0xe000", '"%s"' % join(FRAMEWORK_DIR, "tools", "partitions", "boot_app0.bin"), "0x10000" From 88322ae1a09abe89b6fa0fe3f0c1f6ec87cd2a4f Mon Sep 17 00:00:00 2001 From: Ivan Kravets Date: Sat, 25 Nov 2017 02:11:50 +0200 Subject: [PATCH 2/2] Use real flash mode and frequency for bootloader --- tools/platformio-build.py | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/tools/platformio-build.py b/tools/platformio-build.py index 06ef8077865..9e197e3326e 100644 --- a/tools/platformio-build.py +++ b/tools/platformio-build.py @@ -103,7 +103,19 @@ ] ) + +def _get_board_flash_mode(env): + mode = env.subst("$BOARD_FLASH_MODE") + if mode == "qio": + return "dio" + elif mode == "qout": + return "dout" + return mode + + env.Append( + __get_board_flash_mode=_get_board_flash_mode, + LIBSOURCE_DIRS=[ join(FRAMEWORK_DIR, "libraries") ], @@ -125,6 +137,9 @@ ] ) +if "$BOARD_FLASH_MODE" in env['UPLOADERFLAGS']: + env['UPLOADERFLAGS'][env['UPLOADERFLAGS'].index("$BOARD_FLASH_MODE")] = "${__get_board_flash_mode(__env__)}" + env.Replace( UPLOADER=join(FRAMEWORK_DIR, "tools", "esptool.py") )