diff --git a/system/src/nanosoc_ahb_busmatrix/ipxact/nanosoc_4x7_AhbMatrix/nanosoc_4x7_AhbMatrix.xml b/system/src/nanosoc_ahb_busmatrix/ipxact/nanosoc_ahb32_4x7_busmatrix/nanosoc_ahb32_4x7_busmatrix.xml
similarity index 99%
rename from system/src/nanosoc_ahb_busmatrix/ipxact/nanosoc_4x7_AhbMatrix/nanosoc_4x7_AhbMatrix.xml
rename to system/src/nanosoc_ahb_busmatrix/ipxact/nanosoc_ahb32_4x7_busmatrix/nanosoc_ahb32_4x7_busmatrix.xml
index 3b81491aa23347d23b4876feb22894219687d438..750b122f94aaae9d4629ba9b9cc9799525b148fb 100644
--- a/system/src/nanosoc_ahb_busmatrix/ipxact/nanosoc_4x7_AhbMatrix/nanosoc_4x7_AhbMatrix.xml
+++ b/system/src/nanosoc_ahb_busmatrix/ipxact/nanosoc_ahb32_4x7_busmatrix/nanosoc_ahb32_4x7_busmatrix.xml
@@ -21,7 +21,7 @@
<!-- Release Information : Cortex-M System Design Kit-r1p1-00rel0 -->
<!-- -->
<!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
-<!-- Purpose : IP-XACT description for the main top of nanosoc_4x7_AhbMatrix -->
+<!-- Purpose : IP-XACT description for the main top of nanosoc_ahb32_4x7_busmatrix -->
<!-- -->
<!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
@@ -30,7 +30,7 @@
xsi:schemaLocation="http://www.spiritconsortium.org/XMLSchema/SPIRIT/1685-2009 http://www.spiritconsortium.org/XMLSchema/SPIRIT/1685-2009/index.xsd">
<spirit:vendor>arm.com</spirit:vendor>
<spirit:library>CoreLink</spirit:library>
- <spirit:name>nanosoc_4x7_AhbMatrix</spirit:name>
+ <spirit:name>nanosoc_ahb32_4x7_busmatrix</spirit:name>
<spirit:version>r0p0_0</spirit:version>
<spirit:busInterfaces>
@@ -2448,11 +2448,11 @@
<spirit:views>
<spirit:view>
<spirit:name>verilogsource</spirit:name>
- <spirit:description>nanosoc_4x7_AhbMatrix bus matrix</spirit:description>
+ <spirit:description>nanosoc_ahb32_4x7_busmatrix bus matrix</spirit:description>
<spirit:envIdentifier>:*Simulation:</spirit:envIdentifier>
<spirit:envIdentifier>:*Synthesis:</spirit:envIdentifier>
<spirit:language>verilog</spirit:language>
- <spirit:modelName>nanosoc_4x7_AhbMatrix</spirit:modelName>
+ <spirit:modelName>nanosoc_ahb32_4x7_busmatrix</spirit:modelName>
<spirit:fileSetRef>
<spirit:localName>fs-verilogsource</spirit:localName>
</spirit:fileSetRef>
@@ -4211,47 +4211,47 @@
<spirit:fileSet>
<spirit:name>fs-verilogsource</spirit:name>
<spirit:displayName/>
- <spirit:description>File list for nanosoc_4x7_AhbMatrix</spirit:description>
+ <spirit:description>File list for nanosoc_ahb32_4x7_busmatrix</spirit:description>
<spirit:file>
- <spirit:name>../../verilog/nanosoc_4x7_AhbMatrix/nanosoc_4x7_AhbMatrix.v</spirit:name>
+ <spirit:name>../../verilog/nanosoc_ahb32_4x7_busmatrix/nanosoc_ahb32_4x7_busmatrix.v</spirit:name>
<spirit:fileType>verilogSource-2001</spirit:fileType>
<spirit:isIncludeFile spirit:externalDeclarations="true">false</spirit:isIncludeFile>
</spirit:file>
<spirit:file>
- <spirit:name>../../verilog/nanosoc_4x7_AhbMatrix/nanosoc_4x7_AhbMatrix_default_slave.v</spirit:name>
+ <spirit:name>../../verilog/nanosoc_ahb32_4x7_busmatrix/nanosoc_ahb32_4x7_busmatrix_default_slave.v</spirit:name>
<spirit:fileType>verilogSource-2001</spirit:fileType>
</spirit:file>
<spirit:file>
- <spirit:name>../../verilog/nanosoc_4x7_AhbMatrix/nanosoc_4x7_MasterInput.v</spirit:name>
+ <spirit:name>../../verilog/nanosoc_ahb32_4x7_busmatrix/nanosoc_ahb32_4x7_inititator_input.v</spirit:name>
<spirit:fileType>verilogSource-2001</spirit:fileType>
</spirit:file>
<spirit:file>
- <spirit:name>../../verilog/nanosoc_4x7_AhbMatrix/nanosoc_4x7_MatrixDecode_adp.v</spirit:name>
+ <spirit:name>../../verilog/nanosoc_ahb32_4x7_busmatrix/nanosoc_ahb32_4x7_matrix_decode_adp.v</spirit:name>
<spirit:fileType>verilogSource-2001</spirit:fileType>
</spirit:file>
<spirit:file>
- <spirit:name>../../verilog/nanosoc_4x7_AhbMatrix/nanosoc_4x7_MatrixDecode_dma.v</spirit:name>
+ <spirit:name>../../verilog/nanosoc_ahb32_4x7_busmatrix/nanosoc_ahb32_4x7_matrix_decode_dma.v</spirit:name>
<spirit:fileType>verilogSource-2001</spirit:fileType>
</spirit:file>
<spirit:file>
- <spirit:name>../../verilog/nanosoc_4x7_AhbMatrix/nanosoc_4x7_MatrixDecode_dma2.v</spirit:name>
+ <spirit:name>../../verilog/nanosoc_ahb32_4x7_busmatrix/nanosoc_ahb32_4x7_matrix_decode_dma2.v</spirit:name>
<spirit:fileType>verilogSource-2001</spirit:fileType>
</spirit:file>
<spirit:file>
- <spirit:name>../../verilog/nanosoc_4x7_AhbMatrix/nanosoc_4x7_MatrixDecode_cpu.v</spirit:name>
+ <spirit:name>../../verilog/nanosoc_ahb32_4x7_busmatrix/nanosoc_ahb32_4x7_matrix_decode_cpu.v</spirit:name>
<spirit:fileType>verilogSource-2001</spirit:fileType>
</spirit:file>
<spirit:file>
- <spirit:name>../../verilog/nanosoc_4x7_AhbMatrix/nanosoc_4x7_Arbiter.v</spirit:name>
+ <spirit:name>../../verilog/nanosoc_ahb32_4x7_busmatrix/nanosoc_ahb32_4x7_arbiter.v</spirit:name>
<spirit:fileType>verilogSource-2001</spirit:fileType>
</spirit:file>
<spirit:file>
- <spirit:name>../../verilog/nanosoc_4x7_AhbMatrix/nanosoc_4x7_SlaveOutput.v</spirit:name>
+ <spirit:name>../../verilog/nanosoc_ahb32_4x7_busmatrix/nanosoc_ahb32_4x7_target_output.v</spirit:name>
<spirit:fileType>verilogSource-2001</spirit:fileType>
</spirit:file>
</spirit:fileSet>
</spirit:fileSets>
- <spirit:description>nanosoc_4x7_AhbMatrix</spirit:description>
+ <spirit:description>nanosoc_ahb32_4x7_busmatrix</spirit:description>
</spirit:component>
diff --git a/system/src/nanosoc_ahb_busmatrix/ipxact/nanosoc_4x7_AhbMatrix/nanosoc_4x7_AhbMatrix_lite.xml b/system/src/nanosoc_ahb_busmatrix/ipxact/nanosoc_ahb32_4x7_busmatrix/nanosoc_ahb32_4x7_busmatrix_lite.xml
similarity index 98%
rename from system/src/nanosoc_ahb_busmatrix/ipxact/nanosoc_4x7_AhbMatrix/nanosoc_4x7_AhbMatrix_lite.xml
rename to system/src/nanosoc_ahb_busmatrix/ipxact/nanosoc_ahb32_4x7_busmatrix/nanosoc_ahb32_4x7_busmatrix_lite.xml
index 8893613a8dde1d6fbb20f8264db5ee5e61232f13..0ef75c3fc5856c3d78ebb7112e99a823ec341bb5 100644
--- a/system/src/nanosoc_ahb_busmatrix/ipxact/nanosoc_4x7_AhbMatrix/nanosoc_4x7_AhbMatrix_lite.xml
+++ b/system/src/nanosoc_ahb_busmatrix/ipxact/nanosoc_ahb32_4x7_busmatrix/nanosoc_ahb32_4x7_busmatrix_lite.xml
@@ -21,7 +21,7 @@
<!-- Release Information : Cortex-M System Design Kit-r1p1-00rel0 -->
<!-- -->
<!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
-<!-- Purpose : IP-XACT description for the AHB-Lite wrapper of nanosoc_4x7_AhbMatrix_lite -->
+<!-- Purpose : IP-XACT description for the AHB-Lite wrapper of nanosoc_ahb32_4x7_busmatrix_lite -->
<!-- -->
<!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
@@ -30,7 +30,7 @@
xsi:schemaLocation="http://www.spiritconsortium.org/XMLSchema/SPIRIT/1685-2009 http://www.spiritconsortium.org/XMLSchema/SPIRIT/1685-2009/index.xsd">
<spirit:vendor>arm.com</spirit:vendor>
<spirit:library>CoreLink</spirit:library>
- <spirit:name>nanosoc_4x7_AhbMatrix_lite</spirit:name>
+ <spirit:name>nanosoc_ahb32_4x7_busmatrix_lite</spirit:name>
<spirit:version>r0p0_0</spirit:version>
<spirit:busInterfaces>
@@ -2307,11 +2307,11 @@
<spirit:views>
<spirit:view>
<spirit:name>verilogsource</spirit:name>
- <spirit:description>nanosoc_4x7_AhbMatrix_lite bus matrix</spirit:description>
+ <spirit:description>nanosoc_ahb32_4x7_busmatrix_lite bus matrix</spirit:description>
<spirit:envIdentifier>:*Simulation:</spirit:envIdentifier>
<spirit:envIdentifier>:*Synthesis:</spirit:envIdentifier>
<spirit:language>verilog</spirit:language>
- <spirit:modelName>nanosoc_4x7_AhbMatrix_lite</spirit:modelName>
+ <spirit:modelName>nanosoc_ahb32_4x7_busmatrix_lite</spirit:modelName>
<spirit:fileSetRef>
<spirit:localName>fs-verilogsource</spirit:localName>
</spirit:fileSetRef>
@@ -3852,51 +3852,51 @@
<spirit:fileSet>
<spirit:name>fs-verilogsource</spirit:name>
<spirit:displayName/>
- <spirit:description>File list for nanosoc_4x7_AhbMatrix_lite</spirit:description>
+ <spirit:description>File list for nanosoc_ahb32_4x7_busmatrix_lite</spirit:description>
<spirit:file>
- <spirit:name>../../verilog/nanosoc_4x7_AhbMatrix/nanosoc_4x7_AhbMatrix_lite.v</spirit:name>
+ <spirit:name>../../verilog/nanosoc_ahb32_4x7_busmatrix/nanosoc_ahb32_4x7_busmatrix_lite.v</spirit:name>
<spirit:fileType>verilogSource-2001</spirit:fileType>
<spirit:isIncludeFile spirit:externalDeclarations="true">false</spirit:isIncludeFile>
</spirit:file>
<spirit:file>
- <spirit:name>../../verilog/nanosoc_4x7_AhbMatrix/nanosoc_4x7_AhbMatrix.v</spirit:name>
+ <spirit:name>../../verilog/nanosoc_ahb32_4x7_busmatrix/nanosoc_ahb32_4x7_busmatrix.v</spirit:name>
<spirit:fileType>verilogSource-2001</spirit:fileType>
</spirit:file>
<spirit:file>
- <spirit:name>../../verilog/nanosoc_4x7_AhbMatrix/nanosoc_4x7_AhbMatrix_default_slave.v</spirit:name>
+ <spirit:name>../../verilog/nanosoc_ahb32_4x7_busmatrix/nanosoc_ahb32_4x7_busmatrix_default_slave.v</spirit:name>
<spirit:fileType>verilogSource-2001</spirit:fileType>
</spirit:file>
<spirit:file>
- <spirit:name>../../verilog/nanosoc_4x7_AhbMatrix/nanosoc_4x7_MasterInput.v</spirit:name>
+ <spirit:name>../../verilog/nanosoc_ahb32_4x7_busmatrix/nanosoc_ahb32_4x7_inititator_input.v</spirit:name>
<spirit:fileType>verilogSource-2001</spirit:fileType>
</spirit:file>
<spirit:file>
- <spirit:name>../../verilog/nanosoc_4x7_AhbMatrix/nanosoc_4x7_MatrixDecode_adp.v</spirit:name>
+ <spirit:name>../../verilog/nanosoc_ahb32_4x7_busmatrix/nanosoc_ahb32_4x7_matrix_decode_adp.v</spirit:name>
<spirit:fileType>verilogSource-2001</spirit:fileType>
</spirit:file>
<spirit:file>
- <spirit:name>../../verilog/nanosoc_4x7_AhbMatrix/nanosoc_4x7_MatrixDecode_dma.v</spirit:name>
+ <spirit:name>../../verilog/nanosoc_ahb32_4x7_busmatrix/nanosoc_ahb32_4x7_matrix_decode_dma.v</spirit:name>
<spirit:fileType>verilogSource-2001</spirit:fileType>
</spirit:file>
<spirit:file>
- <spirit:name>../../verilog/nanosoc_4x7_AhbMatrix/nanosoc_4x7_MatrixDecode_dma2.v</spirit:name>
+ <spirit:name>../../verilog/nanosoc_ahb32_4x7_busmatrix/nanosoc_ahb32_4x7_matrix_decode_dma2.v</spirit:name>
<spirit:fileType>verilogSource-2001</spirit:fileType>
</spirit:file>
<spirit:file>
- <spirit:name>../../verilog/nanosoc_4x7_AhbMatrix/nanosoc_4x7_MatrixDecode_cpu.v</spirit:name>
+ <spirit:name>../../verilog/nanosoc_ahb32_4x7_busmatrix/nanosoc_ahb32_4x7_matrix_decode_cpu.v</spirit:name>
<spirit:fileType>verilogSource-2001</spirit:fileType>
</spirit:file>
<spirit:file>
- <spirit:name>../../verilog/nanosoc_4x7_AhbMatrix/nanosoc_4x7_Arbiter.v</spirit:name>
+ <spirit:name>../../verilog/nanosoc_ahb32_4x7_busmatrix/nanosoc_ahb32_4x7_arbiter.v</spirit:name>
<spirit:fileType>verilogSource-2001</spirit:fileType>
</spirit:file>
<spirit:file>
- <spirit:name>../../verilog/nanosoc_4x7_AhbMatrix/nanosoc_4x7_SlaveOutput.v</spirit:name>
+ <spirit:name>../../verilog/nanosoc_ahb32_4x7_busmatrix/nanosoc_ahb32_4x7_target_output.v</spirit:name>
<spirit:fileType>verilogSource-2001</spirit:fileType>
</spirit:file>
</spirit:fileSet>
</spirit:fileSets>
- <spirit:description>nanosoc_4x7_AhbMatrix_lite</spirit:description>
+ <spirit:description>nanosoc_ahb32_4x7_busmatrix_lite</spirit:description>
</spirit:component>
diff --git a/system/src/nanosoc_ahb_busmatrix/logs/nanosoc_ahb32_4x7.log b/system/src/nanosoc_ahb_busmatrix/logs/nanosoc_ahb32_4x7.log
index 1ef2d1d31ea1d779c4bfb0d59f9b019ee861cd11..6cfcb6733255c4dceb97960a4115a83db3f483f0 100644
--- a/system/src/nanosoc_ahb_busmatrix/logs/nanosoc_ahb32_4x7.log
+++ b/system/src/nanosoc_ahb_busmatrix/logs/nanosoc_ahb32_4x7.log
@@ -14,13 +14,13 @@
=
= BuildBusMatrix.pl
=
-= Run Date : 28/04/2023 17:11:03
+= Run Date : 28/04/2023 17:24:27
==============================================================
Script accepted the following parameters:
- Configuration file : '/home/dam1n19/Design/test1/secworks-sha256-project/nanosoc/system/src/nanosoc_ahb_busmatrix/xml/nanosoc_ahb32_4x7.xml'
- - Top-level name : 'nanosoc_4x7_AhbMatrix'
+ - Top-level name : 'nanosoc_ahb32_4x7_busmatrix'
- Slave interfaces : 4
- Master interfaces : 7
- Architecture type : 'ahb2'
@@ -43,18 +43,18 @@ Script accepted the following parameters:
Creating the bus matrix variant...
- - Rendering 'nanosoc_4x7_MatrixDecode_cpu.v'
- - Rendering 'nanosoc_4x7_SlaveOutput.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'
+ - Rendering 'nanosoc_ahb32_4x7_busmatrix_default_slave.v'
+ - Rendering 'nanosoc_ahb32_4x7_busmatrix.v'
+ - Rendering 'nanosoc_ahb32_4x7_busmatrix.xml'
+ - Rendering 'nanosoc_ahb32_4x7_arbiter.v'
+ - Rendering 'nanosoc_ahb32_4x7_inititator_input.v'
+ - Rendering 'nanosoc_ahb32_4x7_matrix_decode_dma.v'
+ - Rendering 'nanosoc_ahb32_4x7_target_output.v'
+ - Rendering 'nanosoc_ahb32_4x7_matrix_decode_adp.v'
+ - Rendering 'nanosoc_ahb32_4x7_busmatrix_lite.v'
+ - Rendering 'nanosoc_ahb32_4x7_matrix_decode_cpu.v'
+ - Rendering 'nanosoc_ahb32_4x7_matrix_decode_dma2.v'
+ - Rendering 'nanosoc_ahb32_4x7_busmatrix_lite.xml'
Done!
diff --git a/system/src/nanosoc_ahb_busmatrix/verilog/nanosoc_4x7_AhbMatrix/nanosoc_4x7_Arbiter.v b/system/src/nanosoc_ahb_busmatrix/verilog/nanosoc_ahb32_4x7_busmatrix/nanosoc_ahb32_4x7_arbiter.v
similarity index 99%
rename from system/src/nanosoc_ahb_busmatrix/verilog/nanosoc_4x7_AhbMatrix/nanosoc_4x7_Arbiter.v
rename to system/src/nanosoc_ahb_busmatrix/verilog/nanosoc_ahb32_4x7_busmatrix/nanosoc_ahb32_4x7_arbiter.v
index 53832f60fe0d83e30b788a13db8ef389b6a28b0c..9480d052f3d4b93584d1452b5c15503e652fbaa4 100644
--- a/system/src/nanosoc_ahb_busmatrix/verilog/nanosoc_4x7_AhbMatrix/nanosoc_4x7_Arbiter.v
+++ b/system/src/nanosoc_ahb_busmatrix/verilog/nanosoc_ahb32_4x7_busmatrix/nanosoc_ahb32_4x7_arbiter.v
@@ -32,7 +32,7 @@
-module nanosoc_4x7_Arbiter (
+module nanosoc_ahb32_4x7_arbiter (
// Common AHB signals
HCLK ,
diff --git a/system/src/nanosoc_ahb_busmatrix/verilog/nanosoc_4x7_AhbMatrix/nanosoc_4x7_AhbMatrix.v b/system/src/nanosoc_ahb_busmatrix/verilog/nanosoc_ahb32_4x7_busmatrix/nanosoc_ahb32_4x7_busmatrix.v
similarity index 98%
rename from system/src/nanosoc_ahb_busmatrix/verilog/nanosoc_4x7_AhbMatrix/nanosoc_4x7_AhbMatrix.v
rename to system/src/nanosoc_ahb_busmatrix/verilog/nanosoc_ahb32_4x7_busmatrix/nanosoc_ahb32_4x7_busmatrix.v
index 496b49ff0f4094139ab5a5cbbb3c113608268d6c..610aa3f1565656a407abfdf4e4f3ed84219c2c67 100644
--- a/system/src/nanosoc_ahb_busmatrix/verilog/nanosoc_4x7_AhbMatrix/nanosoc_4x7_AhbMatrix.v
+++ b/system/src/nanosoc_ahb_busmatrix/verilog/nanosoc_ahb32_4x7_busmatrix/nanosoc_ahb32_4x7_busmatrix.v
@@ -43,7 +43,7 @@
-module nanosoc_4x7_AhbMatrix (
+module nanosoc_ahb32_4x7_busmatrix (
// Common AHB signals
HCLK,
@@ -971,7 +971,7 @@ module nanosoc_4x7_AhbMatrix (
// -----------------------------------------------------------------------------
// Input stage for SI0
- nanosoc_4x7_MasterInput u_nanosoc_4x7_MasterInput_0 (
+ nanosoc_ahb32_4x7_inititator_input u_nanosoc_ahb32_4x7_inititator_input_0 (
// Common AHB signals
.HCLK (HCLK),
@@ -1016,7 +1016,7 @@ module nanosoc_4x7_AhbMatrix (
// Input stage for SI1
- nanosoc_4x7_MasterInput u_nanosoc_4x7_MasterInput_1 (
+ nanosoc_ahb32_4x7_inititator_input u_nanosoc_ahb32_4x7_inititator_input_1 (
// Common AHB signals
.HCLK (HCLK),
@@ -1061,7 +1061,7 @@ module nanosoc_4x7_AhbMatrix (
// Input stage for SI2
- nanosoc_4x7_MasterInput u_nanosoc_4x7_MasterInput_2 (
+ nanosoc_ahb32_4x7_inititator_input u_nanosoc_ahb32_4x7_inititator_input_2 (
// Common AHB signals
.HCLK (HCLK),
@@ -1106,7 +1106,7 @@ module nanosoc_4x7_AhbMatrix (
// Input stage for SI3
- nanosoc_4x7_MasterInput u_nanosoc_4x7_MasterInput_3 (
+ nanosoc_ahb32_4x7_inititator_input u_nanosoc_ahb32_4x7_inititator_input_3 (
// Common AHB signals
.HCLK (HCLK),
@@ -1151,7 +1151,7 @@ module nanosoc_4x7_AhbMatrix (
// Matrix decoder for SI0
- nanosoc_4x7_MatrixDecode_adp u_nanosoc_4x7_matrixdecode_adp (
+ nanosoc_ahb32_4x7_matrix_decode_adp u_nanosoc_ahb32_4x7_matrix_decode_adp (
// Common AHB signals
.HCLK (HCLK),
@@ -1233,7 +1233,7 @@ module nanosoc_4x7_AhbMatrix (
// Matrix decoder for SI1
- nanosoc_4x7_MatrixDecode_dma u_nanosoc_4x7_matrixdecode_dma (
+ nanosoc_ahb32_4x7_matrix_decode_dma u_nanosoc_ahb32_4x7_matrix_decode_dma (
// Common AHB signals
.HCLK (HCLK),
@@ -1312,7 +1312,7 @@ module nanosoc_4x7_AhbMatrix (
// Matrix decoder for SI2
- nanosoc_4x7_MatrixDecode_dma2 u_nanosoc_4x7_matrixdecode_dma2 (
+ nanosoc_ahb32_4x7_matrix_decode_dma2 u_nanosoc_ahb32_4x7_matrix_decode_dma2 (
// Common AHB signals
.HCLK (HCLK),
@@ -1391,7 +1391,7 @@ module nanosoc_4x7_AhbMatrix (
// Matrix decoder for SI3
- nanosoc_4x7_MatrixDecode_cpu u_nanosoc_4x7_matrixdecode_cpu (
+ nanosoc_ahb32_4x7_matrix_decode_cpu u_nanosoc_ahb32_4x7_matrix_decode_cpu (
// Common AHB signals
.HCLK (HCLK),
@@ -1473,7 +1473,7 @@ module nanosoc_4x7_AhbMatrix (
// Output stage for MI0
- nanosoc_4x7_SlaveOutput u_nanosoc_4x7_slaveoutput_0 (
+ nanosoc_ahb32_4x7_target_output u_nanosoc_ahb32_4x7_target_output_0 (
// Common AHB signals
.HCLK (HCLK),
@@ -1569,7 +1569,7 @@ module nanosoc_4x7_AhbMatrix (
// Output stage for MI1
- nanosoc_4x7_SlaveOutput u_nanosoc_4x7_slaveoutput_1 (
+ nanosoc_ahb32_4x7_target_output u_nanosoc_ahb32_4x7_target_output_1 (
// Common AHB signals
.HCLK (HCLK),
@@ -1665,7 +1665,7 @@ module nanosoc_4x7_AhbMatrix (
// Output stage for MI2
- nanosoc_4x7_SlaveOutput u_nanosoc_4x7_slaveoutput_2 (
+ nanosoc_ahb32_4x7_target_output u_nanosoc_ahb32_4x7_target_output_2 (
// Common AHB signals
.HCLK (HCLK),
@@ -1761,7 +1761,7 @@ module nanosoc_4x7_AhbMatrix (
// Output stage for MI3
- nanosoc_4x7_SlaveOutput u_nanosoc_4x7_slaveoutput_3 (
+ nanosoc_ahb32_4x7_target_output u_nanosoc_ahb32_4x7_target_output_3 (
// Common AHB signals
.HCLK (HCLK),
@@ -1857,7 +1857,7 @@ module nanosoc_4x7_AhbMatrix (
// Output stage for MI4
- nanosoc_4x7_SlaveOutput u_nanosoc_4x7_slaveoutput_4 (
+ nanosoc_ahb32_4x7_target_output u_nanosoc_ahb32_4x7_target_output_4 (
// Common AHB signals
.HCLK (HCLK),
@@ -1953,7 +1953,7 @@ module nanosoc_4x7_AhbMatrix (
// Output stage for MI5
- nanosoc_4x7_SlaveOutput u_nanosoc_4x7_slaveoutput_5 (
+ nanosoc_ahb32_4x7_target_output u_nanosoc_ahb32_4x7_target_output_5 (
// Common AHB signals
.HCLK (HCLK),
@@ -2049,7 +2049,7 @@ module nanosoc_4x7_AhbMatrix (
// Output stage for MI6
- nanosoc_4x7_SlaveOutput u_nanosoc_4x7_slaveoutput_6 (
+ nanosoc_ahb32_4x7_target_output u_nanosoc_ahb32_4x7_target_output_6 (
// Common AHB signals
.HCLK (HCLK),
diff --git a/system/src/nanosoc_ahb_busmatrix/verilog/nanosoc_4x7_AhbMatrix/nanosoc_4x7_AhbMatrix_default_slave.v b/system/src/nanosoc_ahb_busmatrix/verilog/nanosoc_ahb32_4x7_busmatrix/nanosoc_ahb32_4x7_busmatrix_default_slave.v
similarity index 98%
rename from system/src/nanosoc_ahb_busmatrix/verilog/nanosoc_4x7_AhbMatrix/nanosoc_4x7_AhbMatrix_default_slave.v
rename to system/src/nanosoc_ahb_busmatrix/verilog/nanosoc_ahb32_4x7_busmatrix/nanosoc_ahb32_4x7_busmatrix_default_slave.v
index 4d2fd4a9006c0c0274f133e1e455504dd5708ff9..a43ec0c9bba5e0bc66e8856914a9ddaa40598d80 100644
--- a/system/src/nanosoc_ahb_busmatrix/verilog/nanosoc_4x7_AhbMatrix/nanosoc_4x7_AhbMatrix_default_slave.v
+++ b/system/src/nanosoc_ahb_busmatrix/verilog/nanosoc_ahb32_4x7_busmatrix/nanosoc_ahb32_4x7_busmatrix_default_slave.v
@@ -28,7 +28,7 @@
-module nanosoc_4x7_AhbMatrix_default_slave (
+module nanosoc_ahb32_4x7_busmatrix_default_slave (
// Common AHB signals
HCLK,
diff --git a/system/src/nanosoc_ahb_busmatrix/verilog/nanosoc_4x7_AhbMatrix/nanosoc_4x7_AhbMatrix_lite.v b/system/src/nanosoc_ahb_busmatrix/verilog/nanosoc_ahb32_4x7_busmatrix/nanosoc_ahb32_4x7_busmatrix_lite.v
similarity index 99%
rename from system/src/nanosoc_ahb_busmatrix/verilog/nanosoc_4x7_AhbMatrix/nanosoc_4x7_AhbMatrix_lite.v
rename to system/src/nanosoc_ahb_busmatrix/verilog/nanosoc_ahb32_4x7_busmatrix/nanosoc_ahb32_4x7_busmatrix_lite.v
index b4653fd3ffe57818632752d958ee1a2baccfbff9..ce2264e1a2dfe3efa4074cdcca8d48ec9c49ffd1 100644
--- a/system/src/nanosoc_ahb_busmatrix/verilog/nanosoc_4x7_AhbMatrix/nanosoc_4x7_AhbMatrix_lite.v
+++ b/system/src/nanosoc_ahb_busmatrix/verilog/nanosoc_ahb32_4x7_busmatrix/nanosoc_ahb32_4x7_busmatrix_lite.v
@@ -30,7 +30,7 @@
-module nanosoc_4x7_AhbMatrix_lite (
+module nanosoc_ahb32_4x7_busmatrix_lite (
// Common AHB signals
HCLK,
@@ -757,7 +757,7 @@ module nanosoc_4x7_AhbMatrix_lite (
assign i_hresp_exp = {{1{tie_low}}, HRESP_exp};
// BusMatrix instance
- nanosoc_4x7_AhbMatrix unanosoc_4x7_AhbMatrix (
+ nanosoc_ahb32_4x7_busmatrix unanosoc_ahb32_4x7_busmatrix (
.HCLK (HCLK),
.HRESETn (HRESETn),
.REMAP (REMAP),
diff --git a/system/src/nanosoc_ahb_busmatrix/verilog/nanosoc_4x7_AhbMatrix/nanosoc_4x7_MasterInput.v b/system/src/nanosoc_ahb_busmatrix/verilog/nanosoc_ahb32_4x7_busmatrix/nanosoc_ahb32_4x7_inititator_input.v
similarity index 99%
rename from system/src/nanosoc_ahb_busmatrix/verilog/nanosoc_4x7_AhbMatrix/nanosoc_4x7_MasterInput.v
rename to system/src/nanosoc_ahb_busmatrix/verilog/nanosoc_ahb32_4x7_busmatrix/nanosoc_ahb32_4x7_inititator_input.v
index 0c2a3c172d09265352a1b209da921d6f2bc1a88a..f44b208ff4aa4909edc5a1fafd20867a342d7dfa 100644
--- a/system/src/nanosoc_ahb_busmatrix/verilog/nanosoc_4x7_AhbMatrix/nanosoc_4x7_MasterInput.v
+++ b/system/src/nanosoc_ahb_busmatrix/verilog/nanosoc_ahb32_4x7_busmatrix/nanosoc_ahb32_4x7_inititator_input.v
@@ -29,7 +29,7 @@
-module nanosoc_4x7_MasterInput (
+module nanosoc_ahb32_4x7_inititator_input (
// Common AHB signals
HCLK,
diff --git a/system/src/nanosoc_ahb_busmatrix/verilog/nanosoc_4x7_AhbMatrix/nanosoc_4x7_MatrixDecode_cpu.v b/system/src/nanosoc_ahb_busmatrix/verilog/nanosoc_ahb32_4x7_busmatrix/nanosoc_ahb32_4x7_matrix_decode_adp.v
similarity index 99%
rename from system/src/nanosoc_ahb_busmatrix/verilog/nanosoc_4x7_AhbMatrix/nanosoc_4x7_MatrixDecode_cpu.v
rename to system/src/nanosoc_ahb_busmatrix/verilog/nanosoc_ahb32_4x7_busmatrix/nanosoc_ahb32_4x7_matrix_decode_adp.v
index 383eb8292d27ee07eff044f2e2a9c1c9d978f2c2..e748865cc5595a0b0701279e79a9a282b1a84ebf 100644
--- a/system/src/nanosoc_ahb_busmatrix/verilog/nanosoc_4x7_AhbMatrix/nanosoc_4x7_MatrixDecode_cpu.v
+++ b/system/src/nanosoc_ahb_busmatrix/verilog/nanosoc_ahb32_4x7_busmatrix/nanosoc_ahb32_4x7_matrix_decode_adp.v
@@ -33,7 +33,7 @@
-module nanosoc_4x7_MatrixDecode_cpu (
+module nanosoc_ahb32_4x7_matrix_decode_adp (
// Common AHB signals
HCLK,
@@ -300,7 +300,7 @@ module nanosoc_4x7_MatrixDecode_cpu (
// Default slave (accessed when HADDR is unmapped)
//------------------------------------------------------------------------------
- nanosoc_4x7_AhbMatrix_default_slave u_nanosoc_4x7_AhbMatrix_default_slave (
+ nanosoc_ahb32_4x7_busmatrix_default_slave u_nanosoc_ahb32_4x7_busmatrix_default_slave (
// Common AHB signals
.HCLK (HCLK),
diff --git a/system/src/nanosoc_ahb_busmatrix/verilog/nanosoc_4x7_AhbMatrix/nanosoc_4x7_MatrixDecode_adp.v b/system/src/nanosoc_ahb_busmatrix/verilog/nanosoc_ahb32_4x7_busmatrix/nanosoc_ahb32_4x7_matrix_decode_cpu.v
similarity index 99%
rename from system/src/nanosoc_ahb_busmatrix/verilog/nanosoc_4x7_AhbMatrix/nanosoc_4x7_MatrixDecode_adp.v
rename to system/src/nanosoc_ahb_busmatrix/verilog/nanosoc_ahb32_4x7_busmatrix/nanosoc_ahb32_4x7_matrix_decode_cpu.v
index 19020129adcdfdf8935aa5b8baa417176c7b8370..f918dcb94daa5b41ca7e961395e6ac7b9f9209aa 100644
--- a/system/src/nanosoc_ahb_busmatrix/verilog/nanosoc_4x7_AhbMatrix/nanosoc_4x7_MatrixDecode_adp.v
+++ b/system/src/nanosoc_ahb_busmatrix/verilog/nanosoc_ahb32_4x7_busmatrix/nanosoc_ahb32_4x7_matrix_decode_cpu.v
@@ -33,7 +33,7 @@
-module nanosoc_4x7_MatrixDecode_adp (
+module nanosoc_ahb32_4x7_matrix_decode_cpu (
// Common AHB signals
HCLK,
@@ -300,7 +300,7 @@ module nanosoc_4x7_MatrixDecode_adp (
// Default slave (accessed when HADDR is unmapped)
//------------------------------------------------------------------------------
- nanosoc_4x7_AhbMatrix_default_slave u_nanosoc_4x7_AhbMatrix_default_slave (
+ nanosoc_ahb32_4x7_busmatrix_default_slave u_nanosoc_ahb32_4x7_busmatrix_default_slave (
// Common AHB signals
.HCLK (HCLK),
diff --git a/system/src/nanosoc_ahb_busmatrix/verilog/nanosoc_4x7_AhbMatrix/nanosoc_4x7_MatrixDecode_dma.v b/system/src/nanosoc_ahb_busmatrix/verilog/nanosoc_ahb32_4x7_busmatrix/nanosoc_ahb32_4x7_matrix_decode_dma.v
similarity index 99%
rename from system/src/nanosoc_ahb_busmatrix/verilog/nanosoc_4x7_AhbMatrix/nanosoc_4x7_MatrixDecode_dma.v
rename to system/src/nanosoc_ahb_busmatrix/verilog/nanosoc_ahb32_4x7_busmatrix/nanosoc_ahb32_4x7_matrix_decode_dma.v
index 8c18a1260c5515cfd2111098a54d6d632a475dbd..8620f63109a1386e426090a04163c037b97b5b4d 100644
--- a/system/src/nanosoc_ahb_busmatrix/verilog/nanosoc_4x7_AhbMatrix/nanosoc_4x7_MatrixDecode_dma.v
+++ b/system/src/nanosoc_ahb_busmatrix/verilog/nanosoc_ahb32_4x7_busmatrix/nanosoc_ahb32_4x7_matrix_decode_dma.v
@@ -33,7 +33,7 @@
-module nanosoc_4x7_MatrixDecode_dma (
+module nanosoc_ahb32_4x7_matrix_decode_dma (
// Common AHB signals
HCLK,
@@ -292,7 +292,7 @@ module nanosoc_4x7_MatrixDecode_dma (
// Default slave (accessed when HADDR is unmapped)
//------------------------------------------------------------------------------
- nanosoc_4x7_AhbMatrix_default_slave u_nanosoc_4x7_AhbMatrix_default_slave (
+ nanosoc_ahb32_4x7_busmatrix_default_slave u_nanosoc_ahb32_4x7_busmatrix_default_slave (
// Common AHB signals
.HCLK (HCLK),
diff --git a/system/src/nanosoc_ahb_busmatrix/verilog/nanosoc_4x7_AhbMatrix/nanosoc_4x7_MatrixDecode_dma2.v b/system/src/nanosoc_ahb_busmatrix/verilog/nanosoc_ahb32_4x7_busmatrix/nanosoc_ahb32_4x7_matrix_decode_dma2.v
similarity index 99%
rename from system/src/nanosoc_ahb_busmatrix/verilog/nanosoc_4x7_AhbMatrix/nanosoc_4x7_MatrixDecode_dma2.v
rename to system/src/nanosoc_ahb_busmatrix/verilog/nanosoc_ahb32_4x7_busmatrix/nanosoc_ahb32_4x7_matrix_decode_dma2.v
index 74dd1af6c6ae16626fb3e319177d31be7d4db5d2..c841e8400d7e0a4ce571728cb08b6ee072161bcb 100644
--- a/system/src/nanosoc_ahb_busmatrix/verilog/nanosoc_4x7_AhbMatrix/nanosoc_4x7_MatrixDecode_dma2.v
+++ b/system/src/nanosoc_ahb_busmatrix/verilog/nanosoc_ahb32_4x7_busmatrix/nanosoc_ahb32_4x7_matrix_decode_dma2.v
@@ -33,7 +33,7 @@
-module nanosoc_4x7_MatrixDecode_dma2 (
+module nanosoc_ahb32_4x7_matrix_decode_dma2 (
// Common AHB signals
HCLK,
@@ -292,7 +292,7 @@ module nanosoc_4x7_MatrixDecode_dma2 (
// Default slave (accessed when HADDR is unmapped)
//------------------------------------------------------------------------------
- nanosoc_4x7_AhbMatrix_default_slave u_nanosoc_4x7_AhbMatrix_default_slave (
+ nanosoc_ahb32_4x7_busmatrix_default_slave u_nanosoc_ahb32_4x7_busmatrix_default_slave (
// Common AHB signals
.HCLK (HCLK),
diff --git a/system/src/nanosoc_ahb_busmatrix/verilog/nanosoc_4x7_AhbMatrix/nanosoc_4x7_SlaveOutput.v b/system/src/nanosoc_ahb_busmatrix/verilog/nanosoc_ahb32_4x7_busmatrix/nanosoc_ahb32_4x7_target_output.v
similarity index 99%
rename from system/src/nanosoc_ahb_busmatrix/verilog/nanosoc_4x7_AhbMatrix/nanosoc_4x7_SlaveOutput.v
rename to system/src/nanosoc_ahb_busmatrix/verilog/nanosoc_ahb32_4x7_busmatrix/nanosoc_ahb32_4x7_target_output.v
index 3521e530943c83630d3644ceb8a2666005db2e5f..083e5b33120aee40baf7c702e2ebe4ba94b9f692 100644
--- a/system/src/nanosoc_ahb_busmatrix/verilog/nanosoc_4x7_AhbMatrix/nanosoc_4x7_SlaveOutput.v
+++ b/system/src/nanosoc_ahb_busmatrix/verilog/nanosoc_ahb32_4x7_busmatrix/nanosoc_ahb32_4x7_target_output.v
@@ -32,7 +32,7 @@
-module nanosoc_4x7_SlaveOutput (
+module nanosoc_ahb32_4x7_target_output (
// Common AHB signals
HCLK,
@@ -341,7 +341,7 @@ module nanosoc_4x7_SlaveOutput (
assign req_port3 = held_tran_op3 & sel_op3;
// Arbiter instance for resolving requests to this output stage
- nanosoc_4x7_Arbiter u_output_arb (
+ nanosoc_ahb32_4x7_arbiter u_output_arb (
.HCLK (HCLK),
.HRESETn (HRESETn),
diff --git a/system/src/nanosoc_ahb_busmatrix/xml/nanosoc_ahb32_4x7.xml b/system/src/nanosoc_ahb_busmatrix/xml/nanosoc_ahb32_4x7.xml
index 10f7aa161092934c8d45da95bf08b891bf99537d..ad16c547e2cd9557c76adcc21501d8327ee53266 100644
--- a/system/src/nanosoc_ahb_busmatrix/xml/nanosoc_ahb32_4x7.xml
+++ b/system/src/nanosoc_ahb_busmatrix/xml/nanosoc_ahb32_4x7.xml
@@ -52,11 +52,11 @@
<routing_data_width>32</routing_data_width>
<routing_address_width>32</routing_address_width>
<user_signal_width>2</user_signal_width>
- <bus_matrix_name>nanosoc_4x7_AhbMatrix</bus_matrix_name>
- <input_stage_name>nanosoc_4x7_MasterInput</input_stage_name>
- <matrix_decode_name>nanosoc_4x7_MatrixDecode</matrix_decode_name>
- <output_arbiter_name>nanosoc_4x7_Arbiter</output_arbiter_name>
- <output_stage_name>nanosoc_4x7_SlaveOutput</output_stage_name>
+ <bus_matrix_name>nanosoc_ahb32_4x7_busmatrix</bus_matrix_name>
+ <input_stage_name>nanosoc_ahb32_4x7_inititator_input</input_stage_name>
+ <matrix_decode_name>nanosoc_ahb32_4x7_matrix_decode</matrix_decode_name>
+ <output_arbiter_name>nanosoc_ahb32_4x7_arbiter</output_arbiter_name>
+ <output_stage_name>nanosoc_ahb32_4x7_target_output</output_stage_name>
<!-- Slave interface definitions -->