update config.vhd files with new USE_ADC constant

diff --git a/adcaddon/config.vhd b/adcaddon/config.vhd
index 8cd13c38360b2c9edb4d7b9898c25b5d4736d362..80904c252f7a5ca63573f900e3780c76d7d91d07 100644 (file)
--- a/adcaddon/config.vhd
+++ b/adcaddon/config.vhd
@@ -32,6 +32,7 @@ package config is
    
     constant INCLUDE_UART           : integer  := c_NO;
     constant INCLUDE_SPI            : integer  := c_YES;
+    constant INCLUDE_ADC            : integer  := c_YES; 
     constant INCLUDE_LCD            : integer  := c_NO;
     constant INCLUDE_DEBUG_INTERFACE: integer  := c_NO;
    

diff --git a/backplanemaster/config.vhd b/backplanemaster/config.vhd
index 859fc15d329b9fd3d66ea78ba3336f06c86a7cbb..6a8ac824b52404d6f465c80a938198244a5a8840 100644 (file)
--- a/backplanemaster/config.vhd
+++ b/backplanemaster/config.vhd
@@ -29,6 +29,7 @@ package config is
 
     constant INCLUDE_UART           : integer  := c_YES;
     constant INCLUDE_SPI            : integer  := c_YES;
+    constant INCLUDE_ADC            : integer  := c_YES; 
     constant INCLUDE_LCD            : integer  := c_NO;
     constant INCLUDE_DEBUG_INTERFACE: integer  := c_YES;
     

diff --git a/cts/config_32TDC.vhd b/cts/config_32TDC.vhd
index 127a80dcb0f8540bcfcfa66a7fd6c0381e82ac73..3a31721a93b92b501b6d753204939af89d1af945 100644 (file)
--- a/cts/config_32TDC.vhd
+++ b/cts/config_32TDC.vhd
@@ -33,6 +33,7 @@ package config is
 
     constant INCLUDE_UART           : integer  := c_YES;
     constant INCLUDE_SPI            : integer  := c_YES;
+    constant INCLUDE_ADC            : integer  := c_YES; 
     constant INCLUDE_LCD            : integer  := c_NO;
     constant INCLUDE_DEBUG_INTERFACE: integer  := c_YES;
 

diff --git a/cts/config_8SFP_KEL.vhd b/cts/config_8SFP_KEL.vhd
index 8434886fc582fad9276cde5dd321361f77f20b9d..5f143ea5e45384b779a7aa45e499ae41992fa43b 100644 (file)
--- a/cts/config_8SFP_KEL.vhd
+++ b/cts/config_8SFP_KEL.vhd
@@ -33,6 +33,7 @@ package config is
 
     constant INCLUDE_UART           : integer  := c_YES;
     constant INCLUDE_SPI            : integer  := c_YES;
+    constant INCLUDE_ADC            : integer  := c_YES; 
     constant INCLUDE_LCD            : integer  := c_NO;
     constant INCLUDE_DEBUG_INTERFACE: integer  := c_YES;
 

diff --git a/cts/config_8SFP_RJAdapter.vhd b/cts/config_8SFP_RJAdapter.vhd
index afadb536bfd53650cd865527c9402429b908602e..35bd68304e678e49ad2a9c7b4a1c15052688ff0d 100644 (file)
--- a/cts/config_8SFP_RJAdapter.vhd
+++ b/cts/config_8SFP_RJAdapter.vhd
@@ -33,6 +33,7 @@ package config is
 
     constant INCLUDE_UART           : integer  := c_YES;
     constant INCLUDE_SPI            : integer  := c_YES;
+    constant INCLUDE_ADC            : integer  := c_YES; 
     constant INCLUDE_LCD            : integer  := c_NO;
     constant INCLUDE_DEBUG_INTERFACE: integer  := c_YES;
 

diff --git a/cts/config_8TDC_R3B.vhd b/cts/config_8TDC_R3B.vhd
index f802ccbfe0a77e4aa8879a611e9934dedf02888d..6abd9017d71b9ac800991d6559405c6a36ce5c80 100644 (file)
--- a/cts/config_8TDC_R3B.vhd
+++ b/cts/config_8TDC_R3B.vhd
@@ -33,6 +33,7 @@ package config is
 
     constant INCLUDE_UART           : integer  := c_YES;
     constant INCLUDE_SPI            : integer  := c_YES;
+    constant INCLUDE_ADC            : integer  := c_YES; 
     constant INCLUDE_LCD            : integer  := c_NO;
     constant INCLUDE_DEBUG_INTERFACE: integer  := c_YES;
 

diff --git a/cts/config_backplane_KEL.vhd b/cts/config_backplane_KEL.vhd
index e19420fb439421d659400c10a56d7d1d2cc67a34..0aa60a79de160d0d868ce97387cd359925885081 100644 (file)
--- a/cts/config_backplane_KEL.vhd
+++ b/cts/config_backplane_KEL.vhd
@@ -33,6 +33,7 @@ package config is
 
     constant INCLUDE_UART           : integer  := c_YES;
     constant INCLUDE_SPI            : integer  := c_YES;
+    constant INCLUDE_ADC            : integer  := c_YES; 
     constant INCLUDE_LCD            : integer  := c_NO;
     constant INCLUDE_DEBUG_INTERFACE: integer  := c_YES;
 

diff --git a/cts/config_simple.vhd b/cts/config_simple.vhd
index 40f69b04df2fcb6bd55ce3061f20e6b31fccac43..292195ed7ba76ff6dd50269c78726aa07849583c 100644 (file)
--- a/cts/config_simple.vhd
+++ b/cts/config_simple.vhd
@@ -33,6 +33,7 @@ package config is
 
     constant INCLUDE_UART            : integer  := c_YES;
     constant INCLUDE_SPI             : integer  := c_YES;
+    constant INCLUDE_ADC            : integer  := c_YES; 
     constant INCLUDE_LCD             : integer  := c_NO;
     constant INCLUDE_DEBUG_INTERFACE : integer  := c_YES;
 

diff --git a/halfmasterhub/config.vhd b/halfmasterhub/config.vhd
index 7a01296e627b974dbe6fe4211b1d96b677df2c79..cbe747c22c43a0a6791068b0baee08f161c7bc4a 100644 (file)
--- a/halfmasterhub/config.vhd
+++ b/halfmasterhub/config.vhd
@@ -29,6 +29,7 @@ package config is
 
     constant INCLUDE_UART           : integer  := c_YES;
     constant INCLUDE_SPI            : integer  := c_YES;
+    constant INCLUDE_ADC            : integer  := c_YES; 
     constant INCLUDE_LCD            : integer  := c_NO;
     constant INCLUDE_DEBUG_INTERFACE: integer  := c_YES;
     

diff --git a/hub/config.vhd b/hub/config.vhd
index 2208b3d4fcb738f22446455d921abb7d09815fd0..fefb3d28f890161d608351000fa911bdc345691c 100644 (file)
--- a/hub/config.vhd
+++ b/hub/config.vhd
@@ -12,7 +12,7 @@ package config is
 ------------------------------------------------------------------------------
 
 --design options: backplane or front SFP, with or without GBE
-    constant USE_BACKPLANE : integer := c_NO;
+    constant USE_BACKPLANE : integer := c_YES;
     constant INCLUDE_GBE   : integer := c_YES;
 
     constant FPGA_TYPE               : integer  := 5;  --3: ECP3, 5: ECP5
@@ -33,6 +33,7 @@ package config is
 
     constant INCLUDE_UART           : integer  := c_YES;
     constant INCLUDE_SPI            : integer  := c_YES;
+    constant INCLUDE_ADC            : integer  := c_YES; 
     constant INCLUDE_LCD            : integer  := c_NO;
     constant INCLUDE_DEBUG_INTERFACE: integer  := c_NO;
 

diff --git a/padiwa/config.vhd b/padiwa/config.vhd
index 5d60d47a69f6595769584e42aa4a552876282b74..129e851e6d03a7ab96a83a34332ed7ebbc902cb1 100644 (file)
--- a/padiwa/config.vhd
+++ b/padiwa/config.vhd
@@ -40,6 +40,7 @@ package config is
 
     constant INCLUDE_UART           : integer  := c_YES;
     constant INCLUDE_SPI            : integer  := c_YES;
+    constant INCLUDE_ADC            : integer  := c_YES; 
     constant INCLUDE_LCD            : integer  := c_YES;
     constant INCLUDE_DEBUG_INTERFACE: integer  := c_NO;
 

diff --git a/tdctemplate/config_16_crate_ada_nino.vhd b/tdctemplate/config_16_crate_ada_nino.vhd
index fa873b5b6f7a3086fd520c2bf342178d743aa2d3..893498a05aaa4b067d3fd76e7866f7904c6b9df9 100644 (file)
--- a/tdctemplate/config_16_crate_ada_nino.vhd
+++ b/tdctemplate/config_16_crate_ada_nino.vhd
@@ -56,6 +56,7 @@ package config is
     
     constant INCLUDE_UART           : integer  := c_NO;
     constant INCLUDE_SPI            : integer  := c_YES;
+    constant INCLUDE_ADC            : integer  := c_YES; 
     constant INCLUDE_LCD            : integer  := c_NO;
     constant INCLUDE_DEBUG_INTERFACE: integer  := c_YES;    
    

diff --git a/tdctemplate/config_32_sfp_kel.vhd b/tdctemplate/config_32_sfp_kel.vhd
index 16a7436d0b18f3b762f2d81b8672609db5050c66..bbe12ebd602e1f11366ae855bc675ffd1c0e9e61 100644 (file)
--- a/tdctemplate/config_32_sfp_kel.vhd
+++ b/tdctemplate/config_32_sfp_kel.vhd
@@ -56,6 +56,7 @@ package config is
     
     constant INCLUDE_UART           : integer  := c_NO;
     constant INCLUDE_SPI            : integer  := c_YES;
+    constant INCLUDE_ADC            : integer  := c_YES; 
     constant INCLUDE_LCD            : integer  := c_NO;
     constant INCLUDE_DEBUG_INTERFACE: integer  := c_NO;    
    

diff --git a/tdctemplate/config_32_sfp_kel_cal200.vhd b/tdctemplate/config_32_sfp_kel_cal200.vhd
index 8aedc371bed7b84f72c41e22e153af5a035cc730..9e3e8357da16766da935fbccba1efb2225709f0d 100644 (file)
--- a/tdctemplate/config_32_sfp_kel_cal200.vhd
+++ b/tdctemplate/config_32_sfp_kel_cal200.vhd
@@ -56,6 +56,7 @@ package config is
     
     constant INCLUDE_UART           : integer  := c_NO;
     constant INCLUDE_SPI            : integer  := c_YES;
+    constant INCLUDE_ADC            : integer  := c_YES; 
     constant INCLUDE_LCD            : integer  := c_NO;
     constant INCLUDE_DEBUG_INTERFACE: integer  := c_YES;    
    

diff --git a/tdctemplate/config_48_crate_4conn.vhd b/tdctemplate/config_48_crate_4conn.vhd
index 3dd1cc69c351a77f2b4f3427dfa461eead1f0585..d062eb1f68f38e37058fb21b526a9347e8bc847d 100644 (file)
--- a/tdctemplate/config_48_crate_4conn.vhd
+++ b/tdctemplate/config_48_crate_4conn.vhd
@@ -56,6 +56,7 @@ package config is
     
     constant INCLUDE_UART           : integer  := c_NO;
     constant INCLUDE_SPI            : integer  := c_YES;
+    constant INCLUDE_ADC            : integer  := c_YES; 
     constant INCLUDE_LCD            : integer  := c_NO;
     constant INCLUDE_DEBUG_INTERFACE: integer  := c_NO;    
    

diff --git a/tdctemplate/config_48_crate_4conn_cal200.vhd b/tdctemplate/config_48_crate_4conn_cal200.vhd
index 38047bdc4f1167dbb9b472b7a28a997834655575..88f470000653472a2766782aa213065ed2d56fc1 100644 (file)
--- a/tdctemplate/config_48_crate_4conn_cal200.vhd
+++ b/tdctemplate/config_48_crate_4conn_cal200.vhd
@@ -56,6 +56,7 @@ package config is
     
     constant INCLUDE_UART           : integer  := c_NO;
     constant INCLUDE_SPI            : integer  := c_YES;
+    constant INCLUDE_ADC            : integer  := c_YES; 
     constant INCLUDE_LCD            : integer  := c_NO;
     constant INCLUDE_DEBUG_INTERFACE: integer  := c_YES;    
    

diff --git a/tdctemplate/config_48_crate_4conn_ecal.vhd b/tdctemplate/config_48_crate_4conn_ecal.vhd
index e5749f72a791bd989e6bdf51554840822d0ea668..977f1c1ff026fb52dfe915790fa4cf193ab9e6fd 100644 (file)
--- a/tdctemplate/config_48_crate_4conn_ecal.vhd
+++ b/tdctemplate/config_48_crate_4conn_ecal.vhd
@@ -56,6 +56,7 @@ package config is
     
     constant INCLUDE_UART           : integer  := c_NO;
     constant INCLUDE_SPI            : integer  := c_YES;
+    constant INCLUDE_ADC            : integer  := c_YES; 
     constant INCLUDE_LCD            : integer  := c_NO;
     constant INCLUDE_DEBUG_INTERFACE: integer  := c_YES;    
    

diff --git a/tdctemplate/config_48_crate_4conn_start.vhd b/tdctemplate/config_48_crate_4conn_start.vhd
index 78abac7fbb03c0a80071f2589a3fa3d9376fad61..3b8231354c509413eac887c705720edbe30e291a 100644 (file)
--- a/tdctemplate/config_48_crate_4conn_start.vhd
+++ b/tdctemplate/config_48_crate_4conn_start.vhd
@@ -56,6 +56,7 @@ package config is
     
     constant INCLUDE_UART           : integer  := c_NO;
     constant INCLUDE_SPI            : integer  := c_YES;
+    constant INCLUDE_ADC            : integer  := c_YES; 
     constant INCLUDE_LCD            : integer  := c_NO;
     constant INCLUDE_DEBUG_INTERFACE: integer  := c_NO;    
    

diff --git a/tdctemplate/config_48_crate_4conn_start_dualchannel.vhd b/tdctemplate/config_48_crate_4conn_start_dualchannel.vhd
index 440fdc05df8e9e0b6dc2ecdbcfd7fda8a796b675..fabfc487473c6c80cd0ad3e2394140c666e05bc8 100644 (file)
--- a/tdctemplate/config_48_crate_4conn_start_dualchannel.vhd
+++ b/tdctemplate/config_48_crate_4conn_start_dualchannel.vhd
@@ -56,6 +56,7 @@ package config is
     
     constant INCLUDE_UART           : integer  := c_NO;
     constant INCLUDE_SPI            : integer  := c_YES;
+    constant INCLUDE_ADC            : integer  := c_YES; 
     constant INCLUDE_LCD            : integer  := c_NO;
     constant INCLUDE_DEBUG_INTERFACE: integer  := c_NO;    
    

diff --git a/tdctemplate/config_48_crate_ada_rpc_cal200.vhd b/tdctemplate/config_48_crate_ada_rpc_cal200.vhd
index 2c37a21d5c5ec1189f8e41ca84b2e8ae42aa7cca..f77aa4cb0827c7c67e82b91ffcc72211b552e720 100644 (file)
--- a/tdctemplate/config_48_crate_ada_rpc_cal200.vhd
+++ b/tdctemplate/config_48_crate_ada_rpc_cal200.vhd
@@ -56,6 +56,7 @@ package config is
     
     constant INCLUDE_UART           : integer  := c_NO;
     constant INCLUDE_SPI            : integer  := c_YES;
+    constant INCLUDE_ADC            : integer  := c_YES; 
     constant INCLUDE_LCD            : integer  := c_NO;
     constant INCLUDE_DEBUG_INTERFACE: integer  := c_YES;    
    

diff --git a/tdctemplate/config_48_sfp_4conn.vhd b/tdctemplate/config_48_sfp_4conn.vhd
index 61b2843fe1bb9bbfb45bdc2a6084b17d5722a996..b493a649edda0bcf1a012262b66497ca45ac2004 100644 (file)
--- a/tdctemplate/config_48_sfp_4conn.vhd
+++ b/tdctemplate/config_48_sfp_4conn.vhd
@@ -56,6 +56,7 @@ package config is
     
     constant INCLUDE_UART           : integer  := c_NO;
     constant INCLUDE_SPI            : integer  := c_YES;
+    constant INCLUDE_ADC            : integer  := c_YES; 
     constant INCLUDE_LCD            : integer  := c_NO;
     constant INCLUDE_DEBUG_INTERFACE: integer  := c_YES;    
    

diff --git a/template/config.vhd b/template/config.vhd
index 9d2bebdc2e9ce328295d27058e49e7abae37cc9d..c67270a07119a8b8a5861fc42c0552b1a48f97dd 100644 (file)
--- a/template/config.vhd
+++ b/template/config.vhd
@@ -28,10 +28,11 @@ package config is
     constant BROADCAST_SPECIAL_ADDR : std_logic_vector := x"69";
    
 --set to 0 for backplane serdes, set to 3 for front SFP serdes
-    constant SERDES_NUM             : integer := 3;
+    constant SERDES_NUM             : integer := 0;
    
     constant INCLUDE_UART           : integer  := c_YES;
     constant INCLUDE_SPI            : integer  := c_YES;
+    constant INCLUDE_ADC            : integer  := c_YES; 
     constant INCLUDE_LCD            : integer  := c_NO;
     constant INCLUDE_DEBUG_INTERFACE: integer  := c_YES;
 
@@ -42,7 +43,7 @@ package config is
     constant TRIG_GEN_OUTPUT_NUM    : integer  := 4;
     constant MONITOR_INPUT_NUM      : integer  := 64;        
 
-    constant USE_GBE                : integer := c_YES;
+    constant USE_GBE                : integer := c_NO;
     
 ------------------------------------------------------------------------------
 --End of design configuration

diff --git a/triggerbox/config.vhd b/triggerbox/config.vhd
index fd7b98e5654512a9a90ecc24073665bd0132a334..a659169b16a5462805a8126f2a966fd37bdfd08e 100644 (file)
--- a/triggerbox/config.vhd
+++ b/triggerbox/config.vhd
@@ -32,6 +32,7 @@ package config is
    
     constant INCLUDE_UART           : integer  := c_NO;
     constant INCLUDE_SPI            : integer  := c_YES;
+    constant INCLUDE_ADC            : integer  := c_YES; 
     constant INCLUDE_LCD            : integer  := c_NO;
     constant INCLUDE_DEBUG_INTERFACE: integer  := c_NO;