From f7095baa9d9a23ad096084380a9457730ea2ac68 Mon Sep 17 00:00:00 2001
From: Megan Wachs <megan@sifive.com>
Date: Mon, 15 May 2017 10:17:58 -0700
Subject: [PATCH] debug: fix the make target for debug-check

---
 debug/Makefile | 21 ++-------------------
 1 file changed, 2 insertions(+), 19 deletions(-)

diff --git a/debug/Makefile b/debug/Makefile
index 9b36e54..1ea5752 100644
--- a/debug/Makefile
+++ b/debug/Makefile
@@ -1,27 +1,10 @@
 RISCV_SIM ?= spike
 XLEN ?= 64
 
-OPENOCD_INSTALL ?= $(abspath .)/openocd-install
-OPENOCD_VERSION = d8683119c0a1aa88320c7a6d4f0d6f63a5f976c5
-
-OPENOCD_DIR = $(OPENOCD_INSTALL)_$(OPENOCD_VERSION)/
-
-$(OPENOCD_DIR)/bin/openocd:
-	rm -rf riscv-openocd
-	git clone http://github.com/riscv/riscv-openocd.git
-	cd riscv-openocd ; \
-	git checkout $(OPENOCD_VERSION) ; \
-	./bootstrap ; \
-	./configure --enable-remote_bitbang --prefix=$(OPENOCD_INSTALL)_$(OPENOCD_VERSION) --disable-werror; \
-	make ; \
-	make install
-
-install_openocd: $(OPENOCD_DIR)/bin/openocd
-
 src_dir ?= .
 GDBSERVER_PY = $(src_dir)/gdbserver.py
 
-default:	spike$(XLEN).log
+default: spike$(XLEN).log
 
 all:	pylint spike32.log spike64.log
 
@@ -29,7 +12,7 @@ pylint:
 	pylint --rcfile=pylint.rc *.py
 
 %.log:
-	$(GDBSERVER_PY) --isolate --$(subst .log,,$@) --server_cmd $(OPENOCD_DIR)/bin/openocd \
+	$(GDBSERVER_PY) --isolate --$(subst .log,,$@) --sim_cmd $(RISCV)/bin/$(RISCV_SIM) \
 	    > $@ 2>&1 || (sed s/^/$@:\ / $@ && false)
 
 clean:
-- 
2.30.2