From 5a0d562b26ef72e206bdfa87afccd11538d2a696 Mon Sep 17 00:00:00 2001
From: Daniel Newbrook <dwn1c21@soton.ac.uk>
Date: Thu, 12 Oct 2023 10:00:09 +0100
Subject: [PATCH] Remove secworks from repository
---
.gitmodules | 3 --
flist/project/accelerator.flist | 2 +-
projbranch | 1 -
secworks-aes | 1 -
...on_aes128.sh => regression_accelerator.sh} | 0
.../{test_aes128.sh => test_accelerator.sh} | 0
system/src/accelerator_subsystem.v | 31 +++----------------
7 files changed, 5 insertions(+), 33 deletions(-)
delete mode 160000 secworks-aes
rename simulate/socsim/{regression_aes128.sh => regression_accelerator.sh} (100%)
rename simulate/socsim/{test_aes128.sh => test_accelerator.sh} (100%)
diff --git a/.gitmodules b/.gitmodules
index b9b9e67..4ab4912 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -22,9 +22,6 @@
path = rtl_primitives_tech
url = https://git.soton.ac.uk/soclabs/rtl_primitives_tech.git
branch = main
-[submodule "secworks-aes"]
- path = secworks-aes
- url = https://github.com/secworks/aes.git
[submodule "asic_lib_tech"]
path = asic_lib_tech
url = https://git.soton.ac.uk/soclabs/asic_library_tech
diff --git a/flist/project/accelerator.flist b/flist/project/accelerator.flist
index b531759..13c9537 100644
--- a/flist/project/accelerator.flist
+++ b/flist/project/accelerator.flist
@@ -17,7 +17,7 @@
+incdir+$(ACCELERATOR_DIR)/src/rtl
// ! Point this to your Wrapper RTL
-$(SOCLABS_PROJECT_DIR)/wrapper/src/soclabs_ahb_aes128_ctrl.v
+//$(SOCLABS_PROJECT_DIR)/wrapper/src/soclabs_ahb_aes128_ctrl.v
// ! Point this to your Subsystem RTL
$(SOCLABS_PROJECT_DIR)/system/src/accelerator_subsystem.v
diff --git a/projbranch b/projbranch
index 1d14a8b..38d8789 100644
--- a/projbranch
+++ b/projbranch
@@ -11,7 +11,6 @@
# Each Repo needs to have its branch set manually in here - they will defaultly be checked out to main
# Project Repository Subrepository Branch Index
# Add your Accelerator Repository here
-secworks-aes: master
nanosoc_tech: main
accelerator_wrapper_tech: main
diff --git a/secworks-aes b/secworks-aes
deleted file mode 160000
index b9a3f19..0000000
--- a/secworks-aes
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit b9a3f1965b4e0568f0ca9b2d575ce6ea6fec2f36
diff --git a/simulate/socsim/regression_aes128.sh b/simulate/socsim/regression_accelerator.sh
similarity index 100%
rename from simulate/socsim/regression_aes128.sh
rename to simulate/socsim/regression_accelerator.sh
diff --git a/simulate/socsim/test_aes128.sh b/simulate/socsim/test_accelerator.sh
similarity index 100%
rename from simulate/socsim/test_aes128.sh
rename to simulate/socsim/test_accelerator.sh
diff --git a/system/src/accelerator_subsystem.v b/system/src/accelerator_subsystem.v
index 6cb2d42..a07ff98 100644
--- a/system/src/accelerator_subsystem.v
+++ b/system/src/accelerator_subsystem.v
@@ -70,32 +70,9 @@ module accelerator_subsystem #(
output wire [IRQ_NUM-1:0] EXP_IRQ
);
- //--------------------------------------
- // AES Accelerator Wrapper
- //--------------------------------------
- soclabs_ahb_aes128_ctrl u_exp_aes128 (
- .ahb_hclk (HCLK),
- .ahb_hresetn (HRESETn),
- .ahb_hsel (HSEL),
- .ahb_haddr16 (HADDR[ACC_ADDR_W-1:0]),
- .ahb_htrans (HTRANS),
- .ahb_hwrite (HWRITE),
- .ahb_hsize (HSIZE),
- .ahb_hprot (HPROT),
- .ahb_hwdata (HWDATA),
- .ahb_hready (HREADY),
- .ahb_hrdata (HRDATA),
- .ahb_hreadyout (HREADYOUT),
- .ahb_hresp (HRESP),
- .drq_ipdma128 (EXP_DRQ[0]),
- .dlast_ipdma128 (EXP_DLAST[0]),
- .drq_opdma128 (EXP_DRQ[1]),
- .dlast_opdma128 (EXP_DLAST[1]),
- .irq_key128 (EXP_IRQ[0]),
- .irq_ip128 (EXP_IRQ[1]),
- .irq_op128 (EXP_IRQ[2]),
- .irq_error (EXP_IRQ[3]),
- .irq_merged ( )
- );
+ //-------------------------------------------
+ // Instantiate your accelerator/wrapper here
+ //-------------------------------------------
+
endmodule
--
GitLab