Revert "New aes128 accelerator project"

This reverts commit 0c976c66

flist/nanosoc/nanosoc_chip_ip.flist

@@ -31,9 +31,4 @@ $(NANOSOC_TECH_DIR)/system/src/verilog/nanosoc_mcu_clkctrl.v
 $(NANOSOC_TECH_DIR)/system/src/verilog/nanosoc_mcu_sysctrl.v
 
 $(NANOSOC_TECH_DIR)/system/src/verilog/nanosoc_apb_usrt.v
-$(NANOSOC_TECH_DIR)/system/src/verilog/nanosoc_ahb_bootrom.v
-$(NANOSOC_TECH_DIR)/system/src/bootrom/verilog/bootrom.v
+$(NANOSOC_TECH_DIR)/system/src/verilog/nanosoc_ahb_bootrom.v
\ No newline at end of file
-
-$(NANOSOC_TECH_DIR)/system/aes/src/nanosoc_acc_wrapper.v
-+incdir+$(PROJECT_DIR)/secworks-aes/src/rtl
-$(NANOSOC_TECH_DIR)/system/aes/src/soclabs_ahb_aes128_ctrl.v

flist/nanosoc/nanosoc_tb.flist

@@ -30,5 +30,4 @@ $(NANOSOC_TECH_DIR)/system/verif/verilog/nanosoc_ft1248x1_to_axi_streamio_v1_0.v
 $(NANOSOC_TECH_DIR)/system/verif/verilog/nanosoc_axi_stream_io_8_rxd_to_file.v
 $(NANOSOC_TECH_DIR)/system/verif/verilog/nanosoc_track_tb_iostream.v
 $(NANOSOC_TECH_DIR)/system/verif/verilog/nanosoc_ft1248x1_track.v
-$(NANOSOC_TECH_DIR)/system/verif/verilog/nanosoc_dma_log_to_file.v
-$(NANOSOC_TECH_DIR)/system/aes/verif/aes128_log_to_file.v
+$(NANOSOC_TECH_DIR)/system/verif/verilog/nanosoc_dma_log_to_file.v
\ No newline at end of file

flist/project/system.flist

@@ -62,4 +62,4 @@ $(PROJECT_DIR)/system/src/nanosoc_exp.v
 -f $(PROJECT_DIR)/flist/nanosoc/nanosoc_tb.flist
 
 // =============    Bootrom Filelist      ================
-//src/bootrom/verilog/bootrom.v
+$(PROJECT_DIR)/system/src/bootrom/verilog/bootrom.v
\ No newline at end of file

generic_lib_tech @ 69e79bf8

-Subproject commit 53dca95d66a93333a7e6e8bbbda0696a348da0b5
+Subproject commit 69e79bf881a73af0b3ee04e25835450ed2635718

nanosoc_tech @ 9e4a4da0

-Subproject commit f68c3e62bd2dd914b49e7000fb0f226fcb01a8a7
+Subproject commit 9e4a4da0a9dd45c84a787c4cf73294e7a412aff4

simulate/socsim/bootrom.sh

@@ -19,7 +19,7 @@ SIM_DIR=$PROJECT_DIR/simulate/sim/$SIM_NAME
 
 # Create Directory to put simulation files
 mkdir -p $SIM_DIR
-cd $PROJECT_DIR/simulate/sim/$PROJECT_DIR
+cd $PROJECT_DIR/simulate/sim/system_secworks_sha256
 
 # Compile Simulation
 # Call makefile in NanoSoC Repo with options

simulate/socsim/system_secworks_aes128.sh

-#-----------------------------------------------------------------------------
-# SoC Labs Simulation script for system level verification
-# A joint work commissioned on behalf of SoC Labs, under Arm Academic Access license.
-#
-# Contributors
-#
-# David Mapstone (d.a.mapstone@soton.ac.uk)
-#
-# Copyright  2023, SoC Labs (www.soclabs.org)
-#-----------------------------------------------------------------------------
-
-#!/usr/bin/env bash
-
-# Get simulation name from name of script
-SIM_NAME=`basename -s .sh "$0"`
-
-# Directory to put simulation files
-SIM_DIR=$PROJECT_DIR/simulate/sim/$SIM_NAME
-
-# Create Directory to put simulation files
-mkdir -p $SIM_DIR
-cd $PROJECT_DIR/simulate/sim/$PROJECT_DIR
-
-# Compile Simulation
-# Call makefile in NanoSoC Repo with options
-echo ${2}
-make -C $NANOSOC_TECH_DIR/system run_mti \
-    SIM_DIR=$SIM_DIR \
-    ${@:2}
-

wrapper/src/wrapper_accelerator.sv

@@ -14,8 +14,7 @@ module wrapper_accelerator #(
   parameter INPACKETWIDTH=512,
   parameter CFGSIZEWIDTH=64,
   parameter CFGSCHEMEWIDTH=2,
-  parameter OUTPACKETWIDTH=256,
-  parameter CFGNUMIRQ=4
+  parameter OUTPACKETWIDTH=256
   ) (
     input  logic                     HCLK,       // Clock
     input  logic                     HRESETn,    // Reset
@@ -35,15 +34,10 @@ module wrapper_accelerator #(
     output logic  [31:0]             HRDATAS,
 
     // Input Data Request Signal to DMAC
-    output logic                     in_data_drq,
-    input  logic                     in_data_dlast,
+    output logic                     in_data_req,
 
     // Output Data Request Signal to DMAC
-    output logic                     out_data_drq,
-    input  logic                     out_data_dlast,
-
-    output logic [CFGNUMIRQ-1:0]     int_irq
-    
+    output logic                     out_data_req
   );
   
 
@@ -436,17 +430,17 @@ module wrapper_accelerator #(
     .req_act_ch4 (1'b0),
 
     // DMA Request Output
-    .drq_ch0     (in_data_drq),
-    .drq_ch1     (out_data_drq),
+    .drq_ch0     (in_data_req),
+    .drq_ch1     (out_data_req),
     .drq_ch2     (),
     .drq_ch3     (),
     .drq_ch4     (),
 
     // Interrupt Request Output
-    .irq_ch0     (int_irq[0]),
-    .irq_ch1     (int_irq[1]),
-    .irq_ch2     (int_irq[2]),
-    .irq_ch3     (int_irq[3]),
+    .irq_ch0     (),
+    .irq_ch1     (),
+    .irq_ch2     (),
+    .irq_ch3     (),
     .irq_ch4     (),
     .irq_merged  ()
   );