diff --git a/protocols/saci/ruckus.tcl b/protocols/saci/ruckus.tcl index 42bed80299..06db36968f 100644 --- a/protocols/saci/ruckus.tcl +++ b/protocols/saci/ruckus.tcl @@ -1,8 +1,6 @@ -# Load RUCKUS library +# Load RUCKUS environment and library source $::env(RUCKUS_PROC_TCL) -# Load Source Code -loadSource -lib surf -dir "$::DIR_PATH/rtl" - -# Load Simulation -loadSource -lib surf -sim_only -dir "$::DIR_PATH/sim" +# Load ruckus files +loadRuckusTcl "$::DIR_PATH/saci1" +loadRuckusTcl "$::DIR_PATH/saci2" diff --git a/protocols/saci/doc/SACI.pptx b/protocols/saci/saci1/doc/SACI.pptx similarity index 100% rename from protocols/saci/doc/SACI.pptx rename to protocols/saci/saci1/doc/SACI.pptx diff --git a/protocols/saci/doc/SaciRdCmd.png b/protocols/saci/saci1/doc/SaciRdCmd.png similarity index 100% rename from protocols/saci/doc/SaciRdCmd.png rename to protocols/saci/saci1/doc/SaciRdCmd.png diff --git a/protocols/saci/doc/SaciRdCmd.svg b/protocols/saci/saci1/doc/SaciRdCmd.svg similarity index 100% rename from protocols/saci/doc/SaciRdCmd.svg rename to protocols/saci/saci1/doc/SaciRdCmd.svg diff --git a/protocols/saci/doc/SaciRdRsp.png b/protocols/saci/saci1/doc/SaciRdRsp.png similarity index 100% rename from protocols/saci/doc/SaciRdRsp.png rename to protocols/saci/saci1/doc/SaciRdRsp.png diff --git a/protocols/saci/doc/SaciRdRsp.svg b/protocols/saci/saci1/doc/SaciRdRsp.svg similarity index 100% rename from protocols/saci/doc/SaciRdRsp.svg rename to protocols/saci/saci1/doc/SaciRdRsp.svg diff --git a/protocols/saci/doc/SaciRead.tim b/protocols/saci/saci1/doc/SaciRead.tim similarity index 100% rename from protocols/saci/doc/SaciRead.tim rename to protocols/saci/saci1/doc/SaciRead.tim diff --git a/protocols/saci/doc/SaciWrCmd-1.png b/protocols/saci/saci1/doc/SaciWrCmd-1.png similarity index 100% rename from protocols/saci/doc/SaciWrCmd-1.png rename to protocols/saci/saci1/doc/SaciWrCmd-1.png diff --git a/protocols/saci/doc/SaciWrCmd.png b/protocols/saci/saci1/doc/SaciWrCmd.png similarity index 100% rename from protocols/saci/doc/SaciWrCmd.png rename to protocols/saci/saci1/doc/SaciWrCmd.png diff --git a/protocols/saci/doc/SaciWrCmd.svg b/protocols/saci/saci1/doc/SaciWrCmd.svg similarity index 100% rename from protocols/saci/doc/SaciWrCmd.svg rename to protocols/saci/saci1/doc/SaciWrCmd.svg diff --git a/protocols/saci/doc/SaciWrRsp-1.png b/protocols/saci/saci1/doc/SaciWrRsp-1.png similarity index 100% rename from protocols/saci/doc/SaciWrRsp-1.png rename to protocols/saci/saci1/doc/SaciWrRsp-1.png diff --git a/protocols/saci/doc/SaciWrRsp.png b/protocols/saci/saci1/doc/SaciWrRsp.png similarity index 100% rename from protocols/saci/doc/SaciWrRsp.png rename to protocols/saci/saci1/doc/SaciWrRsp.png diff --git a/protocols/saci/doc/SaciWrRsp.svg b/protocols/saci/saci1/doc/SaciWrRsp.svg similarity index 100% rename from protocols/saci/doc/SaciWrRsp.svg rename to protocols/saci/saci1/doc/SaciWrRsp.svg diff --git a/protocols/saci/doc/SaciWrRsp1.png b/protocols/saci/saci1/doc/SaciWrRsp1.png similarity index 100% rename from protocols/saci/doc/SaciWrRsp1.png rename to protocols/saci/saci1/doc/SaciWrRsp1.png diff --git a/protocols/saci/doc/SaciWrRsp1.svg b/protocols/saci/saci1/doc/SaciWrRsp1.svg similarity index 100% rename from protocols/saci/doc/SaciWrRsp1.svg rename to protocols/saci/saci1/doc/SaciWrRsp1.svg diff --git a/protocols/saci/doc/SaciWrite.tim b/protocols/saci/saci1/doc/SaciWrite.tim similarity index 100% rename from protocols/saci/doc/SaciWrite.tim rename to protocols/saci/saci1/doc/SaciWrite.tim diff --git a/protocols/saci/doc/Snap_Saci_rev2b.bmp b/protocols/saci/saci1/doc/Snap_Saci_rev2b.bmp similarity index 100% rename from protocols/saci/doc/Snap_Saci_rev2b.bmp rename to protocols/saci/saci1/doc/Snap_Saci_rev2b.bmp diff --git a/protocols/saci/doc/waveforms.js b/protocols/saci/saci1/doc/waveforms.js similarity index 100% rename from protocols/saci/doc/waveforms.js rename to protocols/saci/saci1/doc/waveforms.js diff --git a/protocols/saci/rtl/AxiLiteSaciMaster.vhd b/protocols/saci/saci1/rtl/AxiLiteSaciMaster.vhd similarity index 100% rename from protocols/saci/rtl/AxiLiteSaciMaster.vhd rename to protocols/saci/saci1/rtl/AxiLiteSaciMaster.vhd diff --git a/protocols/saci/rtl/SaciAxiLiteMaster.vhd b/protocols/saci/saci1/rtl/SaciAxiLiteMaster.vhd similarity index 100% rename from protocols/saci/rtl/SaciAxiLiteMaster.vhd rename to protocols/saci/saci1/rtl/SaciAxiLiteMaster.vhd diff --git a/protocols/saci/rtl/SaciMaster.vhd b/protocols/saci/saci1/rtl/SaciMaster.vhd similarity index 100% rename from protocols/saci/rtl/SaciMaster.vhd rename to protocols/saci/saci1/rtl/SaciMaster.vhd diff --git a/protocols/saci/rtl/SaciMaster2.vhd b/protocols/saci/saci1/rtl/SaciMaster2.vhd similarity index 100% rename from protocols/saci/rtl/SaciMaster2.vhd rename to protocols/saci/saci1/rtl/SaciMaster2.vhd diff --git a/protocols/saci/rtl/SaciMasterPkg.vhd b/protocols/saci/saci1/rtl/SaciMasterPkg.vhd similarity index 100% rename from protocols/saci/rtl/SaciMasterPkg.vhd rename to protocols/saci/saci1/rtl/SaciMasterPkg.vhd diff --git a/protocols/saci/rtl/SaciMasterSync.vhd b/protocols/saci/saci1/rtl/SaciMasterSync.vhd similarity index 100% rename from protocols/saci/rtl/SaciMasterSync.vhd rename to protocols/saci/saci1/rtl/SaciMasterSync.vhd diff --git a/protocols/saci/rtl/SaciMultiPixel.vhd b/protocols/saci/saci1/rtl/SaciMultiPixel.vhd similarity index 100% rename from protocols/saci/rtl/SaciMultiPixel.vhd rename to protocols/saci/saci1/rtl/SaciMultiPixel.vhd diff --git a/protocols/saci/rtl/SaciMultiPixelPkg.vhd b/protocols/saci/saci1/rtl/SaciMultiPixelPkg.vhd similarity index 100% rename from protocols/saci/rtl/SaciMultiPixelPkg.vhd rename to protocols/saci/saci1/rtl/SaciMultiPixelPkg.vhd diff --git a/protocols/saci/rtl/SaciPrepRdout.vhd b/protocols/saci/saci1/rtl/SaciPrepRdout.vhd similarity index 100% rename from protocols/saci/rtl/SaciPrepRdout.vhd rename to protocols/saci/saci1/rtl/SaciPrepRdout.vhd diff --git a/protocols/saci/rtl/SaciSlave.vhd b/protocols/saci/saci1/rtl/SaciSlave.vhd similarity index 100% rename from protocols/saci/rtl/SaciSlave.vhd rename to protocols/saci/saci1/rtl/SaciSlave.vhd diff --git a/protocols/saci/rtl/SaciSlaveOld.vhd b/protocols/saci/saci1/rtl/SaciSlaveOld.vhd similarity index 100% rename from protocols/saci/rtl/SaciSlaveOld.vhd rename to protocols/saci/saci1/rtl/SaciSlaveOld.vhd diff --git a/protocols/saci/saci1/ruckus.tcl b/protocols/saci/saci1/ruckus.tcl new file mode 100644 index 0000000000..42bed80299 --- /dev/null +++ b/protocols/saci/saci1/ruckus.tcl @@ -0,0 +1,8 @@ +# Load RUCKUS library +source $::env(RUCKUS_PROC_TCL) + +# Load Source Code +loadSource -lib surf -dir "$::DIR_PATH/rtl" + +# Load Simulation +loadSource -lib surf -sim_only -dir "$::DIR_PATH/sim" diff --git a/protocols/saci/sim/AxiLiteSaciMasterTb.vhd b/protocols/saci/saci1/sim/AxiLiteSaciMasterTb.vhd similarity index 100% rename from protocols/saci/sim/AxiLiteSaciMasterTb.vhd rename to protocols/saci/saci1/sim/AxiLiteSaciMasterTb.vhd diff --git a/protocols/saci/sim/FrontEndSaciPkg.vhd b/protocols/saci/saci1/sim/FrontEndSaciPkg.vhd similarity index 100% rename from protocols/saci/sim/FrontEndSaciPkg.vhd rename to protocols/saci/saci1/sim/FrontEndSaciPkg.vhd diff --git a/protocols/saci/sim/SaciAxiLiteMasterTb.vhd b/protocols/saci/saci1/sim/SaciAxiLiteMasterTb.vhd similarity index 100% rename from protocols/saci/sim/SaciAxiLiteMasterTb.vhd rename to protocols/saci/saci1/sim/SaciAxiLiteMasterTb.vhd diff --git a/protocols/saci/sim/SaciAxiLiteMasterTbWrapper.vhd b/protocols/saci/saci1/sim/SaciAxiLiteMasterTbWrapper.vhd similarity index 100% rename from protocols/saci/sim/SaciAxiLiteMasterTbWrapper.vhd rename to protocols/saci/saci1/sim/SaciAxiLiteMasterTbWrapper.vhd diff --git a/protocols/saci/sim/SaciSlaveAnalog.v b/protocols/saci/saci1/sim/SaciSlaveAnalog.v similarity index 100% rename from protocols/saci/sim/SaciSlaveAnalog.v rename to protocols/saci/saci1/sim/SaciSlaveAnalog.v diff --git a/protocols/saci/sim/SaciSlaveRam.vhd b/protocols/saci/saci1/sim/SaciSlaveRam.vhd similarity index 100% rename from protocols/saci/sim/SaciSlaveRam.vhd rename to protocols/saci/saci1/sim/SaciSlaveRam.vhd diff --git a/protocols/saci/sim/SaciSlaveWrapper.vhd b/protocols/saci/saci1/sim/SaciSlaveWrapper.vhd similarity index 100% rename from protocols/saci/sim/SaciSlaveWrapper.vhd rename to protocols/saci/saci1/sim/SaciSlaveWrapper.vhd diff --git a/protocols/saci/rtl/AxiLiteSaci2Coordinator.vhd b/protocols/saci/saci2/rtl/AxiLiteSaci2Coordinator.vhd similarity index 100% rename from protocols/saci/rtl/AxiLiteSaci2Coordinator.vhd rename to protocols/saci/saci2/rtl/AxiLiteSaci2Coordinator.vhd diff --git a/protocols/saci/rtl/Saci2Coordinator.vhd b/protocols/saci/saci2/rtl/Saci2Coordinator.vhd similarity index 100% rename from protocols/saci/rtl/Saci2Coordinator.vhd rename to protocols/saci/saci2/rtl/Saci2Coordinator.vhd diff --git a/protocols/saci/rtl/Saci2Subordinate.vhd b/protocols/saci/saci2/rtl/Saci2Subordinate.vhd similarity index 100% rename from protocols/saci/rtl/Saci2Subordinate.vhd rename to protocols/saci/saci2/rtl/Saci2Subordinate.vhd diff --git a/protocols/saci/rtl/Saci2SubordinateAxiLiteMaster.vhd b/protocols/saci/saci2/rtl/Saci2SubordinateAxiLiteMaster.vhd similarity index 100% rename from protocols/saci/rtl/Saci2SubordinateAxiLiteMaster.vhd rename to protocols/saci/saci2/rtl/Saci2SubordinateAxiLiteMaster.vhd diff --git a/protocols/saci/saci2/ruckus.tcl b/protocols/saci/saci2/ruckus.tcl new file mode 100644 index 0000000000..4b81c406d0 --- /dev/null +++ b/protocols/saci/saci2/ruckus.tcl @@ -0,0 +1,8 @@ +# Load RUCKUS library +source $::env(RUCKUS_PROC_TCL) + +# Load Source Code +loadSource -lib surf -dir "$::DIR_PATH/rtl" + +# Load Simulation +#loadSource -lib surf -sim_only -dir "$::DIR_PATH/sim"