From 2ef31d725e54786acdfddfc42f6011b29cf11534 Mon Sep 17 00:00:00 2001 From: Jan Michel Date: Tue, 23 Aug 2022 17:04:12 +0200 Subject: [PATCH] update config.vhd files with new USE_ADC constant --- adcaddon/config.vhd | 1 + backplanemaster/config.vhd | 1 + cts/config_32TDC.vhd | 1 + cts/config_8SFP_KEL.vhd | 1 + cts/config_8SFP_RJAdapter.vhd | 1 + cts/config_8TDC_R3B.vhd | 1 + cts/config_backplane_KEL.vhd | 1 + cts/config_simple.vhd | 1 + halfmasterhub/config.vhd | 1 + hub/config.vhd | 3 ++- padiwa/config.vhd | 1 + tdctemplate/config_16_crate_ada_nino.vhd | 1 + tdctemplate/config_32_sfp_kel.vhd | 1 + tdctemplate/config_32_sfp_kel_cal200.vhd | 1 + tdctemplate/config_48_crate_4conn.vhd | 1 + tdctemplate/config_48_crate_4conn_cal200.vhd | 1 + tdctemplate/config_48_crate_4conn_ecal.vhd | 1 + tdctemplate/config_48_crate_4conn_start.vhd | 1 + tdctemplate/config_48_crate_4conn_start_dualchannel.vhd | 1 + tdctemplate/config_48_crate_ada_rpc_cal200.vhd | 1 + tdctemplate/config_48_sfp_4conn.vhd | 1 + template/config.vhd | 5 +++-- triggerbox/config.vhd | 1 + 23 files changed, 26 insertions(+), 3 deletions(-) diff --git a/adcaddon/config.vhd b/adcaddon/config.vhd index 8cd13c3..80904c2 100644 --- 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 859fc15..6a8ac82 100644 --- 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 127a80d..3a31721 100644 --- 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 8434886..5f143ea 100644 --- 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 afadb53..35bd683 100644 --- 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 f802ccb..6abd901 100644 --- 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 e19420f..0aa60a7 100644 --- 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 40f69b0..292195e 100644 --- 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 7a01296..cbe747c 100644 --- 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 2208b3d..fefb3d2 100644 --- 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 5d60d47..129e851 100644 --- 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 fa873b5..893498a 100644 --- 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 16a7436..bbe12eb 100644 --- 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 8aedc37..9e3e835 100644 --- 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 3dd1cc6..d062eb1 100644 --- 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 38047bd..88f4700 100644 --- 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 e5749f7..977f1c1 100644 --- 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 78abac7..3b82313 100644 --- 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 440fdc0..fabfc48 100644 --- 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 2c37a21..f77aa4c 100644 --- 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 61b2843..b493a64 100644 --- 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 9d2bebd..c67270a 100644 --- 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 fd7b98e..a659169 100644 --- 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; -- 2.43.0