From 3687cf3dac52feddbfefa94fb391d396656ef869 Mon Sep 17 00:00:00 2001
From: Thomas Benz <tbenz@iis.ee.ethz.ch>
Date: Tue, 3 Oct 2023 13:33:50 +0200
Subject: [PATCH] Fixes

---
 idma.mk        |  3 ++-
 jobs/jobs.json | 18 ++++++------------
 2 files changed, 8 insertions(+), 13 deletions(-)

diff --git a/idma.mk b/idma.mk
index d1d67fb4..26f9eee2 100644
--- a/idma.mk
+++ b/idma.mk
@@ -270,6 +270,7 @@ IDMA_VCS_ARGS    := -full64 \
 			   		-debug_access+r \
 			   		-j 8 \
 			   		-CFLAGS "-Os"
+IDMA_VCS_TB      ?=
 IDMA_VCS_PARAMS  ?=
 
 $(IDMA_VCS_DIR)/compile.sh: $(IDMA_BENDER_FILES) $(IDMA_TB_ALL) $(IDMA_RTL_ALL)
@@ -283,7 +284,7 @@ idma_vcs_compile: $(IDMA_VCS_DIR)/compile.sh
 
 $(IDMA_VCS_DIR)/bin/%.vcs: idma_vcs_compile
 	mkdir -p $(IDMA_VCS_DIR)/bin
-	cd $(IDMA_VCS_DIR); $(VCS) $(IDMA_VCS_ARGS) $(IDMA_VCS_PARAMS) $* -o bin/$*.vcs
+	cd $(IDMA_VCS_DIR); $(VCS) $(IDMA_VCS_ARGS) $(IDMA_VCS_PARAMS) $(IDMA_VCS_TB) -o bin/$*.vcs
 
 idma_vcs_clean:
 	rm -rf $(IDMA_VCS_DIR)/AN.DB
diff --git a/jobs/jobs.json b/jobs/jobs.json
index 20cc317b..d1b72e92 100644
--- a/jobs/jobs.json
+++ b/jobs/jobs.json
@@ -16,12 +16,10 @@
         },
         "gen_jobs" : {
         },
-        "overrides" : {
+        "params" : {
             "ErrorHandling" : 1
         },
-        "proc_id" : {
-            "rw_axi"
-        }
+        "proc_id" : "rw_axi"
     },
     "r_axi_w_obi" : {
         "seed" : 1336,
@@ -40,12 +38,10 @@
         },
         "gen_jobs" : {
         },
-        "overrides" : {
+        "params" : {
             "ErrorHandling" : 0
         },
-        "proc_id" : {
-            "r_axi_w_obi"
-        }
+        "proc_id" : "r_axi_w_obi"
     },
     "r_obi_w_axi" : {
         "seed" : 1336,
@@ -64,11 +60,9 @@
         },
         "gen_jobs" : {
         },
-        "overrides" : {
+        "params" : {
             "ErrorHandling" : 0
         },
-        "proc_id" : {
-            "r_obi_w_axi"
-        }
+        "proc_id" : "r_obi_w_axi"
     }
 }