Merge pull request #61 from apollo-lhc/develop

Develop
apollo-lhc · Nov 29, 2023 · 1fe20cf · 1fe20cf
2 parents c9b538b + 2800f5d
commit 1fe20cf
Show file tree

Hide file tree

Showing 96 changed files with 8,428 additions and 3,730 deletions.
diff --git a/.gitignore b/.gitignore
@@ -35,6 +35,7 @@ configs/*/cores/*/*
 #################################################################################
 bit
 os
+kernel
 
 #################################################################################
 ## Temp build files
@@ -46,6 +47,7 @@ src/fw_version.vhd
 #################################################################################
 doc/*/
 doc/*.pdf
+doc/*.svg
 
 #################################################################################
 ## autogen files

diff --git a/.gitmodules b/.gitmodules
@@ -13,3 +13,6 @@
 	path = build-scripts
 	url = https://gitlab.com/BU-EDF/fw-bits/build-scripts.git
 	branch = develop
+[submodule "configs/IT-DTC_p1_VU13p-1/it-dtc-fw"]
+	path = configs/IT-DTC_p1_VU13p-1/it-dtc-fw
+	url = https://gitlab.com/apollo-lhc/it-dtc/it-dtc-fw.git
diff --git a/.ipbb_setup.yml b/.ipbb_setup.yml
@@ -1,8 +1,6 @@
 init:
   - make init
   - make list 
-  - make prebuild_EMP_Cornell_rev1_p2_VU7p-1-SM_7s
-  - make address_table_EMP_Cornell_rev1_p2_VU7p-1-SM_7s
   - make prebuild_EMP_Cornell_rev2_p1_VU13p-1-SM_USP
   - make address_table_EMP_Cornell_rev2_p1_VU13p-1-SM_USP
   - make prebuild_EMP_Cornell_rev2_p2_VU13p-1-SM_USP

diff --git a/Makefile b/Makefile
@@ -157,8 +157,6 @@ interactive :
 	vivado -mode tcl
 
 
-#$(BIT_BASE)%.bit $(BIT_BASE)%.svf	: $(SLAVE_DTSI_PATH)/config_%.yaml $(ADDRESS_TABLE)
-#$(BIT_BASE)%.bit 	: $(SLAVE_DTSI_PATH)/config_%.yaml
 $(BIT_BASE)%.bit        : $(ADDRESS_TABLE_CREATION_PATH)config_%.yaml
 	source $(BUILD_VIVADO_SHELL) &&\
 	mkdir -p ${MAKE_PATH}/kernel/hw &&\
@@ -167,9 +165,9 @@ $(BIT_BASE)%.bit        : $(ADDRESS_TABLE_CREATION_PATH)config_%.yaml
 	cd proj &&\
 	vivado $(VIVADO_FLAGS) -source $(SETUP_BUILD_TCL) -tclargs ${MAKE_PATH} ${BUILD_SCRIPTS_PATH} $(subst .bit,,$(subst ${BIT_BASE},,$@)) $(OUTPUT_MARKUP)
 	$(MAKE) NOTIFY_DAN_GOOD  $(OUTPUT_MARKUP)
-	@echo   ${MAKE} $(ADDRESS_TABLE_CREATION_PATH)address_tables/address_table_$*/address_apollo.xml
+	@echo 	${MAKE} $(ADDRESS_TABLE_CREATION_PATH)address_tables/address_table_$*/address_apollo.xml
 	${MAKE} $(ADDRESS_TABLE_CREATION_PATH)address_tables/address_table_$*/address_apollo.xml
-	$(MAKE) overlays  $(OUTPUT_MARKUP)
+	$(MAKE) overlays DTSI_PATH=kernel/hw/$*  $(OUTPUT_MARKUP)
 	@rm -f $*.tar.gz
 	$(MAKE) $*.tar.gz  $(OUTPUT_MARKUP)
 
@@ -178,6 +176,7 @@ SVF	:
 	vivado $(VIVADO_FLAGS) -source ${BUILD_SCRIPTS_PATH}/Generate_svf.tcl $(OUTPUT_MARKUP)
 
 
+
 #convert all push urls to ssh
 init:
 	git submodule update --init --recursive
@@ -192,4 +191,8 @@ make test :
 
 #%.tar.gz : bit/top_%.svf kernel/hw/dtbo/ os/address_table/
 %.tar.gz : bit/top_%.svf 
-	@tar -h -zcf $@ $< -C kernel/hw/ dtbo -C ../address_tables address_table
+	@tar -h -zcf $@ $< -C kernel/hw/$* dtbo -C ../../address_tables address_table_$*
+
+EMP%.tar.gz : kernel/config_EMP%.yaml
+	$(MAKE) overlays DTSI_PATH=kernel/hw/EMP$*
+	@tar -h -zcf $@ -C kernel/hw/EMP$* dtbo -C ../../address_tables address_table_EMP$*
diff --git a/address_table/modules/C2C_INTFS_CornellRev2.xml b/address_table/modules/C2C_INTFS_CornellRev2.xml
@@ -0,0 +1,11 @@
+<node id="C2C_INTFS">  
+  <node id="C2C_1"    address="0x0000" fwinfo="type=array" parameters="Scan=C2C" module="file://C2C_INTF_GTY.xml"/>
+  <node id="C2C_2"    address="0x1000" fwinfo="type=array" parameters="Scan=C2C" module="file://C2C_INTF_GTY.xml"/>
+  <node id="PB" address="0x2000">
+    <node id="MEM" mode="incremental" size="0x800" address="0x000" fwinfo="type=mem18_0x800" />
+    <node id="RESET" address="0x800" mask="0x00000001" permission="rw"/>  
+    <node id="IRQ_COUNT" address="0x801" mask="0xFFFFFFFF" permission="rw" parameters="default=10000000"/>                                                                 
+  </node>
+  <node id="C2C_REFCLK_FREQ" address="0x810" mask="0xFFFFFFFF" permission="r" parameters="Table=CLOCKING;Column=FREQ;Row=C2C_REFCLK_FREQ;Status=3;Show=nz;Format=m_1_1_1000000_1_0_1"/>
+
+</node>
diff --git a/address_table/modules/C2C_INTF.xml → address_table/modules/C2C_INTF_GTH.xml b/address_table/modules/C2C_INTF.xml → address_table/modules/C2C_INTF_GTH.xml
@@ -5,7 +5,7 @@
   <node id="STATUS"            address="0x400" module="file://CM_C2C_Status.xml"/>
   <!-- DEBUG 0x0 to 0x5 -> 0x404 to 0x409 -->
   <node id="DEBUG"             address="0x404" module="file://MGT_DEBUG_USP.xml"/>
-  <!-- COUNTERS 0x0 to 0xA  -> 0x410 to 0x41A -->
+  <!-- COUNTERS 0x0 to 0xE  -> 0x410 to 0x41E -->
   <node id="COUNTERS"          address="0x410" module="file://CM_C2C_CNT.xml"/>
 
   <node id="USER_FREQ"         address="0x420" permission="r" mask="0xFFFFFFFF" description="Measured Freq of clock" parameters="Table=CLOCKING;Column=FREQ;Row=_1_2_3;Status=3;Show=nz;Format=m_1_1_1000000_1_0_1" />

diff --git a/address_table/modules/CM_IO.xml b/address_table/modules/CM_IO.xml
@@ -1,5 +1,9 @@
-<node id="CM_IO">  
+<node id="CM_IO">
   <node id="CLK_200_LOCKED"    address="0x00000010" mask="0x00000001" permission="r"/>
+  <!--<node id="CLK_LF_X12_R0_LOCKED"    address="0x00000010" mask="0x00000002" permission="r"/>-->
+  <node id="TEST_CONST"    address="0x00000011" mask="0xffffffff" permission="r"/>
+  <node id="CLOCKS"            address="0x00000100" module="file://CM_IO_CLOCKS.xml">
+  </node>
   <node id="RGB"  address="0x00000200">
     <node id="R" mask="0xFF"     permission="rw" parameters="default=0x00"/>
     <node id="G" mask="0xFF00"   permission="rw" parameters="default=0x00"/>

diff --git a/address_table/modules/CM_IO_CLOCKS.xml b/address_table/modules/CM_IO_CLOCKS.xml
@@ -0,0 +1,35 @@
+<node id="CLOCKS">
+  <node id="LF_X12_R0_CLK"    address="0x00000000" mask="0xFFFFFFFF" permission="r" parameters="Table=CM_CLOCKING;Column=_1_FREQ;Row=_3;Status=3;Show=nz;Format=m_1_1_1000000_1_0_1"/>
+  <node id="LF_X4_R0_CLK"     address="0x00000001" mask="0xFFFFFFFF" permission="r" parameters="Table=CM_CLOCKING;Column=_1_FREQ;Row=_3;Status=3;Show=nz;Format=m_1_1_1000000_1_0_1"/>
+  <node id="RT_X12_R0_CLK"    address="0x00000002" mask="0xFFFFFFFF" permission="r" parameters="Table=CM_CLOCKING;Column=_1_FREQ;Row=_3;Status=3;Show=nz;Format=m_1_1_1000000_1_0_1"/>
+  <node id="RT_X4_R0_CLK"     address="0x00000003" mask="0xFFFFFFFF" permission="r" parameters="Table=CM_CLOCKING;Column=_1_FREQ;Row=_3;Status=3;Show=nz;Format=m_1_1_1000000_1_0_1"/>
+  <node id="LF_R0_AB"         address="0x00000004" mask="0xFFFFFFFF" permission="r" parameters="Table=CM_CLOCKING;Column=_1_FREQ;Row=_3;Status=3;Show=nz;Format=m_1_1_1000000_1_0_1"/>
+  <node id="LF_R1_AB"         address="0x00000005" mask="0xFFFFFFFF" permission="r" parameters="Table=CM_CLOCKING;Column=_1_FREQ;Row=_3;Status=3;Show=nz;Format=m_1_1_1000000_1_0_1"/>
+  <node id="LF_R1_L"          address="0x00000006" mask="0xFFFFFFFF" permission="r" parameters="Table=CM_CLOCKING;Column=_1_FREQ;Row=_3;Status=3;Show=nz;Format=m_1_1_1000000_1_0_1"/>
+  <node id="TCDS40_CLK"       address="0x00000007" mask="0xFFFFFFFF" permission="r" parameters="Table=CM_CLOCKING;Column=_1_FREQ;Row=_3;Status=3;Show=nz;Format=m_1_1_1000000_1_0_1"/>
+  <node id="RT_R0_L"          address="0x00000008" mask="0xFFFFFFFF" permission="r" parameters="Table=CM_CLOCKING;Column=_1_FREQ;Row=_3;Status=3;Show=nz;Format=m_1_1_1000000_1_0_1"/>
+  <node id="LF_R0_AD"         address="0x00000009" mask="0xFFFFFFFF" permission="r" parameters="Table=CM_CLOCKING;Column=_1_FREQ;Row=_3;Status=3;Show=nz;Format=m_1_1_1000000_1_0_1"/>
+  <node id="LF_R1_AD"         address="0x0000000a" mask="0xFFFFFFFF" permission="r" parameters="Table=CM_CLOCKING;Column=_1_FREQ;Row=_3;Status=3;Show=nz;Format=m_1_1_1000000_1_0_1"/>
+  <node id="LF_R0_AF"         address="0x0000000b" mask="0xFFFFFFFF" permission="r" parameters="Table=CM_CLOCKING;Column=_1_FREQ;Row=_3;Status=3;Show=nz;Format=m_1_1_1000000_1_0_1"/>
+  <node id="LF_R1_AF"         address="0x0000000c" mask="0xFFFFFFFF" permission="r" parameters="Table=CM_CLOCKING;Column=_1_FREQ;Row=_3;Status=3;Show=nz;Format=m_1_1_1000000_1_0_1"/>
+  <node id="LF_R0_U"          address="0x0000000d" mask="0xFFFFFFFF" permission="r" parameters="Table=CM_CLOCKING;Column=_1_FREQ;Row=_3;Status=3;Show=nz;Format=m_1_1_1000000_1_0_1"/>
+  <node id="LF_R1_U"          address="0x0000000e" mask="0xFFFFFFFF" permission="r" parameters="Table=CM_CLOCKING;Column=_1_FREQ;Row=_3;Status=3;Show=nz;Format=m_1_1_1000000_1_0_1"/>
+  <node id="LF_R0_R"          address="0x0000000f" mask="0xFFFFFFFF" permission="r" parameters="Table=CM_CLOCKING;Column=_1_FREQ;Row=_3;Status=3;Show=nz;Format=m_1_1_1000000_1_0_1"/>
+  <node id="LF_R1_R"          address="0x00000010" mask="0xFFFFFFFF" permission="r" parameters="Table=CM_CLOCKING;Column=_1_FREQ;Row=_3;Status=3;Show=nz;Format=m_1_1_1000000_1_0_1"/>
+  <node id="LF_R0_Y"          address="0x00000011" mask="0xFFFFFFFF" permission="r" parameters="Table=CM_CLOCKING;Column=_1_FREQ;Row=_3;Status=3;Show=nz;Format=m_1_1_1000000_1_0_1"/>
+  <node id="LF_R1_Y"          address="0x00000012" mask="0xFFFFFFFF" permission="r" parameters="Table=CM_CLOCKING;Column=_1_FREQ;Row=_3;Status=3;Show=nz;Format=m_1_1_1000000_1_0_1"/>
+  <node id="LF_R0_V"          address="0x00000013" mask="0xFFFFFFFF" permission="r" parameters="Table=CM_CLOCKING;Column=_1_FREQ;Row=_3;Status=3;Show=nz;Format=m_1_1_1000000_1_0_1"/>
+  <node id="RT_R0_N"          address="0x00000014" mask="0xFFFFFFFF" permission="r" parameters="Table=CM_CLOCKING;Column=_1_FREQ;Row=_3;Status=3;Show=nz;Format=m_1_1_1000000_1_0_1"/>
+  <node id="RT_R1_N"          address="0x00000015" mask="0xFFFFFFFF" permission="r" parameters="Table=CM_CLOCKING;Column=_1_FREQ;Row=_3;Status=3;Show=nz;Format=m_1_1_1000000_1_0_1"/>
+  <node id="RT_R0_B"          address="0x00000016" mask="0xFFFFFFFF" permission="r" parameters="Table=CM_CLOCKING;Column=_1_FREQ;Row=_3;Status=3;Show=nz;Format=m_1_1_1000000_1_0_1"/>
+  <node id="RT_R1_B"          address="0x00000017" mask="0xFFFFFFFF" permission="r" parameters="Table=CM_CLOCKING;Column=_1_FREQ;Row=_3;Status=3;Show=nz;Format=m_1_1_1000000_1_0_1"/>
+  <node id="RT_R0_E"          address="0x00000018" mask="0xFFFFFFFF" permission="r" parameters="Table=CM_CLOCKING;Column=_1_FREQ;Row=_3;Status=3;Show=nz;Format=m_1_1_1000000_1_0_1"/>
+  <node id="RT_R1_E"          address="0x00000019" mask="0xFFFFFFFF" permission="r" parameters="Table=CM_CLOCKING;Column=_1_FREQ;Row=_3;Status=3;Show=nz;Format=m_1_1_1000000_1_0_1"/>
+  <node id="RT_R0_F"          address="0x0000001a" mask="0xFFFFFFFF" permission="r" parameters="Table=CM_CLOCKING;Column=_1_FREQ;Row=_3;Status=3;Show=nz;Format=m_1_1_1000000_1_0_1"/>
+  <node id="RT_R0_G"          address="0x0000001b" mask="0xFFFFFFFF" permission="r" parameters="Table=CM_CLOCKING;Column=_1_FREQ;Row=_3;Status=3;Show=nz;Format=m_1_1_1000000_1_0_1"/>
+  <node id="RT_R1_G"          address="0x0000001c" mask="0xFFFFFFFF" permission="r" parameters="Table=CM_CLOCKING;Column=_1_FREQ;Row=_3;Status=3;Show=nz;Format=m_1_1_1000000_1_0_1"/>
+  <node id="RT_R0_P"          address="0x0000001d" mask="0xFFFFFFFF" permission="r" parameters="Table=CM_CLOCKING;Column=_1_FREQ;Row=_3;Status=3;Show=nz;Format=m_1_1_1000000_1_0_1"/>
+  <node id="RT_R1_P"          address="0x0000001e" mask="0xFFFFFFFF" permission="r" parameters="Table=CM_CLOCKING;Column=_1_FREQ;Row=_3;Status=3;Show=nz;Format=m_1_1_1000000_1_0_1"/>
+  <node id="RT_R0_I"          address="0x0000001f" mask="0xFFFFFFFF" permission="r" parameters="Table=CM_CLOCKING;Column=_1_FREQ;Row=_3;Status=3;Show=nz;Format=m_1_1_1000000_1_0_1"/>
+  <node id="RT_R1_I"          address="0x00000020" mask="0xFFFFFFFF" permission="r" parameters="Table=CM_CLOCKING;Column=_1_FREQ;Row=_3;Status=3;Show=nz;Format=m_1_1_1000000_1_0_1"/>
+</node>
diff --git a/address_table/modules/CM_IO_EMP.xml b/address_table/modules/CM_IO_EMP.xml
@@ -0,0 +1,14 @@
+<node id="CM_IO">
+  <node id="CLK_200_LOCKED"    address="0x00000010" mask="0x00000001" permission="r"/>
+  <node id="RGB"  address="0x00000200">
+    <node id="R" mask="0xFF"     permission="rw" parameters="default=0x00"/>
+    <node id="G" mask="0xFF00"   permission="rw" parameters="default=0x00"/>
+    <node id="B" mask="0xFF0000" permission="rw" parameters="default=0xFF"/>
+  </node>
+  <node id="BRAM" address="0x00000300">
+    <node id="WRITE"   address="0x0" mask="0x1"        permission="w"  />
+    <node id="ADDR"    address="0x1" mask="0x7FFF"     permission="rw" />
+    <node id="WR_DATA" address="0x2" mask="0xFFFFFFFF" permission="rw" />
+    <node id="RD_DATA" address="0x3" mask="0xFFFFFFFF" permission="r" />
+  </node>
+</node>
diff --git a/address_table/modules/CM_IO_ITDTC.xml b/address_table/modules/CM_IO_ITDTC.xml
@@ -0,0 +1,21 @@
+<node id="CM_IO">
+  <node id="RESET_AXI_BUS"     address="0x00000000" mask="0x00000001" permission="w"/>
+  <node id="RESET_LHC_BUS"     address="0x00000000" mask="0x00000002" permission="w"/>
+  <node id="CLK_200_LOCKED"    address="0x00000010" mask="0x00000001" permission="r"/>
+  <node id="TCDS_RST_N"        address="0x00000010" mask="0x00000002" permission="r"/>
+  <node id="LHC_RST_N"         address="0x00000010" mask="0x00000004" permission="r"/>  
+
+  <node id="ITDTC_CLK_FREQ"    address="0x00000011" mask="0xFFFFFFFF" permission="r" parameters="Table=CLOCKING;Column=FREQ;Row=ITDTC_LHC;Status=3;Show=nz;Format=m_1_1_1000000_1_0_1"/>
+
+  <node id="RGB"  address="0x00000200">
+    <node id="R" mask="0xFF"     permission="rw" parameters="default=0x00"/>
+    <node id="G" mask="0xFF00"   permission="rw" parameters="default=0x00"/>
+    <node id="B" mask="0xFF0000" permission="rw" parameters="default=0xFF"/>
+  </node>
+  <node id="BRAM"        address="0x00000300">
+    <node id="WRITE"     address="0x0" mask="0x1"        permission="w"  />
+    <node id="ADDR"      address="0x1" mask="0x7FFF"     permission="rw" />
+    <node id="WR_DATA"   address="0x2" mask="0xFFFFFFFF" permission="rw" />
+    <node id="RD_DATA"   address="0x3" mask="0xFFFFFFFF" permission="r" />
+  </node>
+</node>
diff --git a/address_table/modules/DEBUG_8B10B_channel.xml b/address_table/modules/DEBUG_8B10B_channel.xml
@@ -0,0 +1,16 @@
+<node id="DEBUG_8B10B_CHANNEL">
+  <node id="RX"             address="0x0">
+    <node id="DATA"         address="0x0" mask="0xFFFFFFFF" permission="r"/>
+    <node id="KDATA"        address="0x1" mask="0x0000000F" permission="r"/>
+    <node id="VALID"        address="0x1" mask="0x00000F00" permission="r"/>
+    <node id="COMMA"        address="0x1" mask="0x00010000" permission="r"/>
+    <node id="DISP_ERR"     address="0x1" mask="0x0F000000" permission="r"/>
+    <node id="ENABLE"       address="0x2" mask="0x00000001" permission="rw"/>
+    <node id="EN_COMMA_DET" address="0x2" mask="0x00000002" permission="rw"/>
+  </node>
+  <node id="TX"         address="0x3">
+    <node id="DATA"     address="0x0" mask="0xFFFFFFFF" permission="rw"/>
+    <node id="KDATA"    address="0x1" mask="0x0000000F" permission="rw"/>
+    <node id="ENABLE"   address="0x2" mask="0x00000001" permission="rw"/>
+  </node>  
+</node>
diff --git a/address_table/modules/DEBUG_8B10B_channel_clk.xml b/address_table/modules/DEBUG_8B10B_channel_clk.xml
@@ -0,0 +1,12 @@
+<node id="DEBUG_8B10B_CLK">
+  <node id="RX" address="0x00">
+    <!-- <node id="SRCCLK_FREQ"  address="0x00" mask="0xFFFFFFFF" permission="r" parameters="Table=DEBUG__8B10B__CLOCKING;Column=___1___2;Row=___3;Status=3"/> -->
+    <node id="USRCLK_FREQ"  address="0x01" mask="0xFFFFFFFF" permission="r" parameters="Table=DEBUG__8B10B__CLOCKING;Column=___1___2;Row=___3;Status=3"/>
+    <node id="USRCLK2_FREQ" address="0x02" mask="0xFFFFFFFF" permission="r" parameters="Table=DEBUG__8B10B__CLOCKING;Column=___1___2;Row=___3;Status=3"/>
+  </node>
+  <node id="TX" address="0x03">
+    <!-- <node id="SRCCLK_FREQ"  address="0x00" mask="0xFFFFFFFF" permission="r" parameters="Table=DEBUG__8B10B__CLOCKING;Column=___1___2;Row=___3;Status=3"/> -->
+    <node id="USRCLK_FREQ"  address="0x01" mask="0xFFFFFFFF" permission="r" parameters="Table=DEBUG__8B10B__CLOCKING;Column=___1___2;Row=___3;Status=3"/>
+    <node id="USRCLK2_FREQ" address="0x02" mask="0xFFFFFFFF" permission="r" parameters="Table=DEBUG__8B10B__CLOCKING;Column=___1___2;Row=___3;Status=3"/>
+  </node>
+</node>
diff --git a/address_table/modules/DRP_USP_GTY.xml b/address_table/modules/DRP_USP_GTY.xml
@@ -1,5 +1,5 @@
 <node id="ES">
-  <node id="TYPE_USP_GTH"       address="0x0000" mask="0xFFFF" permission="r"/>
+  <node id="TYPE_USP_GTY"       address="0x0000" mask="0xFFFF" permission="r"/>
 
   <node id="RX_DATA_WIDTH"         address="0x0003" mask="0x01E0" permission="rw"/>
 

diff --git a/address_table/modules/QuadTest.xml b/address_table/modules/QuadTest.xml
@@ -1,9 +1,9 @@
 <node id="QUADTEST">
   <!-- <node id="FF_K1" address="0x00000000" module="file://QuadTest_FF_12_GTH.xml"/> -->
-  <!-- <node id="FF_K2" address="0x00008000" module="file://QuadTest_FF_12_GTH.xml"/> -->
-  <!-- <node id="FF_K3" address="0x00010000" module="file://QuadTest_FF_12_GTH.xml"/> -->
-  <node id="FF_K4" address="0x00018000" module="file://QuadTest_FF_4_GTY.xml"/>
-  <node id="FF_K5" address="0x00020000" module="file://QuadTest_FF_4_GTY.xml"/>
-  <node id="FF_K6" address="0x00028000" module="file://QuadTest_FF_4_GTY.xml"/>
+  <node id="FF_K2" address="0x00008000" module="file://QuadTest_FF_12_GTH.xml"/>
+  <node id="FF_K3" address="0x00010000" module="file://QuadTest_FF_12_GTH.xml"/>
+  <!-- <node id="FF_K4" address="0x00018000" module="file://QuadTest_FF_4_GTY.xml"/> -->
+  <!-- <node id="FF_K5" address="0x00020000" module="file://QuadTest_FF_4_GTY.xml"/> -->
+  <!-- <node id="FF_K6" address="0x00028000" module="file://QuadTest_FF_4_GTY.xml"/> -->
   <!-- <node id="FF_K7" address="0x00030000" module="file://QuadTest_FF_12_GTH.xml"/> -->
 </node> 
diff --git a/address_table/modules/QuadTest_FF_12_GTH.xml b/address_table/modules/QuadTest_FF_12_GTH.xml
@@ -1,15 +1,15 @@
 <node id="FF" >
-  <node id="CHANNEL_1"  address="0x0000" fwinfo="type=array" module="file://USP_GTH_Channel.xml"/>
-  <node id="CHANNEL_2"  address="0x0800" fwinfo="type=array" module="file://USP_GTH_Channel.xml"/>
-  <node id="CHANNEL_3"  address="0x1000" fwinfo="type=array" module="file://USP_GTH_Channel.xml"/>
-  <node id="CHANNEL_4"  address="0x1800" fwinfo="type=array" module="file://USP_GTH_Channel.xml"/>
-  <node id="CHANNEL_5"  address="0x2000" fwinfo="type=array" module="file://USP_GTH_Channel.xml"/>
-  <node id="CHANNEL_6"  address="0x2800" fwinfo="type=array" module="file://USP_GTH_Channel.xml"/>
-  <node id="CHANNEL_7"  address="0x3000" fwinfo="type=array" module="file://USP_GTH_Channel.xml"/>
-  <node id="CHANNEL_8"  address="0x3800" fwinfo="type=array" module="file://USP_GTH_Channel.xml"/>
-  <node id="CHANNEL_9"  address="0x4000" fwinfo="type=array" module="file://USP_GTH_Channel.xml"/>
-  <node id="CHANNEL_10" address="0x4800" fwinfo="type=array" module="file://USP_GTH_Channel.xml"/>
-  <node id="CHANNEL_11" address="0x5000" fwinfo="type=array" module="file://USP_GTH_Channel.xml"/>
-  <node id="CHANNEL_12" address="0x5800" fwinfo="type=array" module="file://USP_GTH_Channel.xml"/>
+  <node id="CHANNEL_1"  address="0x0000" fwinfo="type=array" module="file://USP_GTH_Channel_64B66B.xml"/>
+  <node id="CHANNEL_2"  address="0x0800" fwinfo="type=array" module="file://USP_GTH_Channel_64B66B.xml"/>
+  <node id="CHANNEL_3"  address="0x1000" fwinfo="type=array" module="file://USP_GTH_Channel_64B66B.xml"/>
+  <node id="CHANNEL_4"  address="0x1800" fwinfo="type=array" module="file://USP_GTH_Channel_64B66B.xml"/>
+  <node id="CHANNEL_5"  address="0x2000" fwinfo="type=array" module="file://USP_GTH_Channel_64B66B.xml"/>
+  <node id="CHANNEL_6"  address="0x2800" fwinfo="type=array" module="file://USP_GTH_Channel_64B66B.xml"/>
+  <node id="CHANNEL_7"  address="0x3000" fwinfo="type=array" module="file://USP_GTH_Channel_64B66B.xml"/>
+  <node id="CHANNEL_8"  address="0x3800" fwinfo="type=array" module="file://USP_GTH_Channel_64B66B.xml"/>
+  <node id="CHANNEL_9"  address="0x4000" fwinfo="type=array" module="file://USP_GTH_Channel_64B66B.xml"/>
+  <node id="CHANNEL_10" address="0x4800" fwinfo="type=array" module="file://USP_GTH_Channel_64B66B.xml"/>
+  <node id="CHANNEL_11" address="0x5000" fwinfo="type=array" module="file://USP_GTH_Channel_64B66B.xml"/>
+  <node id="CHANNEL_12" address="0x5800" fwinfo="type=array" module="file://USP_GTH_Channel_64B66B.xml"/>
   <node id="COMMON"     address="0x6000" module="file://USP_GTH_COMMON.xml"/>
 </node>