Make extra images independent from a prog tool

ivankravets · Curclamas · commit 1edd99d62bd6 · 2018-08-21T16:37:15.000+02:00
diff --git a/tools/platformio-build.py b/tools/platformio-build.py
@@ -120,11 +120,10 @@
         "-u", "__cxx_fatal_exception"
     ],
 
-    EXTRA_ESPTOOL_UPLOADFLAGS=[
-        "0x1000", join(FRAMEWORK_DIR, "tools", "sdk", "bin", "bootloader_${BOARD_FLASH_MODE}_${__get_board_f_flash(__env__)}.bin"),
-        "0x8000", join(env.subst("$BUILD_DIR"), "partitions.bin"),
-        "0xe000", join(FRAMEWORK_DIR, "tools", "partitions", "boot_app0.bin"),
-        "0x10000"
+    FLASH_EXTRA_IMAGES=[
+        ("0x1000", join(FRAMEWORK_DIR, "tools", "sdk", "bin", "bootloader_${BOARD_FLASH_MODE}_${__get_board_f_flash(__env__)}.bin")),
+        ("0x8000", join(env.subst("$BUILD_DIR"), "partitions.bin")),
+        ("0xe000", join(FRAMEWORK_DIR, "tools", "partitions", "boot_app0.bin"))
     ]
 )
 

Original file line number	Diff line number	Diff line change
`@@ -120,11 +120,10 @@`
`120`	`120`	`"-u", "__cxx_fatal_exception"`
`121`	`121`	`],`
`122`	`122`
`123`		`- EXTRA_ESPTOOL_UPLOADFLAGS=[`
`124`		`- "0x1000", join(FRAMEWORK_DIR, "tools", "sdk", "bin", "bootloader_${BOARD_FLASH_MODE}_${__get_board_f_flash(__env__)}.bin"),`
`125`		`- "0x8000", join(env.subst("$BUILD_DIR"), "partitions.bin"),`
`126`		`- "0xe000", join(FRAMEWORK_DIR, "tools", "partitions", "boot_app0.bin"),`
`127`		`- "0x10000"`
	`123`	`+ FLASH_EXTRA_IMAGES=[`
	`124`	`+ ("0x1000", join(FRAMEWORK_DIR, "tools", "sdk", "bin", "bootloader_${BOARD_FLASH_MODE}_${__get_board_f_flash(__env__)}.bin")),`
	`125`	`+ ("0x8000", join(env.subst("$BUILD_DIR"), "partitions.bin")),`
	`126`	`+ ("0xe000", join(FRAMEWORK_DIR, "tools", "partitions", "boot_app0.bin"))`
`128`	`127`	`]`
`129`	`128`	`)`
`130`	`129`