From 4a55af10c98a1920af1525fb677eead27e2f7753 Mon Sep 17 00:00:00 2001
From: dam1n19 <dam1n19@soton.ac.uk>
Date: Fri, 28 Apr 2023 17:11:47 +0100
Subject: [PATCH] SOC1-167: Moved Bus Matrix Generation files out of built
folder
---
system/src/nanosoc_ahb_busmatrix/README.txt | 66 -------------------
.../nanosoc_4x7_AhbMatrix.xml | 56 ++++++++--------
.../nanosoc_4x7_AhbMatrix_lite.xml | 56 ++++++++--------
.../{built => }/logs/nanosoc_ahb32_4x7.log | 36 ++++------
system/src/nanosoc_ahb_busmatrix/makefile | 6 +-
.../nanosoc_4x7_AhbMatrix.v | 0
.../nanosoc_4x7_AhbMatrix_default_slave.v | 0
.../nanosoc_4x7_AhbMatrix_lite.v | 0
.../nanosoc_4x7_Arbiter.v | 0
.../nanosoc_4x7_MasterInput.v | 0
.../nanosoc_4x7_MatrixDecode_adp.v | 0
.../nanosoc_4x7_MatrixDecode_cpu.v | 0
.../nanosoc_4x7_MatrixDecode_dma.v | 0
.../nanosoc_4x7_MatrixDecode_dma2.v | 0
.../nanosoc_4x7_SlaveOutput.v | 0
15 files changed, 70 insertions(+), 150 deletions(-)
delete mode 100755 system/src/nanosoc_ahb_busmatrix/README.txt
rename system/src/nanosoc_ahb_busmatrix/{built => }/ipxact/nanosoc_4x7_AhbMatrix/nanosoc_4x7_AhbMatrix.xml (100%)
rename system/src/nanosoc_ahb_busmatrix/{built => }/ipxact/nanosoc_4x7_AhbMatrix/nanosoc_4x7_AhbMatrix_lite.xml (100%)
rename system/src/nanosoc_ahb_busmatrix/{built => }/logs/nanosoc_ahb32_4x7.log (52%)
rename system/src/nanosoc_ahb_busmatrix/{built => }/verilog/nanosoc_4x7_AhbMatrix/nanosoc_4x7_AhbMatrix.v (100%)
rename system/src/nanosoc_ahb_busmatrix/{built => }/verilog/nanosoc_4x7_AhbMatrix/nanosoc_4x7_AhbMatrix_default_slave.v (100%)
rename system/src/nanosoc_ahb_busmatrix/{built => }/verilog/nanosoc_4x7_AhbMatrix/nanosoc_4x7_AhbMatrix_lite.v (100%)
rename system/src/nanosoc_ahb_busmatrix/{built => }/verilog/nanosoc_4x7_AhbMatrix/nanosoc_4x7_Arbiter.v (100%)
rename system/src/nanosoc_ahb_busmatrix/{built => }/verilog/nanosoc_4x7_AhbMatrix/nanosoc_4x7_MasterInput.v (100%)
rename system/src/nanosoc_ahb_busmatrix/{built => }/verilog/nanosoc_4x7_AhbMatrix/nanosoc_4x7_MatrixDecode_adp.v (100%)
rename system/src/nanosoc_ahb_busmatrix/{built => }/verilog/nanosoc_4x7_AhbMatrix/nanosoc_4x7_MatrixDecode_cpu.v (100%)
rename system/src/nanosoc_ahb_busmatrix/{built => }/verilog/nanosoc_4x7_AhbMatrix/nanosoc_4x7_MatrixDecode_dma.v (100%)
rename system/src/nanosoc_ahb_busmatrix/{built => }/verilog/nanosoc_4x7_AhbMatrix/nanosoc_4x7_MatrixDecode_dma2.v (100%)
rename system/src/nanosoc_ahb_busmatrix/{built => }/verilog/nanosoc_4x7_AhbMatrix/nanosoc_4x7_SlaveOutput.v (100%)
diff --git a/system/src/nanosoc_ahb_busmatrix/README.txt b/system/src/nanosoc_ahb_busmatrix/README.txt
deleted file mode 100755
index 8155176..0000000
--- a/system/src/nanosoc_ahb_busmatrix/README.txt
+++ /dev/null
@@ -1,66 +0,0 @@
-//-----------------------------------------------------------------------------
-// The confidential and proprietary information contained in this file may
-// only be used by a person authorised under and to the extent permitted
-// by a subsisting licensing agreement from Arm Limited or its affiliates.
-//
-// (C) COPYRIGHT 2001-2013 Arm Limited or its affiliates.
-// ALL RIGHTS RESERVED
-//
-// This entire notice must be reproduced on all copies of this file
-// and copies of this file may only be made by a person if such person is
-// permitted to do so under the terms of a subsisting license agreement
-// from Arm Limited or its affiliates.
-//
-// SVN Information
-//
-// Checked In : $Date: 2017-10-10 15:55:38 +0100 (Tue, 10 Oct 2017) $
-//
-// Revision : $Revision: 371321 $
-//
-// Release Information : Cortex-M System Design Kit-r1p1-00rel0
-//
-//-----------------------------------------------------------------------------
-//
-//------------------------------------------------------------------------------
-// Abstract : AHB BusMatrix top level README file
-//------------------------------------------------------------------------------
-
-Introduction
-------------
-
-This directory contains the AHB BusMatrix component.
-
-cmsdk_ahb_busmatrix/bin/BuildBusMatrix.pl
- The AHB BusMatrix is a configurable component. The configuration
- process is handled by a Perl script, located in bin/BuildBusMatrix.pl
-
-cmsdk_ahb_busmatrix/verilog/src
- The source code of the configurable AHB Bus matrix is located in
- verilog/src directory. Do not use the Verilog files in this directory
- directly.
-
-cmsdk_ahb_busmatrix/verilog/built
- After configuration process, the Verilog files generated will be stored
- in verilog/built directory.
-
-cmsdk_ahb_busmatrix/xml/
- During the configuration process, the configuration of the AHB BusMatrix
- can be controlled by command line options or by an XML file.
- Example XML files can be found in the xml directory.
-
-cmsdk_mtx4x2/verilog/
- A preconfigured version of AHB Bus matrix for the example Cortex-M3/M4
- system is prepared in the cmsdk_mcu_mtx4x2 directory. The configuration
- of this bus matrix can be found in cmsdk_mcu_mtx4x2/xml/
-
-Several example AHB Bus Matrix configuration XML files are provided.
-You can generate the AHB bus matrix RTL by running the following command:
-
-> cd logical/cmsdk_ahb_busmatrix
-> bin/BuildBusMatrix.pl -xmldir xml -cfg example2x3_full.xml -over -verbose
-
-
-Please refer to the Cortex-M System Design Kit Technical Reference Manual for
-further details on the use of this component.
-
-======================== End of README.txt ===========================
diff --git a/system/src/nanosoc_ahb_busmatrix/built/ipxact/nanosoc_4x7_AhbMatrix/nanosoc_4x7_AhbMatrix.xml b/system/src/nanosoc_ahb_busmatrix/ipxact/nanosoc_4x7_AhbMatrix/nanosoc_4x7_AhbMatrix.xml
similarity index 100%
rename from system/src/nanosoc_ahb_busmatrix/built/ipxact/nanosoc_4x7_AhbMatrix/nanosoc_4x7_AhbMatrix.xml
rename to system/src/nanosoc_ahb_busmatrix/ipxact/nanosoc_4x7_AhbMatrix/nanosoc_4x7_AhbMatrix.xml
index 828ef10..3b81491 100644
--- a/system/src/nanosoc_ahb_busmatrix/built/ipxact/nanosoc_4x7_AhbMatrix/nanosoc_4x7_AhbMatrix.xml
+++ b/system/src/nanosoc_ahb_busmatrix/ipxact/nanosoc_4x7_AhbMatrix/nanosoc_4x7_AhbMatrix.xml
@@ -1974,17 +1974,17 @@
<spirit:remapStates>
<spirit:remapState>
- <spirit:name>remap_n0</spirit:name>
- <spirit:description>Remap state remap_n0</spirit:description>
+ <spirit:name>remap_0</spirit:name>
+ <spirit:description>Remap state remap_0</spirit:description>
<spirit:remapPorts>
- <spirit:remapPort spirit:portNameRef="REMAP" spirit:portIndex="0">0</spirit:remapPort>
+ <spirit:remapPort spirit:portNameRef="REMAP" spirit:portIndex="0">1</spirit:remapPort>
</spirit:remapPorts>
</spirit:remapState>
<spirit:remapState>
- <spirit:name>remap_0</spirit:name>
- <spirit:description>Remap state remap_0</spirit:description>
+ <spirit:name>remap_n0</spirit:name>
+ <spirit:description>Remap state remap_n0</spirit:description>
<spirit:remapPorts>
- <spirit:remapPort spirit:portNameRef="REMAP" spirit:portIndex="0">1</spirit:remapPort>
+ <spirit:remapPort spirit:portNameRef="REMAP" spirit:portIndex="0">0</spirit:remapPort>
</spirit:remapPorts>
</spirit:remapState>
@@ -2188,17 +2188,6 @@
<spirit:baseAddress>0xf0000000</spirit:baseAddress>
</spirit:subspaceMap>
- <spirit:memoryRemap spirit:state="remap_n0">
- <spirit:name>AHBLiteTarget_Slave__adp_remap_n0_remap_MM</spirit:name>
- <spirit:description>_adp remap_n0 remap</spirit:description>
- <spirit:subspaceMap spirit:masterRef="AHBLiteTarget_Master__rom1"
- spirit:segmentRef="_rom1_0x00000000_0x0fffffff">
- <!-- Removable region, active only when REMAP bitcombination is n0 address_region 0x00000000-0x0fffffff -->
- <spirit:name>AHBLiteTarget_Master__rom1_0x00000000_0_state_remap_n0_SM</spirit:name>
- <spirit:baseAddress>0x00000000</spirit:baseAddress>
- </spirit:subspaceMap>
- </spirit:memoryRemap>
-
<spirit:memoryRemap spirit:state="remap_0">
<spirit:name>AHBLiteTarget_Slave__adp_remap_0_remap_MM</spirit:name>
<spirit:description>_adp remap_0 remap</spirit:description>
@@ -2210,6 +2199,17 @@
</spirit:subspaceMap>
</spirit:memoryRemap>
+ <spirit:memoryRemap spirit:state="remap_n0">
+ <spirit:name>AHBLiteTarget_Slave__adp_remap_n0_remap_MM</spirit:name>
+ <spirit:description>_adp remap_n0 remap</spirit:description>
+ <spirit:subspaceMap spirit:masterRef="AHBLiteTarget_Master__rom1"
+ spirit:segmentRef="_rom1_0x00000000_0x0fffffff">
+ <!-- Removable region, active only when REMAP bitcombination is n0 address_region 0x00000000-0x0fffffff -->
+ <spirit:name>AHBLiteTarget_Master__rom1_0x00000000_0_state_remap_n0_SM</spirit:name>
+ <spirit:baseAddress>0x00000000</spirit:baseAddress>
+ </spirit:subspaceMap>
+ </spirit:memoryRemap>
+
</spirit:memoryMap>
<spirit:memoryMap>
@@ -2417,17 +2417,6 @@
<spirit:baseAddress>0xf0000000</spirit:baseAddress>
</spirit:subspaceMap>
- <spirit:memoryRemap spirit:state="remap_n0">
- <spirit:name>AHBLiteTarget_Slave__cpu_remap_n0_remap_MM</spirit:name>
- <spirit:description>_cpu remap_n0 remap</spirit:description>
- <spirit:subspaceMap spirit:masterRef="AHBLiteTarget_Master__rom1"
- spirit:segmentRef="_rom1_0x00000000_0x0fffffff">
- <!-- Removable region, active only when REMAP bitcombination is n0 address_region 0x00000000-0x0fffffff -->
- <spirit:name>AHBLiteTarget_Master__rom1_0x00000000_0_state_remap_n0_SM</spirit:name>
- <spirit:baseAddress>0x00000000</spirit:baseAddress>
- </spirit:subspaceMap>
- </spirit:memoryRemap>
-
<spirit:memoryRemap spirit:state="remap_0">
<spirit:name>AHBLiteTarget_Slave__cpu_remap_0_remap_MM</spirit:name>
<spirit:description>_cpu remap_0 remap</spirit:description>
@@ -2439,6 +2428,17 @@
</spirit:subspaceMap>
</spirit:memoryRemap>
+ <spirit:memoryRemap spirit:state="remap_n0">
+ <spirit:name>AHBLiteTarget_Slave__cpu_remap_n0_remap_MM</spirit:name>
+ <spirit:description>_cpu remap_n0 remap</spirit:description>
+ <spirit:subspaceMap spirit:masterRef="AHBLiteTarget_Master__rom1"
+ spirit:segmentRef="_rom1_0x00000000_0x0fffffff">
+ <!-- Removable region, active only when REMAP bitcombination is n0 address_region 0x00000000-0x0fffffff -->
+ <spirit:name>AHBLiteTarget_Master__rom1_0x00000000_0_state_remap_n0_SM</spirit:name>
+ <spirit:baseAddress>0x00000000</spirit:baseAddress>
+ </spirit:subspaceMap>
+ </spirit:memoryRemap>
+
</spirit:memoryMap>
</spirit:memoryMaps>
diff --git a/system/src/nanosoc_ahb_busmatrix/built/ipxact/nanosoc_4x7_AhbMatrix/nanosoc_4x7_AhbMatrix_lite.xml b/system/src/nanosoc_ahb_busmatrix/ipxact/nanosoc_4x7_AhbMatrix/nanosoc_4x7_AhbMatrix_lite.xml
similarity index 100%
rename from system/src/nanosoc_ahb_busmatrix/built/ipxact/nanosoc_4x7_AhbMatrix/nanosoc_4x7_AhbMatrix_lite.xml
rename to system/src/nanosoc_ahb_busmatrix/ipxact/nanosoc_4x7_AhbMatrix/nanosoc_4x7_AhbMatrix_lite.xml
index a8fbfa8..8893613 100644
--- a/system/src/nanosoc_ahb_busmatrix/built/ipxact/nanosoc_4x7_AhbMatrix/nanosoc_4x7_AhbMatrix_lite.xml
+++ b/system/src/nanosoc_ahb_busmatrix/ipxact/nanosoc_4x7_AhbMatrix/nanosoc_4x7_AhbMatrix_lite.xml
@@ -1833,17 +1833,17 @@
<spirit:remapStates>
<spirit:remapState>
- <spirit:name>remap_n0</spirit:name>
- <spirit:description>Remap state remap_n0</spirit:description>
+ <spirit:name>remap_0</spirit:name>
+ <spirit:description>Remap state remap_0</spirit:description>
<spirit:remapPorts>
- <spirit:remapPort spirit:portNameRef="REMAP" spirit:portIndex="0">0</spirit:remapPort>
+ <spirit:remapPort spirit:portNameRef="REMAP" spirit:portIndex="0">1</spirit:remapPort>
</spirit:remapPorts>
</spirit:remapState>
<spirit:remapState>
- <spirit:name>remap_0</spirit:name>
- <spirit:description>Remap state remap_0</spirit:description>
+ <spirit:name>remap_n0</spirit:name>
+ <spirit:description>Remap state remap_n0</spirit:description>
<spirit:remapPorts>
- <spirit:remapPort spirit:portNameRef="REMAP" spirit:portIndex="0">1</spirit:remapPort>
+ <spirit:remapPort spirit:portNameRef="REMAP" spirit:portIndex="0">0</spirit:remapPort>
</spirit:remapPorts>
</spirit:remapState>
@@ -2047,17 +2047,6 @@
<spirit:baseAddress>0xf0000000</spirit:baseAddress>
</spirit:subspaceMap>
- <spirit:memoryRemap spirit:state="remap_n0">
- <spirit:name>AHBLiteInitiator_Slave__adp_remap_n0_remap_MM</spirit:name>
- <spirit:description>_adp remap_n0 remap</spirit:description>
- <spirit:subspaceMap spirit:masterRef="AHBLiteTarget_Master__rom1"
- spirit:segmentRef="_rom1_0x00000000_0x0fffffff">
- <!-- Removable region, active only when REMAP bitcombination is n0 address_region 0x00000000-0x0fffffff -->
- <spirit:name>AHBLiteTarget_Master__rom1_0x00000000_0_state_remap_n0_SM</spirit:name>
- <spirit:baseAddress>0x00000000</spirit:baseAddress>
- </spirit:subspaceMap>
- </spirit:memoryRemap>
-
<spirit:memoryRemap spirit:state="remap_0">
<spirit:name>AHBLiteInitiator_Slave__adp_remap_0_remap_MM</spirit:name>
<spirit:description>_adp remap_0 remap</spirit:description>
@@ -2069,6 +2058,17 @@
</spirit:subspaceMap>
</spirit:memoryRemap>
+ <spirit:memoryRemap spirit:state="remap_n0">
+ <spirit:name>AHBLiteInitiator_Slave__adp_remap_n0_remap_MM</spirit:name>
+ <spirit:description>_adp remap_n0 remap</spirit:description>
+ <spirit:subspaceMap spirit:masterRef="AHBLiteTarget_Master__rom1"
+ spirit:segmentRef="_rom1_0x00000000_0x0fffffff">
+ <!-- Removable region, active only when REMAP bitcombination is n0 address_region 0x00000000-0x0fffffff -->
+ <spirit:name>AHBLiteTarget_Master__rom1_0x00000000_0_state_remap_n0_SM</spirit:name>
+ <spirit:baseAddress>0x00000000</spirit:baseAddress>
+ </spirit:subspaceMap>
+ </spirit:memoryRemap>
+
</spirit:memoryMap>
<spirit:memoryMap>
@@ -2276,17 +2276,6 @@
<spirit:baseAddress>0xf0000000</spirit:baseAddress>
</spirit:subspaceMap>
- <spirit:memoryRemap spirit:state="remap_n0">
- <spirit:name>AHBLiteInitiator_Slave__cpu_remap_n0_remap_MM</spirit:name>
- <spirit:description>_cpu remap_n0 remap</spirit:description>
- <spirit:subspaceMap spirit:masterRef="AHBLiteTarget_Master__rom1"
- spirit:segmentRef="_rom1_0x00000000_0x0fffffff">
- <!-- Removable region, active only when REMAP bitcombination is n0 address_region 0x00000000-0x0fffffff -->
- <spirit:name>AHBLiteTarget_Master__rom1_0x00000000_0_state_remap_n0_SM</spirit:name>
- <spirit:baseAddress>0x00000000</spirit:baseAddress>
- </spirit:subspaceMap>
- </spirit:memoryRemap>
-
<spirit:memoryRemap spirit:state="remap_0">
<spirit:name>AHBLiteInitiator_Slave__cpu_remap_0_remap_MM</spirit:name>
<spirit:description>_cpu remap_0 remap</spirit:description>
@@ -2298,6 +2287,17 @@
</spirit:subspaceMap>
</spirit:memoryRemap>
+ <spirit:memoryRemap spirit:state="remap_n0">
+ <spirit:name>AHBLiteInitiator_Slave__cpu_remap_n0_remap_MM</spirit:name>
+ <spirit:description>_cpu remap_n0 remap</spirit:description>
+ <spirit:subspaceMap spirit:masterRef="AHBLiteTarget_Master__rom1"
+ spirit:segmentRef="_rom1_0x00000000_0x0fffffff">
+ <!-- Removable region, active only when REMAP bitcombination is n0 address_region 0x00000000-0x0fffffff -->
+ <spirit:name>AHBLiteTarget_Master__rom1_0x00000000_0_state_remap_n0_SM</spirit:name>
+ <spirit:baseAddress>0x00000000</spirit:baseAddress>
+ </spirit:subspaceMap>
+ </spirit:memoryRemap>
+
</spirit:memoryMap>
</spirit:memoryMaps>
diff --git a/system/src/nanosoc_ahb_busmatrix/built/logs/nanosoc_ahb32_4x7.log b/system/src/nanosoc_ahb_busmatrix/logs/nanosoc_ahb32_4x7.log
similarity index 52%
rename from system/src/nanosoc_ahb_busmatrix/built/logs/nanosoc_ahb32_4x7.log
rename to system/src/nanosoc_ahb_busmatrix/logs/nanosoc_ahb32_4x7.log
index 514de0b..1ef2d1d 100644
--- a/system/src/nanosoc_ahb_busmatrix/built/logs/nanosoc_ahb32_4x7.log
+++ b/system/src/nanosoc_ahb_busmatrix/logs/nanosoc_ahb32_4x7.log
@@ -14,7 +14,7 @@
=
= BuildBusMatrix.pl
=
-= Run Date : 28/04/2023 17:08:54
+= Run Date : 28/04/2023 17:11:03
==============================================================
Script accepted the following parameters:
@@ -35,40 +35,26 @@ Script accepted the following parameters:
- Routing address width : 32
- User signal width : 2
- Timescales : no
- - Configuration directory : '/home/dam1n19/Design/test1/secworks-sha256-project/nanosoc/system/src/nanosoc_ahb_busmatrix/built/verilog'
+ - Configuration directory : '/home/dam1n19/Design/test1/secworks-sha256-project/nanosoc/system/src/nanosoc_ahb_busmatrix/verilog'
- Source directory : '/research/AAA/ip_library/latest/Corstone-101/logical/cmsdk_ahb_busmatrix/verilog/src'
- - IPXact target directory : '/home/dam1n19/Design/test1/secworks-sha256-project/nanosoc/system/src/nanosoc_ahb_busmatrix/built/ipxact'
+ - IPXact target directory : '/home/dam1n19/Design/test1/secworks-sha256-project/nanosoc/system/src/nanosoc_ahb_busmatrix/ipxact'
- IPXact source directory : '/research/AAA/ip_library/latest/Corstone-101/logical/cmsdk_ahb_busmatrix/ipxact/src'
- Overwrite mode : enabled
-Deleting the '/home/dam1n19/Design/test1/secworks-sha256-project/nanosoc/system/src/nanosoc_ahb_busmatrix/built/verilog/nanosoc_4x7_AhbMatrix/nanosoc_4x7_AhbMatrix.v' file...
-Deleting the '/home/dam1n19/Design/test1/secworks-sha256-project/nanosoc/system/src/nanosoc_ahb_busmatrix/built/verilog/nanosoc_4x7_AhbMatrix/nanosoc_4x7_AhbMatrix_default_slave.v' file...
-Deleting the '/home/dam1n19/Design/test1/secworks-sha256-project/nanosoc/system/src/nanosoc_ahb_busmatrix/built/verilog/nanosoc_4x7_AhbMatrix/nanosoc_4x7_AhbMatrix_lite.v' file...
-Deleting the '/home/dam1n19/Design/test1/secworks-sha256-project/nanosoc/system/src/nanosoc_ahb_busmatrix/built/verilog/nanosoc_4x7_AhbMatrix/nanosoc_4x7_Arbiter.v' file...
-Deleting the '/home/dam1n19/Design/test1/secworks-sha256-project/nanosoc/system/src/nanosoc_ahb_busmatrix/built/verilog/nanosoc_4x7_AhbMatrix/nanosoc_4x7_MasterInput.v' file...
-Deleting the '/home/dam1n19/Design/test1/secworks-sha256-project/nanosoc/system/src/nanosoc_ahb_busmatrix/built/verilog/nanosoc_4x7_AhbMatrix/nanosoc_4x7_MatrixDecode_adp.v' file...
-Deleting the '/home/dam1n19/Design/test1/secworks-sha256-project/nanosoc/system/src/nanosoc_ahb_busmatrix/built/verilog/nanosoc_4x7_AhbMatrix/nanosoc_4x7_MatrixDecode_cpu.v' file...
-Deleting the '/home/dam1n19/Design/test1/secworks-sha256-project/nanosoc/system/src/nanosoc_ahb_busmatrix/built/verilog/nanosoc_4x7_AhbMatrix/nanosoc_4x7_MatrixDecode_dma.v' file...
-Deleting the '/home/dam1n19/Design/test1/secworks-sha256-project/nanosoc/system/src/nanosoc_ahb_busmatrix/built/verilog/nanosoc_4x7_AhbMatrix/nanosoc_4x7_MatrixDecode_dma2.v' file...
-Deleting the '/home/dam1n19/Design/test1/secworks-sha256-project/nanosoc/system/src/nanosoc_ahb_busmatrix/built/verilog/nanosoc_4x7_AhbMatrix/nanosoc_4x7_SlaveOutput.v' file...
-
-Deleting the '/home/dam1n19/Design/test1/secworks-sha256-project/nanosoc/system/src/nanosoc_ahb_busmatrix/built/ipxact/nanosoc_4x7_AhbMatrix/nanosoc_4x7_AhbMatrix.xml' file...
-Deleting the '/home/dam1n19/Design/test1/secworks-sha256-project/nanosoc/system/src/nanosoc_ahb_busmatrix/built/ipxact/nanosoc_4x7_AhbMatrix/nanosoc_4x7_AhbMatrix_lite.xml' file...
-
Creating the bus matrix variant...
- - Rendering 'nanosoc_4x7_AhbMatrix.v'
- - Rendering 'nanosoc_4x7_MatrixDecode_adp.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_AhbMatrix_lite.v'
- Rendering 'nanosoc_4x7_Arbiter.v'
- Rendering 'nanosoc_4x7_AhbMatrix_default_slave.v'
+ - Rendering 'nanosoc_4x7_MatrixDecode_adp.v'
+ - Rendering 'nanosoc_4x7_MatrixDecode_dma2.v'
+ - Rendering 'nanosoc_4x7_AhbMatrix.v'
+ - Rendering 'nanosoc_4x7_MasterInput.v'
+ - Rendering 'nanosoc_4x7_AhbMatrix_lite.xml'
+ - Rendering 'nanosoc_4x7_MatrixDecode_dma.v'
+ - Rendering 'nanosoc_4x7_AhbMatrix.xml'
Done!
diff --git a/system/src/nanosoc_ahb_busmatrix/makefile b/system/src/nanosoc_ahb_busmatrix/makefile
index 0407e04..2412557 100644
--- a/system/src/nanosoc_ahb_busmatrix/makefile
+++ b/system/src/nanosoc_ahb_busmatrix/makefile
@@ -21,8 +21,8 @@ BUILD_DIR ?= $(NANOSOC_TECH_DIR)/system/src/nanosoc_ahb_busmatrix
SOURCE_DIR = $(ARM_IP_LIBRARY_PATH)/latest/Corstone-101/logical/cmsdk_ahb_busmatrix
# Location of Generation Files
-IPXACT_BUILD_DIR = $(BUILD_DIR)/built/ipxact
-VERILOG_BUILD_DIR = $(BUILD_DIR)/built/verilog
+IPXACT_BUILD_DIR = $(BUILD_DIR)/ipxact
+VERILOG_BUILD_DIR = $(BUILD_DIR)/verilog
# Location of Source Files
IPXACT_SOURCE_DIR = $(SOURCE_DIR)/ipxact/src
@@ -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
+LOGS_DIR = $(BUILD_DIR)/logs
# BuildBusMatrix Script File Options
XML_OPTIONS = -xmldir $(XML_DIR) -cfg $(MATRIX_NAME).xml
diff --git a/system/src/nanosoc_ahb_busmatrix/built/verilog/nanosoc_4x7_AhbMatrix/nanosoc_4x7_AhbMatrix.v b/system/src/nanosoc_ahb_busmatrix/verilog/nanosoc_4x7_AhbMatrix/nanosoc_4x7_AhbMatrix.v
similarity index 100%
rename from system/src/nanosoc_ahb_busmatrix/built/verilog/nanosoc_4x7_AhbMatrix/nanosoc_4x7_AhbMatrix.v
rename to system/src/nanosoc_ahb_busmatrix/verilog/nanosoc_4x7_AhbMatrix/nanosoc_4x7_AhbMatrix.v
diff --git a/system/src/nanosoc_ahb_busmatrix/built/verilog/nanosoc_4x7_AhbMatrix/nanosoc_4x7_AhbMatrix_default_slave.v b/system/src/nanosoc_ahb_busmatrix/verilog/nanosoc_4x7_AhbMatrix/nanosoc_4x7_AhbMatrix_default_slave.v
similarity index 100%
rename from system/src/nanosoc_ahb_busmatrix/built/verilog/nanosoc_4x7_AhbMatrix/nanosoc_4x7_AhbMatrix_default_slave.v
rename to system/src/nanosoc_ahb_busmatrix/verilog/nanosoc_4x7_AhbMatrix/nanosoc_4x7_AhbMatrix_default_slave.v
diff --git a/system/src/nanosoc_ahb_busmatrix/built/verilog/nanosoc_4x7_AhbMatrix/nanosoc_4x7_AhbMatrix_lite.v b/system/src/nanosoc_ahb_busmatrix/verilog/nanosoc_4x7_AhbMatrix/nanosoc_4x7_AhbMatrix_lite.v
similarity index 100%
rename from system/src/nanosoc_ahb_busmatrix/built/verilog/nanosoc_4x7_AhbMatrix/nanosoc_4x7_AhbMatrix_lite.v
rename to system/src/nanosoc_ahb_busmatrix/verilog/nanosoc_4x7_AhbMatrix/nanosoc_4x7_AhbMatrix_lite.v
diff --git a/system/src/nanosoc_ahb_busmatrix/built/verilog/nanosoc_4x7_AhbMatrix/nanosoc_4x7_Arbiter.v b/system/src/nanosoc_ahb_busmatrix/verilog/nanosoc_4x7_AhbMatrix/nanosoc_4x7_Arbiter.v
similarity index 100%
rename from system/src/nanosoc_ahb_busmatrix/built/verilog/nanosoc_4x7_AhbMatrix/nanosoc_4x7_Arbiter.v
rename to system/src/nanosoc_ahb_busmatrix/verilog/nanosoc_4x7_AhbMatrix/nanosoc_4x7_Arbiter.v
diff --git a/system/src/nanosoc_ahb_busmatrix/built/verilog/nanosoc_4x7_AhbMatrix/nanosoc_4x7_MasterInput.v b/system/src/nanosoc_ahb_busmatrix/verilog/nanosoc_4x7_AhbMatrix/nanosoc_4x7_MasterInput.v
similarity index 100%
rename from system/src/nanosoc_ahb_busmatrix/built/verilog/nanosoc_4x7_AhbMatrix/nanosoc_4x7_MasterInput.v
rename to system/src/nanosoc_ahb_busmatrix/verilog/nanosoc_4x7_AhbMatrix/nanosoc_4x7_MasterInput.v
diff --git a/system/src/nanosoc_ahb_busmatrix/built/verilog/nanosoc_4x7_AhbMatrix/nanosoc_4x7_MatrixDecode_adp.v b/system/src/nanosoc_ahb_busmatrix/verilog/nanosoc_4x7_AhbMatrix/nanosoc_4x7_MatrixDecode_adp.v
similarity index 100%
rename from system/src/nanosoc_ahb_busmatrix/built/verilog/nanosoc_4x7_AhbMatrix/nanosoc_4x7_MatrixDecode_adp.v
rename to system/src/nanosoc_ahb_busmatrix/verilog/nanosoc_4x7_AhbMatrix/nanosoc_4x7_MatrixDecode_adp.v
diff --git a/system/src/nanosoc_ahb_busmatrix/built/verilog/nanosoc_4x7_AhbMatrix/nanosoc_4x7_MatrixDecode_cpu.v b/system/src/nanosoc_ahb_busmatrix/verilog/nanosoc_4x7_AhbMatrix/nanosoc_4x7_MatrixDecode_cpu.v
similarity index 100%
rename from system/src/nanosoc_ahb_busmatrix/built/verilog/nanosoc_4x7_AhbMatrix/nanosoc_4x7_MatrixDecode_cpu.v
rename to system/src/nanosoc_ahb_busmatrix/verilog/nanosoc_4x7_AhbMatrix/nanosoc_4x7_MatrixDecode_cpu.v
diff --git a/system/src/nanosoc_ahb_busmatrix/built/verilog/nanosoc_4x7_AhbMatrix/nanosoc_4x7_MatrixDecode_dma.v b/system/src/nanosoc_ahb_busmatrix/verilog/nanosoc_4x7_AhbMatrix/nanosoc_4x7_MatrixDecode_dma.v
similarity index 100%
rename from system/src/nanosoc_ahb_busmatrix/built/verilog/nanosoc_4x7_AhbMatrix/nanosoc_4x7_MatrixDecode_dma.v
rename to system/src/nanosoc_ahb_busmatrix/verilog/nanosoc_4x7_AhbMatrix/nanosoc_4x7_MatrixDecode_dma.v
diff --git a/system/src/nanosoc_ahb_busmatrix/built/verilog/nanosoc_4x7_AhbMatrix/nanosoc_4x7_MatrixDecode_dma2.v b/system/src/nanosoc_ahb_busmatrix/verilog/nanosoc_4x7_AhbMatrix/nanosoc_4x7_MatrixDecode_dma2.v
similarity index 100%
rename from system/src/nanosoc_ahb_busmatrix/built/verilog/nanosoc_4x7_AhbMatrix/nanosoc_4x7_MatrixDecode_dma2.v
rename to system/src/nanosoc_ahb_busmatrix/verilog/nanosoc_4x7_AhbMatrix/nanosoc_4x7_MatrixDecode_dma2.v
diff --git a/system/src/nanosoc_ahb_busmatrix/built/verilog/nanosoc_4x7_AhbMatrix/nanosoc_4x7_SlaveOutput.v b/system/src/nanosoc_ahb_busmatrix/verilog/nanosoc_4x7_AhbMatrix/nanosoc_4x7_SlaveOutput.v
similarity index 100%
rename from system/src/nanosoc_ahb_busmatrix/built/verilog/nanosoc_4x7_AhbMatrix/nanosoc_4x7_SlaveOutput.v
rename to system/src/nanosoc_ahb_busmatrix/verilog/nanosoc_4x7_AhbMatrix/nanosoc_4x7_SlaveOutput.v
--
GitLab