Simulation setup improvements:

 * Use cocotb-path to get cocotb install dir
 * Use relative paths to find source code for simulation
 * Remove rm dual_serial test
 * Ignore build directory

diff --git a/.gitignore b/.gitignore
index d703adb438927f82dd7e4ee9ae2509103b25c745..b0de9bd422ab8e312d242b9f2d932ea11fd3e0e3 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -5,3 +5,4 @@
 results.xml
 *.ghw
 sim/ghdl/bench_idcode
+build
\ No newline at end of file

diff --git a/sim/cocotb/controller/Makefile b/sim/cocotb/controller/Makefile
index 336d7e55acbf600d1ddcd2adfdebcbb1baba8b65..708e50d930958d19da3546a612c1c88f2c537806 100644 (file)
--- a/sim/cocotb/controller/Makefile
+++ b/sim/cocotb/controller/Makefile
@@ -1,5 +1,6 @@
-COCOTB=$(HOME)/eda/code/cocotb
-VHDLDIR=$(HOME)/eda/code/c4m_jtag/rtl/vhdl
+PWD=$(realpath .)
+TOPDIR=$(realpath ../../..)
+VHDLDIR=$(TOPDIR)/rtl/vhdl
 VHDL_SOURCES = \
   $(VHDLDIR)/c4m_jtag_pkg.vhdl \
   $(VHDLDIR)/c4m_jtag_tap_fsm.vhdl \
@@ -15,5 +16,7 @@ SIM=ghdl
 GPI_IMPL=vhpi
 SIM_ARGS=--wave=test.ghw
 
-include $(COCOTB)/makefiles/Makefile.inc
-include $(COCOTB)/makefiles/Makefile.sim
+COCOTBDIR=$(shell cocotb-path)
+
+include $(COCOTBDIR)/makefiles/Makefile.inc
+include $(COCOTBDIR)/makefiles/Makefile.sim

diff --git a/sim/cocotb/dual_parallel/Makefile b/sim/cocotb/dual_parallel/Makefile
index f692e4fb55604ab00fc4145f61e2472fc89daaf6..e7da7cd5d00507f10bd4bb50164845760bc38093 100644 (file)
--- a/sim/cocotb/dual_parallel/Makefile
+++ b/sim/cocotb/dual_parallel/Makefile
@@ -1,5 +1,6 @@
-COCOTB=$(HOME)/eda/code/cocotb
-VHDLDIR=$(HOME)/eda/code/c4m_jtag/rtl/vhdl
+PWD=$(realpath .)
+TOPDIR=$(realpath ../../..)
+VHDLDIR=$(TOPDIR)/rtl/vhdl
 VHDL_SOURCES = \
   $(VHDLDIR)/c4m_jtag_pkg.vhdl \
   $(VHDLDIR)/c4m_jtag_tap_fsm.vhdl \
@@ -16,5 +17,7 @@ SIM=ghdl
 GPI_IMPL=vhpi
 SIM_ARGS=--wave=test.ghw
 
-include $(COCOTB)/makefiles/Makefile.inc
-include $(COCOTB)/makefiles/Makefile.sim
+COCOTBDIR=$(shell cocotb-path)
+
+include $(COCOTBDIR)/makefiles/Makefile.inc
+include $(COCOTBDIR)/makefiles/Makefile.sim

diff --git a/sim/cocotb/dual_serial/TODO b/sim/cocotb/dual_serial/TODO
deleted file mode 100644 (file)
index e69de29..0000000