summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Makefile18
-rw-r--r--README.md10
2 files changed, 14 insertions, 14 deletions
diff --git a/Makefile b/Makefile
index f561668..0e12777 100644
--- a/Makefile
+++ b/Makefile
@@ -103,15 +103,15 @@ tools: riscv-gnu-toolchain openocd
toolchain_builddir := $(builddir)/riscv-gnu-toolchain/riscv64-unknown-elf
toolchain_prefix := $(toolchain_builddir)/prefix
-RISCV_PREFIX ?= $(toolchain_prefix)
+RISCV_PATH ?= $(toolchain_prefix)
-RISCV_GCC := $(abspath $(RISCV_PREFIX)/bin/riscv64-unknown-elf-gcc)
-RISCV_GXX := $(abspath $(RISCV_PREFIX)/bin/riscv64-unknown-elf-g++)
-RISCV_OBJDUMP := $(abspath $(RISCV_PREFIX)/bin/riscv64-unknown-elf-objdump)
-RISCV_GDB := $(abspath $(RISCV_PREFIX)/bin/riscv64-unknown-elf-gdb)
-RISCV_AR := $(abspath $(RISCV_PREFIX)/bin/riscv64-unknown-elf-ar)
+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_PREFIX)/bin):$(PATH)
+PATH := $(abspath $(RISCV_PATH)/bin):$(PATH)
$(RISCV_GCC) $(RISCV_GXX) $(RISCV_OBJDUMP) $(RISCV_GDB) $(RISCV_AR): $(toolchain_builddir)/install.stamp
touch -c $@
@@ -151,8 +151,8 @@ toolchain-clean:
openocd_builddir := $(builddir)/openocd
openocd_prefix := $(openocd_builddir)/prefix
-RISCV_OPENOCD_PREFIX ?= $(openocd_prefix)
-RISCV_OPENOCD ?= $(RISCV_OPENOCD_PREFIX)/bin/openocd
+RISCV_OPENOCD_PATH ?= $(openocd_prefix)
+RISCV_OPENOCD ?= $(RISCV_OPENOCD_PATH)/bin/openocd
.PHONY: openocd
openocd: $(RISCV_OPENOCD)
diff --git a/README.md b/README.md
index fe5c25e..ad0cf7a 100644
--- a/README.md
+++ b/README.md
@@ -49,17 +49,17 @@ https://sifive.com/products/tools
For OpenOCD and/or RISC-V GNU Toolchain,
download the .tar.gz for your platform, and unpack it to
-your desired location. Then, use the `RISC_PREFIX` and `RISCV_OPENOCD_PREFIX`
+your desired location. Then, use the `RISC_PATH` and `RISCV_OPENOCD_PATH`
variables when attempting to use the tools:
```
cp openocd-<date>-<platform>.tar.gz /my/desired/location/
-cp riscv-gnu-toolchain-<date>-<platform>.tar.gz /my/desired/location
+cp riscv64-unknown-elf-gcc-<date>-<platform>.tar.gz /my/desired/location
cd /my/desired/location
tar -xvf openocd-<date>-<platform>.tar.gz
-tar -xvf riscv-gnu-toolchain-<date>-<platform>.tar.gz
-export RISCV_OPENOCD_PREFIX /my/desired/location/openocd
-export RISCV_PREFIX /my/desired/location/riscv-gnu-toolchain
+tar -xvf riscv64-unknown-elf-gcc-<date>-<platform>.tar.gz
+export RISCV_OPENOCD_PATH=/my/desired/location/openocd
+export RISCV_PATH=/my/desired/location/riscv64-unknown-elf-gcc-<date>-<version>
```
### Updating your SDK ###