summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNathaniel Graff <nathaniel.graff@sifive.com>2019-01-24 16:09:47 -0800
committerNathaniel Graff <nathaniel.graff@sifive.com>2019-01-24 16:09:47 -0800
commit0c3d23da9dc46b775cd41392b3de87754dfe0552 (patch)
tree8a35e62a574e6c1285f5329715ccc18637c1e568
parent19c4e3368a0fd24c031c601fd37de36c7d3bb72f (diff)
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>
-rw-r--r--Makefile8
1 files changed, 8 insertions, 0 deletions
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)