From 30a39afbf646d648564a82a4291b4c7cc538d90c Mon Sep 17 00:00:00 2001
From: Blaise Tine <tinebp@yahoo.com>
Date: Thu, 27 May 2021 16:50:03 -0700
Subject: [PATCH] master merge fixes

---
 hw/scripts/scope.json         | 2 +-
 hw/syn/opae/Makefile          | 3 ++-
 hw/syn/quartus/top1/Makefile  | 2 +-
 hw/syn/quartus/top16/Makefile | 2 +-
 hw/syn/quartus/top2/Makefile  | 2 +-
 hw/syn/quartus/top32/Makefile | 2 +-
 hw/syn/quartus/top4/Makefile  | 2 +-
 hw/syn/quartus/top64/Makefile | 2 +-
 hw/syn/quartus/top8/Makefile  | 2 +-
 9 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/hw/scripts/scope.json b/hw/scripts/scope.json
index 4e5b0e61..be33e802 100644
--- a/hw/scripts/scope.json
+++ b/hw/scripts/scope.json
@@ -4,7 +4,7 @@
         "../rtl/VX_config.vh", 
         "../rtl/VX_platform.vh", 
         "../rtl/VX_define.vh", 
-        "../rtl/cache/VX_cache_config.vh"
+        "../rtl/cache/VX_cache_define.vh"
     ],
     "modules": {
         "afu": {            
diff --git a/hw/syn/opae/Makefile b/hw/syn/opae/Makefile
index d820df9a..fa5a1742 100644
--- a/hw/syn/opae/Makefile
+++ b/hw/syn/opae/Makefile
@@ -34,7 +34,8 @@ CONFIG32 := -DNUM_CLUSTERS=4 -DNUM_CORES=8 -DL2_ENABLE=0 -DL3_ENABLE=0 $(CONFIGS
 CONFIG64 := -DNUM_CLUSTERS=8 -DNUM_CORES=8 -DL2_ENABLE=0 -DL3_ENABLE=0 $(CONFIGS)
 
 FPU_INCLUDE = -I$(RTL_DIR)/fp_cores -I$(RTL_DIR)/fp_cores/altera/$(DEVICE_FAMILY)
-RTL_INCLUDE = -I$(RTL_DIR)/libs -I$(RTL_DIR)/interfaces -I$(RTL_DIR)/cache $(FPU_INCLUDE) -I$(RTL_DIR) -I$(RTL_DIR)/afu
+TEX_INCLUDE = -I$(RTL_DIR)/tex_unit
+RTL_INCLUDE = -I$(RTL_DIR) -I$(RTL_DIR)/libs -I$(RTL_DIR)/interfaces -I$(RTL_DIR)/cache -I$(RTL_DIR)/afu $(FPU_INCLUDE) $(TEX_INCLUDE)
 
 CFLAGS += $(RTL_INCLUDE)
 
diff --git a/hw/syn/quartus/top1/Makefile b/hw/syn/quartus/top1/Makefile
index 3fcd8447..374f84e1 100644
--- a/hw/syn/quartus/top1/Makefile
+++ b/hw/syn/quartus/top1/Makefile
@@ -13,7 +13,7 @@ FPU_CORE_PATH = $(RTL_DIR)/fp_cores/altera/arria10
 
 FPU_INCLUDE = $(RTL_DIR)/fp_cores;$(FPU_CORE_PATH);$(RTL_DIR)/fp_cores/fpnew/src;$(RTL_DIR)/fp_cores/fpnew/src/fpu_div_sqrt_mvp/hdl;$(RTL_DIR)/fp_cores/fpnew/src/common_cells/include;$(RTL_DIR)/fp_cores/fpnew/src/common_cells/src
 TEX_INCLUDE = $(RTL_DIR)/tex_unit
-RTL_INCLUDE = $(RTL_DIR);$(RTL_DIR)/libs;$(RTL_DIR)/interfaces;$(RTL_DIR)/cache;../../../rtl/afu;../../../rtl/afu/ccip;$(FPU_INCLUDE);$(TEX_INCLUDE)
+RTL_INCLUDE = $(RTL_DIR);$(RTL_DIR)/libs;$(RTL_DIR)/interfaces;$(RTL_DIR)/cache;$(RTL_DIR)/afu;$(RTL_DIR)/afu/ccip;$(FPU_INCLUDE);$(TEX_INCLUDE)
 
 PROJECT_FILES = $(PROJECT).qpf $(PROJECT).qsf
 
diff --git a/hw/syn/quartus/top16/Makefile b/hw/syn/quartus/top16/Makefile
index 1ac30cba..055740b7 100644
--- a/hw/syn/quartus/top16/Makefile
+++ b/hw/syn/quartus/top16/Makefile
@@ -13,7 +13,7 @@ FPU_CORE_PATH = $(RTL_DIR)/fp_cores/altera/arria10
 
 FPU_INCLUDE = $(RTL_DIR)/fp_cores;$(FPU_CORE_PATH);$(RTL_DIR)/fp_cores/fpnew/src;$(RTL_DIR)/fp_cores/fpnew/src/fpu_div_sqrt_mvp/hdl;$(RTL_DIR)/fp_cores/fpnew/src/common_cells/include;$(RTL_DIR)/fp_cores/fpnew/src/common_cells/src
 TEX_INCLUDE = $(RTL_DIR)/tex_unit
-RTL_INCLUDE = $(RTL_DIR);$(RTL_DIR)/libs;$(RTL_DIR)/interfaces;$(RTL_DIR)/cache;../../../rtl/afu;../../../rtl/afu/ccip;$(FPU_INCLUDE);$(TEX_INCLUDE)
+RTL_INCLUDE = $(RTL_DIR);$(RTL_DIR)/libs;$(RTL_DIR)/interfaces;$(RTL_DIR)/cache;$(RTL_DIR)/afu;$(RTL_DIR)/afu/ccip;$(FPU_INCLUDE);$(TEX_INCLUDE)
 
 PROJECT_FILES = $(PROJECT).qpf $(PROJECT).qsf
 
diff --git a/hw/syn/quartus/top2/Makefile b/hw/syn/quartus/top2/Makefile
index 089e94b6..f8801373 100644
--- a/hw/syn/quartus/top2/Makefile
+++ b/hw/syn/quartus/top2/Makefile
@@ -13,7 +13,7 @@ FPU_CORE_PATH=$(RTL_DIR)/fp_cores/altera/arria10
 
 FPU_INCLUDE = $(RTL_DIR)/fp_cores;$(FPU_CORE_PATH);$(RTL_DIR)/fp_cores/fpnew/src;$(RTL_DIR)/fp_cores/fpnew/src/fpu_div_sqrt_mvp/hdl;$(RTL_DIR)/fp_cores/fpnew/src/common_cells/include;$(RTL_DIR)/fp_cores/fpnew/src/common_cells/src
 TEX_INCLUDE = $(RTL_DIR)/tex_unit
-RTL_INCLUDE = $(RTL_DIR);$(RTL_DIR)/libs;$(RTL_DIR)/interfaces;$(RTL_DIR)/cache;../../../rtl/afu;../../../rtl/afu/ccip;$(FPU_INCLUDE);$(TEX_INCLUDE)
+RTL_INCLUDE = $(RTL_DIR);$(RTL_DIR)/libs;$(RTL_DIR)/interfaces;$(RTL_DIR)/cache;$(RTL_DIR)/afu;$(RTL_DIR)/afu/ccip;$(FPU_INCLUDE);$(TEX_INCLUDE)
 
 PROJECT_FILES = $(PROJECT).qpf $(PROJECT).qsf
 
diff --git a/hw/syn/quartus/top32/Makefile b/hw/syn/quartus/top32/Makefile
index 73fac3c4..a565fca2 100644
--- a/hw/syn/quartus/top32/Makefile
+++ b/hw/syn/quartus/top32/Makefile
@@ -13,7 +13,7 @@ FPU_CORE_PATH = $(RTL_DIR)/fp_cores/altera/stratix10
 
 FPU_INCLUDE = $(RTL_DIR)/fp_cores;$(FPU_CORE_PATH);$(RTL_DIR)/fp_cores/fpnew/src;$(RTL_DIR)/fp_cores/fpnew/src/fpu_div_sqrt_mvp/hdl;$(RTL_DIR)/fp_cores/fpnew/src/common_cells/include;$(RTL_DIR)/fp_cores/fpnew/src/common_cells/src
 TEX_INCLUDE = $(RTL_DIR)/tex_unit
-RTL_INCLUDE = $(RTL_DIR);$(RTL_DIR)/libs;$(RTL_DIR)/interfaces;$(RTL_DIR)/cache;../../../rtl/afu;../../../rtl/afu/ccip;$(FPU_INCLUDE);$(TEX_INCLUDE)
+RTL_INCLUDE = $(RTL_DIR);$(RTL_DIR)/libs;$(RTL_DIR)/interfaces;$(RTL_DIR)/cache;$(RTL_DIR)/afu;$(RTL_DIR)/afu/ccip;$(FPU_INCLUDE);$(TEX_INCLUDE)
 
 PROJECT_FILES = $(PROJECT).qpf $(PROJECT).qsf
 
diff --git a/hw/syn/quartus/top4/Makefile b/hw/syn/quartus/top4/Makefile
index b77edd01..93699407 100644
--- a/hw/syn/quartus/top4/Makefile
+++ b/hw/syn/quartus/top4/Makefile
@@ -13,7 +13,7 @@ FPU_CORE_PATH = $(RTL_DIR)/fp_cores/altera/arria10
 
 FPU_INCLUDE = $(RTL_DIR)/fp_cores;$(FPU_CORE_PATH);$(RTL_DIR)/fp_cores/fpnew/src;$(RTL_DIR)/fp_cores/fpnew/src/fpu_div_sqrt_mvp/hdl;$(RTL_DIR)/fp_cores/fpnew/src/common_cells/include;$(RTL_DIR)/fp_cores/fpnew/src/common_cells/src
 TEX_INCLUDE = $(RTL_DIR)/tex_unit
-RTL_INCLUDE = $(RTL_DIR);$(RTL_DIR)/libs;$(RTL_DIR)/interfaces;$(RTL_DIR)/cache;../../../rtl/afu;../../../rtl/afu/ccip;$(FPU_INCLUDE);$(TEX_INCLUDE)
+RTL_INCLUDE = $(RTL_DIR);$(RTL_DIR)/libs;$(RTL_DIR)/interfaces;$(RTL_DIR)/cache;$(RTL_DIR)/afu;$(RTL_DIR)/afu/ccip;$(FPU_INCLUDE);$(TEX_INCLUDE)
 
 PROJECT_FILES = $(PROJECT).qpf $(PROJECT).qsf
 
diff --git a/hw/syn/quartus/top64/Makefile b/hw/syn/quartus/top64/Makefile
index 83057792..17d7a2aa 100644
--- a/hw/syn/quartus/top64/Makefile
+++ b/hw/syn/quartus/top64/Makefile
@@ -13,7 +13,7 @@ FPU_CORE_PATH=$(RTL_DIR)/fp_cores/altera/stratix10
 
 FPU_INCLUDE = $(RTL_DIR)/fp_cores;$(FPU_CORE_PATH);$(RTL_DIR)/fp_cores/fpnew/src;$(RTL_DIR)/fp_cores/fpnew/src/fpu_div_sqrt_mvp/hdl;$(RTL_DIR)/fp_cores/fpnew/src/common_cells/include;$(RTL_DIR)/fp_cores/fpnew/src/common_cells/src
 TEX_INCLUDE = $(RTL_DIR)/tex_unit
-RTL_INCLUDE = $(RTL_DIR);$(RTL_DIR)/libs;$(RTL_DIR)/interfaces;$(RTL_DIR)/cache;../../../rtl/afu;../../../rtl/afu/ccip;$(FPU_INCLUDE);$(TEX_INCLUDE)
+RTL_INCLUDE = $(RTL_DIR);$(RTL_DIR)/libs;$(RTL_DIR)/interfaces;$(RTL_DIR)/cache;$(RTL_DIR)/afu;$(RTL_DIR)/afu/ccip;$(FPU_INCLUDE);$(TEX_INCLUDE)
 
 PROJECT_FILES = $(PROJECT).qpf $(PROJECT).qsf
 
diff --git a/hw/syn/quartus/top8/Makefile b/hw/syn/quartus/top8/Makefile
index fe4107d4..d3287844 100644
--- a/hw/syn/quartus/top8/Makefile
+++ b/hw/syn/quartus/top8/Makefile
@@ -13,7 +13,7 @@ FPU_CORE_PATH = $(RTL_DIR)/fp_cores/altera/arria10
 
 FPU_INCLUDE = $(RTL_DIR)/fp_cores;$(FPU_CORE_PATH);$(RTL_DIR)/fp_cores/fpnew/src;$(RTL_DIR)/fp_cores/fpnew/src/fpu_div_sqrt_mvp/hdl;$(RTL_DIR)/fp_cores/fpnew/src/common_cells/include;$(RTL_DIR)/fp_cores/fpnew/src/common_cells/src
 TEX_INCLUDE = $(RTL_DIR)/tex_unit
-RTL_INCLUDE = $(RTL_DIR);$(RTL_DIR)/libs;$(RTL_DIR)/interfaces;$(RTL_DIR)/cache;../../../rtl/afu;../../../rtl/afu/ccip;$(FPU_INCLUDE);$(TEX_INCLUDE)
+RTL_INCLUDE = $(RTL_DIR);$(RTL_DIR)/libs;$(RTL_DIR)/interfaces;$(RTL_DIR)/cache;$(RTL_DIR)/afu;$(RTL_DIR)/afu/ccip;$(FPU_INCLUDE);$(TEX_INCLUDE)
 
 PROJECT_FILES = $(PROJECT).qpf $(PROJECT).qsf