Update DV Makefiles - CARAVEL_PATH is now determined from CARAVEL_MASTER variable
diff --git a/verilog/dv/Makefile b/verilog/dv/Makefile index 7e37e02..7895a6e 100644 --- a/verilog/dv/Makefile +++ b/verilog/dv/Makefile
@@ -19,7 +19,7 @@ .SUFFIXES: .SILENT: clean all -PATTERNS = io_ports la_test1 la_test2 +PATTERNS = io_ports la_test1 la_test2 wb_port mprj_stimulus all: ${PATTERNS} for i in ${PATTERNS}; do \
diff --git a/verilog/dv/io_ports/Makefile b/verilog/dv/io_ports/Makefile index b606905..136dbdb 100644 --- a/verilog/dv/io_ports/Makefile +++ b/verilog/dv/io_ports/Makefile
@@ -15,7 +15,8 @@ # SPDX-License-Identifier: Apache-2.0 ## Caravel Pointers -CARAVEL_PATH ?= ../../../caravel +CARAVEL_MASTER ?= caravel +CARAVEL_PATH ?= ../../../$(CARAVEL_MASTER) CARAVEL_FIRMWARE_PATH = $(CARAVEL_PATH)/verilog/dv/caravel CARAVEL_VERILOG_PATH = $(CARAVEL_PATH)/verilog CARAVEL_RTL_PATH = $(CARAVEL_VERILOG_PATH)/rtl
diff --git a/verilog/dv/la_test1/Makefile b/verilog/dv/la_test1/Makefile index 39f3dce..51722f5 100644 --- a/verilog/dv/la_test1/Makefile +++ b/verilog/dv/la_test1/Makefile
@@ -15,7 +15,9 @@ # SPDX-License-Identifier: Apache-2.0 ## Caravel Pointers -CARAVEL_PATH ?= ../../../caravel +# Path to caravel from user project root +CARAVEL_MASTER ?= caravel +CARAVEL_PATH ?= ../../../$(CARAVEL_MASTER) CARAVEL_FIRMWARE_PATH = $(CARAVEL_PATH)/verilog/dv/caravel CARAVEL_VERILOG_PATH = $(CARAVEL_PATH)/verilog CARAVEL_RTL_PATH = $(CARAVEL_VERILOG_PATH)/rtl
diff --git a/verilog/dv/la_test2/Makefile b/verilog/dv/la_test2/Makefile index a101e05..b5feea7 100644 --- a/verilog/dv/la_test2/Makefile +++ b/verilog/dv/la_test2/Makefile
@@ -15,7 +15,9 @@ # SPDX-License-Identifier: Apache-2.0 ## Caravel Pointers -CARAVEL_PATH ?= ../../../caravel +# Path to caravel from user project root +CARAVEL_MASTER ?= caravel +CARAVEL_PATH ?= ../../../$(CARAVEL_MASTER) CARAVEL_FIRMWARE_PATH = $(CARAVEL_PATH)/verilog/dv/caravel CARAVEL_VERILOG_PATH = $(CARAVEL_PATH)/verilog CARAVEL_RTL_PATH = $(CARAVEL_VERILOG_PATH)/rtl
diff --git a/verilog/dv/mprj_stimulus/Makefile b/verilog/dv/mprj_stimulus/Makefile index d94ea22..d159e15 100644 --- a/verilog/dv/mprj_stimulus/Makefile +++ b/verilog/dv/mprj_stimulus/Makefile
@@ -15,7 +15,9 @@ # SPDX-License-Identifier: Apache-2.0 ## Caravel Pointers -CARAVEL_PATH ?= ../../../caravel +# Path to caravel from user project root +CARAVEL_MASTER ?= caravel +CARAVEL_PATH ?= ../../../$(CARAVEL_MASTER) CARAVEL_FIRMWARE_PATH = $(CARAVEL_PATH)/verilog/dv/caravel CARAVEL_VERILOG_PATH = $(CARAVEL_PATH)/verilog CARAVEL_RTL_PATH = $(CARAVEL_VERILOG_PATH)/rtl
diff --git a/verilog/dv/wb_port/Makefile b/verilog/dv/wb_port/Makefile index d7f6e7b..d6cb12d 100644 --- a/verilog/dv/wb_port/Makefile +++ b/verilog/dv/wb_port/Makefile
@@ -15,7 +15,9 @@ # SPDX-License-Identifier: Apache-2.0 ## Caravel Pointers -CARAVEL_PATH ?= ../../../caravel +# Path to caravel from user project root +CARAVEL_MASTER ?= caravel +CARAVEL_PATH ?= ../../../$(CARAVEL_MASTER) CARAVEL_FIRMWARE_PATH = $(CARAVEL_PATH)/verilog/dv/caravel CARAVEL_VERILOG_PATH = $(CARAVEL_PATH)/verilog CARAVEL_RTL_PATH = $(CARAVEL_VERILOG_PATH)/rtl