Merge branch 'main' of https://github.com/efabless/caravel_project_example into main
diff --git a/verilog/dv/io_ports/Makefile b/verilog/dv/io_ports/Makefile index 136dbdb..5eb7e8d 100644 --- a/verilog/dv/io_ports/Makefile +++ b/verilog/dv/io_ports/Makefile
@@ -15,8 +15,8 @@ # SPDX-License-Identifier: Apache-2.0 ## Caravel Pointers -CARAVEL_MASTER ?= caravel -CARAVEL_PATH ?= ../../../$(CARAVEL_MASTER) +CARAVEL_ROOT ?= caravel +CARAVEL_PATH ?= ../../../$(CARAVEL_ROOT) 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 51722f5..dfb1ce6 100644 --- a/verilog/dv/la_test1/Makefile +++ b/verilog/dv/la_test1/Makefile
@@ -16,8 +16,8 @@ ## Caravel Pointers # Path to caravel from user project root -CARAVEL_MASTER ?= caravel -CARAVEL_PATH ?= ../../../$(CARAVEL_MASTER) +CARAVEL_ROOT ?= caravel +CARAVEL_PATH ?= ../../../$(CARAVEL_ROOT) 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 b5feea7..210884a 100644 --- a/verilog/dv/la_test2/Makefile +++ b/verilog/dv/la_test2/Makefile
@@ -16,8 +16,8 @@ ## Caravel Pointers # Path to caravel from user project root -CARAVEL_MASTER ?= caravel -CARAVEL_PATH ?= ../../../$(CARAVEL_MASTER) +CARAVEL_ROOT ?= caravel +CARAVEL_PATH ?= ../../../$(CARAVEL_ROOT) 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 d159e15..a37cdf8 100644 --- a/verilog/dv/mprj_stimulus/Makefile +++ b/verilog/dv/mprj_stimulus/Makefile
@@ -16,8 +16,8 @@ ## Caravel Pointers # Path to caravel from user project root -CARAVEL_MASTER ?= caravel -CARAVEL_PATH ?= ../../../$(CARAVEL_MASTER) +CARAVEL_ROOT ?= caravel +CARAVEL_PATH ?= ../../../$(CARAVEL_ROOT) 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 d6cb12d..03d1122 100644 --- a/verilog/dv/wb_port/Makefile +++ b/verilog/dv/wb_port/Makefile
@@ -16,8 +16,8 @@ ## Caravel Pointers # Path to caravel from user project root -CARAVEL_MASTER ?= caravel -CARAVEL_PATH ?= ../../../$(CARAVEL_MASTER) +CARAVEL_ROOT ?= caravel +CARAVEL_PATH ?= ../../../$(CARAVEL_ROOT) CARAVEL_FIRMWARE_PATH = $(CARAVEL_PATH)/verilog/dv/caravel CARAVEL_VERILOG_PATH = $(CARAVEL_PATH)/verilog CARAVEL_RTL_PATH = $(CARAVEL_VERILOG_PATH)/rtl