From 0c3d23da9dc46b775cd41392b3de87754dfe0552 Mon Sep 17 00:00:00 2001
From: Nathaniel Graff <nathaniel.graff@sifive.com>
Date: Thu, 24 Jan 2019 16:09:47 -0800
Subject: Put back OpenOCD into the top-level Makefile

Finding OpenOCD with RISCV_OPENOCD_PATH got accidentally dropped with
the split to the standalone Makefile. Put it back.

Signed-off-by: Nathaniel Graff <nathaniel.graff@sifive.com>
---
 Makefile | 8 ++++++++
 1 file changed, 8 insertions(+)

(limited to 'Makefile')

diff --git a/Makefile b/Makefile
index c81fae8..13810dc 100644
--- a/Makefile
+++ b/Makefile
@@ -267,6 +267,14 @@ endif
 #############################################################
 # Upload and Debug
 #############################################################
+
+ifneq ($(RISCV_OPENOCD_PATH),)
+RISCV_OPENOCD=$(RISCV_OPENOCD_PATH)/bin/openocd
+else
+#if RISCV_OPENOCD_PATH is not set, just look on the PATH
+RISCV_OPENOCD=openocd
+endif
+
 ifeq ($(BSP),mee)
 
 upload: $(PROGRAM_ELF)
-- 
cgit v1.2.1-18-gbd029