diff options
| author | Nathaniel Graff <nathaniel.graff@sifive.com> | 2019-01-04 17:51:13 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-01-04 17:51:13 +0000 |
| commit | 80912631a4df33a2bdd592e1fc40ff73310d56b5 (patch) | |
| tree | 2f6c1cacd70fab3eb070847daca52517e17985f6 /Makefile | |
| parent | 093255eb95393d945d4e321d1dfa614669f8834b (diff) | |
| parent | 0d260eefcf9d14e6da017254b994959923f171c7 (diff) | |
Merge pull request #130 from sifive/openocd
Fix OpenOCD path in Makefile and Add Configurations for Arty Boards
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 8 |
1 files changed, 6 insertions, 2 deletions
@@ -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) ############################################################# |