From b3a75cfeac4682cf1513a16f99f05ea71dacf0fa Mon Sep 17 00:00:00 2001
From: gameboo <alexandre.joannou@gmail.com>
Date: Thu, 22 Jun 2023 16:40:23 +0100
Subject: [PATCH] Bump BlueStuff and make use of Makefile fragment

---
 builds/Resources/Include_Common.mk | 8 ++------
 libs/BlueStuff                     | 2 +-
 src_SSITH_P3/Makefile              | 7 +------
 3 files changed, 4 insertions(+), 13 deletions(-)

diff --git a/builds/Resources/Include_Common.mk b/builds/Resources/Include_Common.mk
index 24abef1..8748263 100644
--- a/builds/Resources/Include_Common.mk
+++ b/builds/Resources/Include_Common.mk
@@ -54,12 +54,8 @@ CORE_DIRS = $(REPO)/src_Core/CPU:$(REPO)/src_Core/ISA:$(REPO)/src_Core/Core:$(RE
 
 TESTBENCH_DIRS = $(REPO)/src_Testbench/Top:$(REPO)/src_Testbench/SoC
 
-BLUESTUFFDIR = $(REPO)/libs/BlueStuff
-BLUEAXI4DIR = $(BLUESTUFFDIR)/BlueAXI4
-BLUEAXI4DIRS = $(BLUEAXI4DIR):$(BLUEAXI4DIR)/AXI4:$(BLUEAXI4DIR)/AXI4Lite:$(BLUEAXI4DIR)/AXI4Stream:$(BLUEAXI4DIR)/BlueUnixBridges
-BLUEBASICSDIR = $(BLUESTUFFDIR)/BlueBasics
-BLUEUTILSDIR = $(BLUESTUFFDIR)/BlueUtils
-BLUESTUFF_DIRS = $(BLUESTUFFDIR):$(BLUEAXI4DIRS):$(BLUEBASICSDIR):$(BLUEUTILSDIR)
+BLUESTUFFDIR ?= $(REPO)/libs/BlueStuff
+include $(BLUESTUFFDIR)/bluestuff.inc.mk # sets the BLUESTUFF_DIRS variable
 
 WINDCOREIFC_DIRS = $(REPO)/libs/WindCoreInterface
 
diff --git a/libs/BlueStuff b/libs/BlueStuff
index ac6a16d..398a172 160000
--- a/libs/BlueStuff
+++ b/libs/BlueStuff
@@ -1 +1 @@
-Subproject commit ac6a16db3e6e5dc42ac7fb2b283dc0118713e50f
+Subproject commit 398a17272affd45afa0d38ae9e15f4456a792633
diff --git a/src_SSITH_P3/Makefile b/src_SSITH_P3/Makefile
index aad5fed..8b6860b 100644
--- a/src_SSITH_P3/Makefile
+++ b/src_SSITH_P3/Makefile
@@ -71,12 +71,7 @@ TAGCONTROLLERDIR ?= $(COREDIR)/libs/TagController
 RISCVHPMEVENTSDIR ?= $(COREDIR)/libs/RISCV_HPM_Events
 TAGCONTROLLER_DIRS = $(TAGCONTROLLERDIR)/TagController:$(TAGCONTROLLERDIR)/TagController/CacheCore
 BLUESTUFFDIR ?= $(COREDIR)/libs/BlueStuff
-BLUEAXI4DIR = $(BLUESTUFFDIR)/BlueAXI4
-BLUEAXI4DIRS = $(BLUEAXI4DIR):$(BLUEAXI4DIR)/AXI4:$(BLUEAXI4DIR)/AXI4Lite:$(BLUEAXI4DIR)/AXI4Stream:$(BLUEAXI4DIR)/BlueUnixBridges
-BLUEUNIXBRIDGESDIR = $(BLUEAXI4DIR)/BlueUnixBridges
-BLUEBASICSDIR = $(BLUESTUFFDIR)/BlueBasics
-BLUEUTILSDIR = $(BLUESTUFFDIR)/BlueUtils
-BLUESTUFF_DIRS = $(BLUESTUFFDIR):$(BLUEAXI4DIRS):$(BLUEBASICSDIR):$(BLUEUTILSDIR):$(BLUESTUFFDIR)/Stratix10ChipID
+include $(BLUESTUFFDIR)/bluestuff.inc.mk # sets the BLUESTUFF_DIRS variable
 
 # search path for bsc imports
 ifdef BSC_CONTRIB_DIR