Fix OpenOCD bootloader flashing.

h2zero · h2zero · commit 0ca8de1382c7 · 2022-07-16T23:06:18.000-06:00
Former-commit-id: aebcb65
diff --git a/platform.txt b/platform.txt
@@ -166,12 +166,11 @@ tools.openocd.program.pattern="{path}/{cmd}" {program.verbose} -f interface/{pro
 
 tools.openocd.erase.params.verbose=-d2
 tools.openocd.erase.params.quiet=-d0
-tools.openocd.erase.pattern="{path}/{cmd}" {erase.verbose} -f interface/{program.protocol}.cfg -c "{program.setup_command}" -f target/{upload.target}.cfg -c "init; halt; {upload.target} mass_erase; reset; shutdown;"
+tools.openocd.erase.pattern="{path}/{cmd}" {bootloader.verbose} -f interface/{program.protocol}.cfg -c "{program.setup_command}" -f target/{upload.target}.cfg -c "init; halt; nrf5 mass_erase; reset; shutdown;"
 
 tools.openocd.bootloader.params.verbose=-d2
 tools.openocd.bootloader.params.quiet=-d0
-tools.openocd.bootloader.pattern="{path}/{cmd}" {bootloader.verbose} -f interface/{program.protocol}.cfg -c "{program.setup_command}" -f target/{upload.target}.cfg -c "init; halt; program {runtime.platform.path}/{build.bootloader.file} verify reset; shutdown;"
-
+tools.openocd.bootloader.pattern="{path}/{cmd}" {bootloader.verbose} -f interface/{program.protocol}.cfg -c "{program.setup_command}" -f target/{upload.target}.cfg -c "init; halt; program {{runtime.platform.path}/{build.bootloader.file}} reset; shutdown;"
 #
 # blackmagic probe upload
 #

Original file line number	Diff line number	Diff line change
`@@ -166,12 +166,11 @@ tools.openocd.program.pattern="{path}/{cmd}" {program.verbose} -f interface/{pro`
`166`	`166`
`167`	`167`	`tools.openocd.erase.params.verbose=-d2`
`168`	`168`	`tools.openocd.erase.params.quiet=-d0`
`169`		`-tools.openocd.erase.pattern="{path}/{cmd}" {erase.verbose} -f interface/{program.protocol}.cfg -c "{program.setup_command}" -f target/{upload.target}.cfg -c "init; halt; {upload.target} mass_erase; reset; shutdown;"`
	`169`	`+tools.openocd.erase.pattern="{path}/{cmd}" {bootloader.verbose} -f interface/{program.protocol}.cfg -c "{program.setup_command}" -f target/{upload.target}.cfg -c "init; halt; nrf5 mass_erase; reset; shutdown;"`
`170`	`170`
`171`	`171`	`tools.openocd.bootloader.params.verbose=-d2`
`172`	`172`	`tools.openocd.bootloader.params.quiet=-d0`
`173`		`-tools.openocd.bootloader.pattern="{path}/{cmd}" {bootloader.verbose} -f interface/{program.protocol}.cfg -c "{program.setup_command}" -f target/{upload.target}.cfg -c "init; halt; program {runtime.platform.path}/{build.bootloader.file} verify reset; shutdown;"`
`174`		`-`
	`173`	`+tools.openocd.bootloader.pattern="{path}/{cmd}" {bootloader.verbose} -f interface/{program.protocol}.cfg -c "{program.setup_command}" -f target/{upload.target}.cfg -c "init; halt; program {{runtime.platform.path}/{build.bootloader.file}} reset; shutdown;"`
`175`	`174`	`#`
`176`	`175`	`# blackmagic probe upload`
`177`	`176`	`#`