summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Makefile8
-rw-r--r--rtl/top/test_smp.sv (renamed from rtl/top/smp_sim.sv)2
-rw-r--r--tb/top/smp_sim.cpp1
-rw-r--r--tb/top/test_smp.py (renamed from tb/top/smp_sim.py)0
4 files changed, 5 insertions, 6 deletions
diff --git a/Makefile b/Makefile
index f9aa42f..c383b3e 100644
--- a/Makefile
+++ b/Makefile
@@ -15,7 +15,6 @@ RBF_OUT_DIR := output_files
VERILATOR ?= verilator
COCOTB_CONFIG ?= cocotb-config
GENHTML ?= genhtml
-COCOTB_CONFIG ?= cocotb-config
CROSS_CC := $(CROSS_COMPILE)gcc
CROSS_OBJCOPY := $(CROSS_COMPILE)objcopy
CROSS_CFLAGS := -O3 -Wall -Wextra -Werror
@@ -56,7 +55,7 @@ VFLAGS ?= \
VFLAGS += -O3 --cc --exe -y $(RTL_DIR) --prefix Vtop
-LIBPYTHON = $(shell $(COCOTB_CONFIG) --libpython)
+LIBPYTHON := $(shell $(COCOTB_CONFIG) --libpython)
COCOTB_LDFLAGS := $(LDFLAGS) \
-Wl,-rpath,$(shell $(COCOTB_CONFIG) --lib-dir) \
@@ -180,7 +179,7 @@ exe/%: $(OBJ_DIR)/%/Vtop.mk
@CXXFLAGS="$(CXXFLAGS) -iquote $(ROOT)/$(TB_DIR)/top/$*" \
$(MAKE) -C $(OBJ_DIR)/$* -f Vtop.mk
-.PRECIOUS: $(OBJ_DIR)/%.mk $(SIM_OBJ_DIR)/% $(SIM_OBJ_DIR)/%.o $(SIM_OBJ_DIR)/%.cov %.bin
+.PRECIOUS: $(OBJ_DIR)/%.mk $(SIM_OBJ_DIR)/% $(SIM_OBJ_DIR)/%.o $(SIM_OBJ_DIR)/%.cov %.bin $(FST_DIR)/%
.PHONY: all clean dist demo sim
.SECONDEXPANSION:
@@ -188,7 +187,8 @@ exe/%: $(OBJ_DIR)/%/Vtop.mk
$(OBJ_DIR)/%.mk: \
$(RTL_DIR)/top/$$(word 1,$$(subst /, ,$$*)).sv \
$$(shell find $(RTL_DIR)/top/$$(dir $$*) -type f 2>/dev/null) \
- $(RTL_FILES) $(TB_FILES) $(TB_DIR)/top/$$(word 1,$$(subst /, ,$$*)).cpp \
+ $(RTL_FILES) $(TB_FILES) \
+ $$(shell find $(TB_DIR)/top/$$(word 1,$$(subst /, ,$$*)).cpp -type f 2>/dev/null) \
$$(shell find $(TB_DIR)/top/$$(dir $$*) -type f 2>/dev/null)
mkdir -p $(dir $@)
diff --git a/rtl/top/smp_sim.sv b/rtl/top/test_smp.sv
index ff4d8a1..df417c3 100644
--- a/rtl/top/smp_sim.sv
+++ b/rtl/top/test_smp.sv
@@ -1,4 +1,4 @@
-module smp_sim
+module test_smp
(
input logic clk,
rst_n,
diff --git a/tb/top/smp_sim.cpp b/tb/top/smp_sim.cpp
deleted file mode 100644
index 4b58019..0000000
--- a/tb/top/smp_sim.cpp
+++ /dev/null
@@ -1 +0,0 @@
-// No necesitamos nada aquĆ­, todo lo genera verilator+cocotb
diff --git a/tb/top/smp_sim.py b/tb/top/test_smp.py
index 1994da2..1994da2 100644
--- a/tb/top/smp_sim.py
+++ b/tb/top/test_smp.py