From f07daf1597f98932b9becaed415018e077889f73 Mon Sep 17 00:00:00 2001
From: David Cussans <David.Cussans@bristol.ac.uk>
Date: Fri, 27 Jun 2014 16:40:18 +0000
Subject: [PATCH] Fixing code-rot caused by 1) Change to IPBus repository 2)
Files needed to build firmware
---
firmware/config/ise14/sp601/setup_project.tcl | 3 ++-
firmware/config/ise14/sp605/setup_project.tcl | 1 +
firmware/scripts/setup_workspace.sh | 2 +-
3 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/firmware/config/ise14/sp601/setup_project.tcl b/firmware/config/ise14/sp601/setup_project.tcl
index 52976d9e..26641b9e 100644
--- a/firmware/config/ise14/sp601/setup_project.tcl
+++ b/firmware/config/ise14/sp601/setup_project.tcl
@@ -70,6 +70,7 @@ xfile add ipbus/firmware/example_designs/hdl/clock_div.vhd
xfile add ipbus/firmware/slaves/hdl/ipbus_reg_types.vhd
xfile add ipbus/firmware/slaves/hdl/ipbus_reg_v.vhd
+xfile add ipbus/firmware/slaves/hdl/ipbus_ctrlreg_v.vhd
#xfile add ipbus/firmware/slaves/hdl/syncreg_r.vhd
#xfile add ipbus/firmware/slaves/hdl/syncreg_w.vhd
#xfile add ipbus/firmware/slaves/hdl/ipbus_syncreg_v.vhd
@@ -115,7 +116,7 @@ xfile add fmc-mtlu/firmware/hdl/common/ipbus_ver.vhd
xfile add fmc-mtlu/firmware/hdl/common/logic_clocks_rtl.vhd
#xfile add fmc-mtlu/firmware/hdl/common/pulseClockDomainCrossing_rtl.vhd
#xfile add fmc-mtlu/firmware/hdl/common/Reg_2clks.vhd
-#xfile add fmc-mtlu/firmware/hdl/common/registerCounter_rtl.vhd
+xfile add fmc-mtlu/firmware/hdl/common/registerCounter_rtl.vhd
xfile add fmc-mtlu/firmware/hdl/common/synchronizeRegisters_rtl.vhd
# xfile add fmc-mtlu/firmware/hdl/common/serdes_1_to_n_SDR.vhd
xfile add fmc-mtlu/firmware/hdl/common/serdesCalibrateFSM_rtl.vhd
diff --git a/firmware/config/ise14/sp605/setup_project.tcl b/firmware/config/ise14/sp605/setup_project.tcl
index bd36bd53..84b49590 100644
--- a/firmware/config/ise14/sp605/setup_project.tcl
+++ b/firmware/config/ise14/sp605/setup_project.tcl
@@ -71,6 +71,7 @@ xfile add ipbus/firmware/slaves/hdl/ipbus_reg_types.vhd
xfile add ipbus/firmware/slaves/hdl/syncreg_r.vhd
xfile add ipbus/firmware/slaves/hdl/syncreg_w.vhd
xfile add ipbus/firmware/slaves/hdl/ipbus_syncreg_v.vhd
+xfile add ipbus/firmware/slaves/hdl/ipbus_ctrlreg_v.vhd
# Add Opencores files for i2c interface
xfile add external/opencores_i2c/i2c_master_bit_ctrl.vhd
diff --git a/firmware/scripts/setup_workspace.sh b/firmware/scripts/setup_workspace.sh
index 751e7473..ae1e3945 100644
--- a/firmware/scripts/setup_workspace.sh
+++ b/firmware/scripts/setup_workspace.sh
@@ -36,7 +36,7 @@ IPBusDir=`pwd`/IPBus2
if [ ! -d "$IPBusDir" ]; then
mkdir $IPBusDir
pushd $IPBusDir
- svn co http://svn.cern.ch/guest/cactus/tags/ipbus_2_0_v1/firmware
+ svn co http://svn.cern.ch/guest/cactus/tags/ipbus_fw/ipbus_2_0_v1/firmware
echo "Checked out IPBus2 code"
popd
fi
--
GitLab