pulp-platform · belanoa · Oct 18, 2024 · Oct 18, 2024 · Oct 18, 2024
diff --git a/Bender.yml b/Bender.yml
@@ -87,7 +87,3 @@ sources:
       - tb/mock_uart_axi.sv
       - tb/pulp_cluster_tb.sv
 
-  - target: cluster_standalone
-    files:
-      - include/pulp_interfaces.sv
-
diff --git a/include/cluster_bus_defines.sv → include/pulp_cluster/cluster_bus_defines.sv b/include/cluster_bus_defines.sv → include/pulp_cluster/cluster_bus_defines.sv
diff --git a/include/periph_bus_defines.sv → include/pulp_cluster/periph_bus_defines.sv b/include/periph_bus_defines.sv → include/pulp_cluster/periph_bus_defines.sv
diff --git a/include/pulp_interfaces.sv → include/pulp_cluster/pulp_interfaces.sv b/include/pulp_interfaces.sv → include/pulp_cluster/pulp_interfaces.sv
@@ -8,7 +8,7 @@
 // CONDITIONS OF ANY KIND, either express or implied. See the License for the
 // specific language governing permissions and limitations under the License.
 
-`include "pulp_soc_defines.sv"
+`include "pulp_cluster/pulp_soc_defines.sv"
 
 interface XBAR_TCDM_BUS;
 

diff --git a/include/pulp_soc_defines.sv → include/pulp_cluster/pulp_soc_defines.sv b/include/pulp_soc_defines.sv → include/pulp_cluster/pulp_soc_defines.sv
diff --git a/rtl/cluster_interconnect_wrap.sv b/rtl/cluster_interconnect_wrap.sv
@@ -16,9 +16,8 @@
 
 `include "hci_helpers.svh"
 
-import hci_package::*;
-
 module cluster_interconnect_wrap
+import hci_package::*;
 #(
   parameter NB_CORES        = 12,
   parameter HWPE_PRESENT    = 1,

diff --git a/rtl/hwpe_subsystem.sv b/rtl/hwpe_subsystem.sv
@@ -15,10 +15,9 @@
 
 `include "hci_helpers.svh"
 
+module hwpe_subsystem
 import hci_package::*;
 import pulp_cluster_package::*;
-
-module hwpe_subsystem
 #(
   parameter  hwpe_subsystem_cfg_t HWPE_CFG = '0,
   parameter  int unsigned N_CORES          = 8,

diff --git a/rtl/pulp_cluster.sv b/rtl/pulp_cluster.sv
@@ -19,8 +19,8 @@
 
 `include "axi/typedef.svh"
 `include "axi/assign.svh"
-`include "cluster_bus_defines.sv"
-`include "pulp_interfaces.sv"
+`include "pulp_cluster/cluster_bus_defines.sv"
+`include "pulp_cluster/pulp_interfaces.sv"
 `include "register_interface/typedef.svh"
 
 module pulp_cluster

diff --git a/tb/pulp_cluster_tb.sv b/tb/pulp_cluster_tb.sv
@@ -16,7 +16,7 @@
 
 `timescale 1ps/1ps
 
-`include "pulp_soc_defines.sv"
+`include "pulp_cluster/pulp_soc_defines.sv"
 `include "axi/assign.svh"
 `include "axi/typedef.svh"