From 9bf66e496f4d77128d1c1edd3f435dd6ae1c010a Mon Sep 17 00:00:00 2001
From: Nathaniel Graff <nathaniel.graff@sifive.com>
Date: Fri, 4 Jan 2019 09:41:46 -0800
Subject: Look for OpenOCD in RISCV_OPENOCD_PATH

The README states that OpenOCD should be pointed to by
RISCV_OPENOCD_PATH, not RISCV_PATH. Fix the makefile to look in the
right place.

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

(limited to 'Makefile')

diff --git a/Makefile b/Makefile
index a25ecc7..491a3dd 100644
--- a/Makefile
+++ b/Makefile
@@ -131,17 +131,21 @@ RISCV_GXX     := $(CROSS_COMPILE)-g++
 RISCV_OBJDUMP := $(CROSS_COMPILE)-objdump
 RISCV_GDB     := $(CROSS_COMPILE)-gdb
 RISCV_AR      := $(CROSS_COMPILE)-ar
-RISCV_OPENOCD := openocd
 else
 RISCV_GCC     := $(abspath $(RISCV_PATH)/bin/$(CROSS_COMPILE)-gcc)
 RISCV_GXX     := $(abspath $(RISCV_PATH)/bin/$(CROSS_COMPILE)-g++)
 RISCV_OBJDUMP := $(abspath $(RISCV_PATH)/bin/$(CROSS_COMPILE)-objdump)
 RISCV_GDB     := $(abspath $(RISCV_PATH)/bin/$(CROSS_COMPILE)-gdb)
 RISCV_AR      := $(abspath $(RISCV_PATH)/bin/$(CROSS_COMPILE)-ar)
-RISCV_OPENOCD := $(abspath $(RISCV_PATH)/bin/openocd)
 PATH          := $(abspath $(RISCV_PATH)/bin):$(PATH)
 endif
 
+ifeq ($(RISCV_OPENOCD_PATH),)
+RISCV_OPENOCD := openocd
+else
+RISCV_OPENOCD := $(abspath $(RISCV_OPENOCD_PATH)/bin/openocd)
+endif
+
 #############################################################
 # Compiles an instance of the MEE targeted at $(BOARD)
 #############################################################
-- 
cgit v1.2.1-18-gbd029