From 4ad9897c4241eb5abb521dd9602d2c969e8ad96f Mon Sep 17 00:00:00 2001
From: dam1n19 <dam1n19@soton.ac.uk>
Date: Fri, 28 Apr 2023 17:09:46 +0100
Subject: [PATCH] SOC1-167: Changed Bus Matrix log file creation location
---
.../built/{ => logs}/nanosoc_ahb32_4x7.log | 18 +++++++++---------
system/src/nanosoc_ahb_busmatrix/makefile | 3 ++-
2 files changed, 11 insertions(+), 10 deletions(-)
rename system/src/nanosoc_ahb_busmatrix/built/{ => logs}/nanosoc_ahb32_4x7.log (99%)
diff --git a/system/src/nanosoc_ahb_busmatrix/built/nanosoc_ahb32_4x7.log b/system/src/nanosoc_ahb_busmatrix/built/logs/nanosoc_ahb32_4x7.log
similarity index 99%
rename from system/src/nanosoc_ahb_busmatrix/built/nanosoc_ahb32_4x7.log
rename to system/src/nanosoc_ahb_busmatrix/built/logs/nanosoc_ahb32_4x7.log
index 2d118f3..514de0b 100644
--- a/system/src/nanosoc_ahb_busmatrix/built/nanosoc_ahb32_4x7.log
+++ b/system/src/nanosoc_ahb_busmatrix/built/logs/nanosoc_ahb32_4x7.log
@@ -14,7 +14,7 @@
=
= BuildBusMatrix.pl
=
-= Run Date : 28/04/2023 17:05:36
+= Run Date : 28/04/2023 17:08:54
==============================================================
Script accepted the following parameters:
@@ -57,18 +57,18 @@ Deleting the '/home/dam1n19/Design/test1/secworks-sha256-project/nanosoc/system/
Creating the bus matrix variant...
- - Rendering 'nanosoc_4x7_AhbMatrix_lite.xml'
- - Rendering 'nanosoc_4x7_SlaveOutput.v'
- - Rendering 'nanosoc_4x7_AhbMatrix_default_slave.v'
- - Rendering 'nanosoc_4x7_AhbMatrix.xml'
- - Rendering 'nanosoc_4x7_MatrixDecode_cpu.v'
- - Rendering 'nanosoc_4x7_Arbiter.v'
- - Rendering 'nanosoc_4x7_AhbMatrix_lite.v'
- Rendering 'nanosoc_4x7_AhbMatrix.v'
- Rendering 'nanosoc_4x7_MatrixDecode_adp.v'
- - Rendering 'nanosoc_4x7_MatrixDecode_dma2.v'
- Rendering 'nanosoc_4x7_MatrixDecode_dma.v'
+ - Rendering 'nanosoc_4x7_AhbMatrix.xml'
+ - Rendering 'nanosoc_4x7_MatrixDecode_cpu.v'
- Rendering 'nanosoc_4x7_MasterInput.v'
+ - Rendering 'nanosoc_4x7_AhbMatrix_lite.v'
+ - Rendering 'nanosoc_4x7_SlaveOutput.v'
+ - Rendering 'nanosoc_4x7_AhbMatrix_lite.xml'
+ - Rendering 'nanosoc_4x7_MatrixDecode_dma2.v'
+ - Rendering 'nanosoc_4x7_Arbiter.v'
+ - Rendering 'nanosoc_4x7_AhbMatrix_default_slave.v'
Done!
diff --git a/system/src/nanosoc_ahb_busmatrix/makefile b/system/src/nanosoc_ahb_busmatrix/makefile
index 003defa..0407e04 100644
--- a/system/src/nanosoc_ahb_busmatrix/makefile
+++ b/system/src/nanosoc_ahb_busmatrix/makefile
@@ -32,7 +32,7 @@ VERILOG_SOURCE_DIR = $(SOURCE_DIR)/verilog/src
XML_DIR = $(BUILD_DIR)/xml
# Location of Generation Logs
-LOGS_DIR = $(BUILD_DIR)/built
+LOGS_DIR = $(BUILD_DIR)/built/logs
# BuildBusMatrix Script File Options
XML_OPTIONS = -xmldir $(XML_DIR) -cfg $(MATRIX_NAME).xml
@@ -43,6 +43,7 @@ GEN_OPTIONS = -notimescales -over -verbose $(XML_OPTIONS) $(VERILOG_OPTIONS) $(
build:
@echo "Generating NanoSoC Bus Matrix"
+ @mkdir -p $(LOGS_DIR)
@mkdir -p $(IPXACT_BUILD_DIR)
@mkdir -p $(VERILOG_BUILD_DIR)
@cd $(SOURCE_DIR) && bin/BuildBusMatrix.pl $(GEN_OPTIONS)
\ No newline at end of file
--
GitLab