From 96d4987345ee22cc81c78976bd39ac2b1647dba6 Mon Sep 17 00:00:00 2001
From: Ayke van Laethem <aykevanlaethem@gmail.com>
Date: Tue, 29 Oct 2019 13:41:59 +0100
Subject: [PATCH] main: remove ocd-daemon property

This fixes a crash crash with the -ocd-output flag.
---
 main.go   | 2 +-
 target.go | 4 ----
 2 files changed, 1 insertion(+), 5 deletions(-)

diff --git a/main.go b/main.go
index 2077edee..9f03ff36 100644
--- a/main.go
+++ b/main.go
@@ -543,7 +543,7 @@ func FlashGDB(pkgName, target, port string, ocdOutput bool, config *BuildConfig)
 				// Make it clear which output is from the daemon.
 				w := &ColorWriter{
 					Out:    os.Stderr,
-					Prefix: spec.OCDDaemon[0] + ": ",
+					Prefix: "openocd: ",
 					Color:  TermColorYellow,
 				}
 				daemon.Stdout = w
diff --git a/target.go b/target.go
index 655b5f24..8af138bc 100644
--- a/target.go
+++ b/target.go
@@ -39,7 +39,6 @@ type TargetSpec struct {
 	ExtraFiles       []string `json:"extra-files"`
 	Emulator         []string `json:"emulator"`
 	FlashCommand     string   `json:"flash-command"`
-	OCDDaemon        []string `json:"ocd-daemon"`
 	GDB              string   `json:"gdb"`
 	PortReset        string   `json:"flash-1200-bps-reset"`
 	FlashMethod      string   `json:"flash-method"`
@@ -93,9 +92,6 @@ func (spec *TargetSpec) copyProperties(spec2 *TargetSpec) {
 	if spec2.FlashCommand != "" {
 		spec.FlashCommand = spec2.FlashCommand
 	}
-	if len(spec2.OCDDaemon) != 0 {
-		spec.OCDDaemon = spec2.OCDDaemon
-	}
 	if spec2.GDB != "" {
 		spec.GDB = spec2.GDB
 	}