diff options
| author | Megan Wachs <megan@sifive.com> | 2017-05-17 13:54:02 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-05-17 13:54:02 -0700 |
| commit | 4788b0e137ebeb456ff50f697a43661647fd6498 (patch) | |
| tree | a412fd558fe4fe8e7129da815c05d3bc3b79c491 /Makefile | |
| parent | e7bc9996403c9cd375aa20e5fd1b5b933b92c081 (diff) | |
| parent | 05cb35bb1700ce1b93a8502ce2d7e4ca3f22e3fd (diff) | |
Merge pull request #59 from sifive/use_precompiled
Update Makefile and README with how to use precompiled binaries.
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 20 |
1 files changed, 12 insertions, 8 deletions
@@ -103,13 +103,15 @@ tools: riscv-gnu-toolchain openocd toolchain_builddir := $(builddir)/riscv-gnu-toolchain/riscv64-unknown-elf toolchain_prefix := $(toolchain_builddir)/prefix -RISCV_GCC := $(abspath $(toolchain_prefix)/bin/riscv64-unknown-elf-gcc) -RISCV_GXX := $(abspath $(toolchain_prefix)/bin/riscv64-unknown-elf-g++) -RISCV_OBJDUMP := $(abspath $(toolchain_prefix)/bin/riscv64-unknown-elf-objdump) -RISCV_GDB := $(abspath $(toolchain_prefix)/bin/riscv64-unknown-elf-gdb) -RISCV_AR := $(abspath $(toolchain_prefix)/bin/riscv64-unknown-elf-ar) +RISCV_PATH ?= $(toolchain_prefix) -PATH := $(abspath $(toolchain_prefix)/bin):$(PATH) +RISCV_GCC := $(abspath $(RISCV_PATH)/bin/riscv64-unknown-elf-gcc) +RISCV_GXX := $(abspath $(RISCV_PATH)/bin/riscv64-unknown-elf-g++) +RISCV_OBJDUMP := $(abspath $(RISCV_PATH)/bin/riscv64-unknown-elf-objdump) +RISCV_GDB := $(abspath $(RISCV_PATH)/bin/riscv64-unknown-elf-gdb) +RISCV_AR := $(abspath $(RISCV_PATH)/bin/riscv64-unknown-elf-ar) + +PATH := $(abspath $(RISCV_PATH)/bin):$(PATH) $(RISCV_GCC) $(RISCV_GXX) $(RISCV_OBJDUMP) $(RISCV_GDB) $(RISCV_AR): $(toolchain_builddir)/install.stamp touch -c $@ @@ -148,7 +150,9 @@ toolchain-clean: # initializing the target. openocd_builddir := $(builddir)/openocd openocd_prefix := $(openocd_builddir)/prefix -RISCV_OPENOCD := $(openocd_prefix)/bin/openocd + +RISCV_OPENOCD_PATH ?= $(openocd_prefix) +RISCV_OPENOCD ?= $(RISCV_OPENOCD_PATH)/bin/openocd .PHONY: openocd openocd: $(RISCV_OPENOCD) @@ -215,7 +219,7 @@ GDB_UPLOAD_CMDS += -ex "quit" upload: $(RISCV_OPENOCD) $(OPENOCDARGS) & \ - $(RISCV_GDB) $(PROGRAM_DIR)/$(PROGRAM) $(GDB_UPLOAD_ARGS) $(GDB_UPLOAD_CMDS);\ + $(RISCV_GDB) $(PROGRAM_DIR)/$(PROGRAM) $(GDB_UPLOAD_ARGS) $(GDB_UPLOAD_CMDS) && \ echo "Successfully uploaded '$(PROGRAM)' to $(BOARD)." ############################################################# |