update config files to include I2C

diff --git a/adcaddon/config.vhd b/adcaddon/config.vhd
index 80904c252f7a5ca63573f900e3780c76d7d91d07..00fb3272a627d9ef1e9f5e365febc0f36aeb24c8 100644 (file)
--- a/adcaddon/config.vhd
+++ b/adcaddon/config.vhd
@@ -33,7 +33,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_I2C            : integer  := c_NO;
     constant INCLUDE_DEBUG_INTERFACE: integer  := c_NO;
    
     --input monitor and trigger generation logic
@@ -104,10 +104,10 @@ begin
   t(14 downto 14) := std_logic_vector(to_unsigned(ADC_BASELINE_LOGIC,1));
   t(15 downto 15) := std_logic_vector(to_unsigned(ADC_TRIGGER_LOGIC,1));
   t(23 downto 16) := std_logic_vector(to_unsigned(ADC_CHANNELS,8));
-  t(40 downto 40) := std_logic_vector(to_unsigned(INCLUDE_LCD,1));
   t(42 downto 42) := std_logic_vector(to_unsigned(INCLUDE_SPI,1));
   t(43 downto 43) := std_logic_vector(to_unsigned(INCLUDE_UART,1));
   t(45 downto 45) := std_logic_vector(to_unsigned(USE_GBE,1));
+  t(47 downto 47) := std_logic_vector(to_unsigned(INCLUDE_I2C,1));
   t(51 downto 48) := std_logic_vector(to_unsigned(INCLUDE_TRIGGER_LOGIC,4));
   t(52 downto 52) := std_logic_vector(to_unsigned(USE_120_MHZ,1));
   t(53 downto 53) := std_logic_vector(to_unsigned(USE_RXCLOCK,1));

diff --git a/backplanemaster/config.vhd b/backplanemaster/config.vhd
index 6a8ac824b52404d6f465c80a938198244a5a8840..a99a278b99ef7b022efbdcb71088140fbd241a7a 100644 (file)
--- a/backplanemaster/config.vhd
+++ b/backplanemaster/config.vhd
@@ -30,7 +30,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_I2C            : integer  := c_NO;
     constant INCLUDE_DEBUG_INTERFACE: integer  := c_YES;
     
     --input monitor and trigger generation logic
@@ -132,10 +132,10 @@ function generateIncludedFeatures return std_logic_vector is
     t(23 downto 23) := std_logic_vector(to_unsigned(INCLUDE_GBE,1));
     t(28 downto 28) := std_logic_vector(to_unsigned(1,1));
     t(27 downto 24) := std_logic_vector(to_unsigned(2-INCLUDE_GBE,4)); --num SFPs with TrbNet
-    t(40 downto 40) := std_logic_vector(to_unsigned(INCLUDE_LCD,1));
     t(42 downto 42) := std_logic_vector(to_unsigned(INCLUDE_SPI,1));
     t(43 downto 43) := std_logic_vector(to_unsigned(INCLUDE_UART,1));
     t(44 downto 44) := std_logic_vector(to_unsigned(INCLUDE_STATISTICS,1));
+    t(47 downto 47) := std_logic_vector(to_unsigned(INCLUDE_I2C,1));
     t(51 downto 48) := std_logic_vector(to_unsigned(INCLUDE_TRIGGER_LOGIC,4));
     t(52 downto 52) := std_logic_vector(to_unsigned(USE_120_MHZ,1));
     t(53 downto 53) := std_logic_vector(to_unsigned(USE_RXCLOCK,1));

diff --git a/cts/config_32TDC.vhd b/cts/config_32TDC.vhd
index 3a31721a93b92b501b6d753204939af89d1af945..46faf498e408dff306161211c69498c02dd7afef 100644 (file)
--- a/cts/config_32TDC.vhd
+++ b/cts/config_32TDC.vhd
@@ -31,18 +31,18 @@ package config is
     constant BROADCAST_SPECIAL_ADDR : std_logic_vector := x"62";  --62 for SFP, 63 for backplane
    
 
-    constant INCLUDE_UART           : integer  := c_YES;
+    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;
+    constant INCLUDE_I2C            : integer  := c_NO;
+    constant INCLUDE_DEBUG_INTERFACE: integer  := c_NO;
 
     --input monitor and trigger generation logic
     constant INCLUDE_TDC            : integer  := c_YES;
     constant INCLUDE_TRIGGER_LOGIC  : integer  := c_YES;
     constant INCLUDE_STATISTICS     : integer  := c_YES;
     constant TRIG_GEN_INPUT_NUM     : integer  := 36 - USE_RJADAPT*12;
-    constant TRIG_GEN_OUTPUT_NUM    : integer  := 2;
+    constant TRIG_GEN_OUTPUT_NUM    : integer  := 4;
     constant MONITOR_INPUT_NUM      : integer  := 36 - USE_RJADAPT*12;    
 
     
@@ -61,22 +61,22 @@ package config is
                                                                     --ring buffer size: 32,64,96,128,dyn
     constant TDC_DATA_FORMAT         : integer := 0;                                                                  
 
-    constant EVENT_BUFFER_SIZE       : integer range 9 to 13 := 13; -- size of the event buffer, 2**N
-    constant EVENT_MAX_SIZE          : integer := 1023;             --maximum event size. Should not exceed 
+    constant EVENT_BUFFER_SIZE       : integer range 9 to 13 := 11; -- size of the event buffer, 2**N
+    constant EVENT_MAX_SIZE          : integer := 400;             --maximum event size. Should not exceed 
     
     constant GEN_BUSY_OUTPUT : integer := c_NO;
     
-    constant TRIGGER_COIN_COUNT      : integer := 1;
+    constant TRIGGER_COIN_COUNT      : integer := 4;
     constant TRIGGER_PULSER_COUNT    : integer := 3;
     constant TRIGGER_RAND_PULSER     : integer := 1;
-    constant TRIGGER_ADDON_COUNT     : integer := 4;
+    constant TRIGGER_ADDON_COUNT     : integer := 6;
     constant PERIPH_TRIGGER_COUNT    : integer := 0;      
-    constant ADDON_LINE_COUNT        : integer := 36 - USE_RJADAPT*12;  --36 with Padiwa, 22 with RJ-adapter
-    constant CTS_OUTPUT_MULTIPLEXERS : integer := 1;
+    constant ADDON_LINE_COUNT        : integer := 38 - USE_RJADAPT*12;  --36 with Padiwa, 22 with RJ-adapter
+    constant CTS_OUTPUT_MULTIPLEXERS : integer := 2;
 --TODO:    
 --     constant INCLUDE_MBS_MASTER : integer range c_NO to c_YES := c_NO; 
 --Which external trigger module (ETM) to use?
-     constant INCLUDE_ETM : integer range c_NO to c_YES := c_YES;
+     constant INCLUDE_ETM : integer range c_NO to c_YES := c_NO;
      type ETM_CHOICE_type is (ETM_CHOICE_MBS_VULOM, ETM_CHOICE_MAINZ_A2, ETM_CHOICE_CBMNET, ETM_CHOICE_M26, ETM_CHOICE_R3B, ETM_CHOICE_SPILLMON);
      constant ETM_CHOICE : ETM_CHOICE_type := ETM_CHOICE_MBS_VULOM;
      constant ETM_ID : std_logic_vector(7 downto 0);
@@ -89,21 +89,6 @@ package config is
 --End of design configuration
 ------------------------------------------------------------------------------
 
-  type data_t is array (0 to 1023) of std_logic_vector(7 downto 0);
-  constant LCD_DATA : data_t := (
-      x"36",x"48",x"3A",x"55",x"29",x"2A",x"00",x"00", --config don't touch
-      x"00",x"EF",x"2B",x"00",x"00",x"01",x"3F",x"2C", --config don't touch
-      x"00",x"00",x"00",x"00",x"00",x"00",x"00",x"00", --config don't touch
-      x"00",x"00",x"00",x"00",x"00",x"00",x"00",x"00", --config don't touch
-      
-      x"48", x"75", x"62", x"41", x"64", x"64", x"4f", x"6e", x"0a",
-      x"0a",
-      x"41", x"64", x"64", x"72", x"65", x"73", x"73", x"20", x"20", x"20", x"20", x"20", x"20", x"20", x"20", x"20", x"20", x"80",                     x"0a",                            
-      x"43", x"6f", x"6d", x"70", x"69", x"6c", x"65", x"54", x"69", x"6d", x"65", x"20", x"20", x"84",                      x"83",                     x"0a", 
-      x"54", x"69", x"6d", x"65", x"20", x"20", x"20", x"20", x"20", x"20", x"20", x"20", x"20", x"82",                      x"81",                     x"0a",
-      others => x"00");
-
-
     type hub_mii_t is array(0 to 3) of integer;    
     type hub_ct    is array(0 to 16) of integer;
     type hub_cfg_t is array(0 to 3) of hub_ct;    
@@ -207,10 +192,10 @@ function generateIncludedFeatures return std_logic_vector is
     t(26 downto 24) := std_logic_vector(to_unsigned(SFP_NUM_ARR(CFG_MODE),3)); --num SFPs with TrbNet
     t(28 downto 28) := std_logic_vector(to_unsigned(USE_BACKPLANE,1));
     t(39 downto 39) := std_logic_vector(to_unsigned(1,1)); --contains CTS
-    t(40 downto 40) := std_logic_vector(to_unsigned(INCLUDE_LCD,1));
     t(42 downto 42) := std_logic_vector(to_unsigned(INCLUDE_SPI,1));
     t(43 downto 43) := std_logic_vector(to_unsigned(INCLUDE_UART,1));
     t(44 downto 44) := std_logic_vector(to_unsigned(INCLUDE_STATISTICS,1));
+    t(47 downto 47) := std_logic_vector(to_unsigned(INCLUDE_I2C,1));
     t(51 downto 48) := std_logic_vector(to_unsigned(INCLUDE_TRIGGER_LOGIC,4));
     t(52 downto 52) := std_logic_vector(to_unsigned(USE_120_MHZ,1));
     t(53 downto 53) := std_logic_vector(to_unsigned(USE_RXCLOCK,1));

diff --git a/cts/config_8SFP_KEL.vhd b/cts/config_8SFP_KEL.vhd
index 5f143ea5e45384b779a7aa45e499ae41992fa43b..1f282fd6c0af0f051ccf43a563401d0dd746bb70 100644 (file)
--- a/cts/config_8SFP_KEL.vhd
+++ b/cts/config_8SFP_KEL.vhd
@@ -34,7 +34,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_I2C            : integer  := c_NO;
     constant INCLUDE_DEBUG_INTERFACE: integer  := c_YES;
 
     --input monitor and trigger generation logic
@@ -89,20 +89,6 @@ package config is
 --End of design configuration
 ------------------------------------------------------------------------------
 
-  type data_t is array (0 to 1023) of std_logic_vector(7 downto 0);
-  constant LCD_DATA : data_t := (
-      x"36",x"48",x"3A",x"55",x"29",x"2A",x"00",x"00", --config don't touch
-      x"00",x"EF",x"2B",x"00",x"00",x"01",x"3F",x"2C", --config don't touch
-      x"00",x"00",x"00",x"00",x"00",x"00",x"00",x"00", --config don't touch
-      x"00",x"00",x"00",x"00",x"00",x"00",x"00",x"00", --config don't touch
-      
-      x"48", x"75", x"62", x"41", x"64", x"64", x"4f", x"6e", x"0a",
-      x"0a",
-      x"41", x"64", x"64", x"72", x"65", x"73", x"73", x"20", x"20", x"20", x"20", x"20", x"20", x"20", x"20", x"20", x"20", x"80",                     x"0a",                            
-      x"43", x"6f", x"6d", x"70", x"69", x"6c", x"65", x"54", x"69", x"6d", x"65", x"20", x"20", x"84",                      x"83",                     x"0a", 
-      x"54", x"69", x"6d", x"65", x"20", x"20", x"20", x"20", x"20", x"20", x"20", x"20", x"20", x"82",                      x"81",                     x"0a",
-      others => x"00");
-
 
     type hub_mii_t is array(0 to 3) of integer;    
     type hub_ct    is array(0 to 16) of integer;
@@ -207,10 +193,10 @@ function generateIncludedFeatures return std_logic_vector is
     t(26 downto 24) := std_logic_vector(to_unsigned(SFP_NUM_ARR(CFG_MODE),3)); --num SFPs with TrbNet
     t(28 downto 28) := std_logic_vector(to_unsigned(USE_BACKPLANE,1));
     t(39 downto 39) := std_logic_vector(to_unsigned(1,1)); --contains CTS
-    t(40 downto 40) := std_logic_vector(to_unsigned(INCLUDE_LCD,1));
     t(42 downto 42) := std_logic_vector(to_unsigned(INCLUDE_SPI,1));
     t(43 downto 43) := std_logic_vector(to_unsigned(INCLUDE_UART,1));
     t(44 downto 44) := std_logic_vector(to_unsigned(INCLUDE_STATISTICS,1));
+    t(47 downto 47) := std_logic_vector(to_unsigned(INCLUDE_I2C,1));
     t(51 downto 48) := std_logic_vector(to_unsigned(INCLUDE_TRIGGER_LOGIC,4));
     t(52 downto 52) := std_logic_vector(to_unsigned(USE_120_MHZ,1));
     t(53 downto 53) := std_logic_vector(to_unsigned(USE_RXCLOCK,1));

diff --git a/cts/config_8SFP_RJAdapter.vhd b/cts/config_8SFP_RJAdapter.vhd
index 35bd68304e678e49ad2a9c7b4a1c15052688ff0d..52b2db3055a4bb0d190cdc3705754095964814fa 100644 (file)
--- a/cts/config_8SFP_RJAdapter.vhd
+++ b/cts/config_8SFP_RJAdapter.vhd
@@ -34,7 +34,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_I2C            : integer  := c_NO;
     constant INCLUDE_DEBUG_INTERFACE: integer  := c_YES;
 
     --input monitor and trigger generation logic
@@ -89,19 +89,6 @@ package config is
 --End of design configuration
 ------------------------------------------------------------------------------
 
-  type data_t is array (0 to 1023) of std_logic_vector(7 downto 0);
-  constant LCD_DATA : data_t := (
-      x"36",x"48",x"3A",x"55",x"29",x"2A",x"00",x"00", --config don't touch
-      x"00",x"EF",x"2B",x"00",x"00",x"01",x"3F",x"2C", --config don't touch
-      x"00",x"00",x"00",x"00",x"00",x"00",x"00",x"00", --config don't touch
-      x"00",x"00",x"00",x"00",x"00",x"00",x"00",x"00", --config don't touch
-      
-      x"48", x"75", x"62", x"41", x"64", x"64", x"4f", x"6e", x"0a",
-      x"0a",
-      x"41", x"64", x"64", x"72", x"65", x"73", x"73", x"20", x"20", x"20", x"20", x"20", x"20", x"20", x"20", x"20", x"20", x"80",                     x"0a",                            
-      x"43", x"6f", x"6d", x"70", x"69", x"6c", x"65", x"54", x"69", x"6d", x"65", x"20", x"20", x"84",                      x"83",                     x"0a", 
-      x"54", x"69", x"6d", x"65", x"20", x"20", x"20", x"20", x"20", x"20", x"20", x"20", x"20", x"82",                      x"81",                     x"0a",
-      others => x"00");
 
 
     type hub_mii_t is array(0 to 3) of integer;    
@@ -207,10 +194,10 @@ function generateIncludedFeatures return std_logic_vector is
     t(26 downto 24) := std_logic_vector(to_unsigned(SFP_NUM_ARR(CFG_MODE),3)); --num SFPs with TrbNet
     t(28 downto 28) := std_logic_vector(to_unsigned(USE_BACKPLANE,1));
     t(39 downto 39) := std_logic_vector(to_unsigned(1,1)); --contains CTS
-    t(40 downto 40) := std_logic_vector(to_unsigned(INCLUDE_LCD,1));
     t(42 downto 42) := std_logic_vector(to_unsigned(INCLUDE_SPI,1));
     t(43 downto 43) := std_logic_vector(to_unsigned(INCLUDE_UART,1));
     t(44 downto 44) := std_logic_vector(to_unsigned(INCLUDE_STATISTICS,1));
+    t(47 downto 47) := std_logic_vector(to_unsigned(INCLUDE_I2C,1));
     t(51 downto 48) := std_logic_vector(to_unsigned(INCLUDE_TRIGGER_LOGIC,4));
     t(52 downto 52) := std_logic_vector(to_unsigned(USE_120_MHZ,1));
     t(53 downto 53) := std_logic_vector(to_unsigned(USE_RXCLOCK,1));

diff --git a/cts/config_8TDC_R3B.vhd b/cts/config_8TDC_R3B.vhd
index 6abd9017d71b9ac800991d6559405c6a36ce5c80..9a597ffbf9e4afa473162d70baad194dc13bc82b 100644 (file)
--- a/cts/config_8TDC_R3B.vhd
+++ b/cts/config_8TDC_R3B.vhd
@@ -34,7 +34,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_I2C            : integer  := c_NO;
     constant INCLUDE_DEBUG_INTERFACE: integer  := c_YES;
 
     --input monitor and trigger generation logic
@@ -89,21 +89,6 @@ package config is
 --End of design configuration
 ------------------------------------------------------------------------------
 
-  type data_t is array (0 to 1023) of std_logic_vector(7 downto 0);
-  constant LCD_DATA : data_t := (
-      x"36",x"48",x"3A",x"55",x"29",x"2A",x"00",x"00", --config don't touch
-      x"00",x"EF",x"2B",x"00",x"00",x"01",x"3F",x"2C", --config don't touch
-      x"00",x"00",x"00",x"00",x"00",x"00",x"00",x"00", --config don't touch
-      x"00",x"00",x"00",x"00",x"00",x"00",x"00",x"00", --config don't touch
-      
-      x"48", x"75", x"62", x"41", x"64", x"64", x"4f", x"6e", x"0a",
-      x"0a",
-      x"41", x"64", x"64", x"72", x"65", x"73", x"73", x"20", x"20", x"20", x"20", x"20", x"20", x"20", x"20", x"20", x"20", x"80",                     x"0a",                            
-      x"43", x"6f", x"6d", x"70", x"69", x"6c", x"65", x"54", x"69", x"6d", x"65", x"20", x"20", x"84",                      x"83",                     x"0a", 
-      x"54", x"69", x"6d", x"65", x"20", x"20", x"20", x"20", x"20", x"20", x"20", x"20", x"20", x"82",                      x"81",                     x"0a",
-      others => x"00");
-
-
     type hub_mii_t is array(0 to 3) of integer;    
     type hub_ct    is array(0 to 16) of integer;
     type hub_cfg_t is array(0 to 3) of hub_ct;    
@@ -207,10 +192,10 @@ function generateIncludedFeatures return std_logic_vector is
     t(26 downto 24) := std_logic_vector(to_unsigned(SFP_NUM_ARR(CFG_MODE),3)); --num SFPs with TrbNet
     t(28 downto 28) := std_logic_vector(to_unsigned(USE_BACKPLANE,1));
     t(39 downto 39) := std_logic_vector(to_unsigned(1,1)); --contains CTS
-    t(40 downto 40) := std_logic_vector(to_unsigned(INCLUDE_LCD,1));
     t(42 downto 42) := std_logic_vector(to_unsigned(INCLUDE_SPI,1));
     t(43 downto 43) := std_logic_vector(to_unsigned(INCLUDE_UART,1));
     t(44 downto 44) := std_logic_vector(to_unsigned(INCLUDE_STATISTICS,1));
+    t(47 downto 47) := std_logic_vector(to_unsigned(INCLUDE_I2C,1));
     t(51 downto 48) := std_logic_vector(to_unsigned(INCLUDE_TRIGGER_LOGIC,4));
     t(52 downto 52) := std_logic_vector(to_unsigned(USE_120_MHZ,1));
     t(53 downto 53) := std_logic_vector(to_unsigned(USE_RXCLOCK,1));

diff --git a/cts/config_backplane_KEL.vhd b/cts/config_backplane_KEL.vhd
index 0aa60a79de160d0d868ce97387cd359925885081..527fa797d40197b5f6c5671d0f4cae624d5c630b 100644 (file)
--- a/cts/config_backplane_KEL.vhd
+++ b/cts/config_backplane_KEL.vhd
@@ -34,7 +34,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_I2C            : integer  := c_NO;
     constant INCLUDE_DEBUG_INTERFACE: integer  := c_YES;
 
     --input monitor and trigger generation logic
@@ -89,20 +89,6 @@ package config is
 --End of design configuration
 ------------------------------------------------------------------------------
 
-  type data_t is array (0 to 1023) of std_logic_vector(7 downto 0);
-  constant LCD_DATA : data_t := (
-      x"36",x"48",x"3A",x"55",x"29",x"2A",x"00",x"00", --config don't touch
-      x"00",x"EF",x"2B",x"00",x"00",x"01",x"3F",x"2C", --config don't touch
-      x"00",x"00",x"00",x"00",x"00",x"00",x"00",x"00", --config don't touch
-      x"00",x"00",x"00",x"00",x"00",x"00",x"00",x"00", --config don't touch
-      
-      x"48", x"75", x"62", x"41", x"64", x"64", x"4f", x"6e", x"0a",
-      x"0a",
-      x"41", x"64", x"64", x"72", x"65", x"73", x"73", x"20", x"20", x"20", x"20", x"20", x"20", x"20", x"20", x"20", x"20", x"80",                     x"0a",                            
-      x"43", x"6f", x"6d", x"70", x"69", x"6c", x"65", x"54", x"69", x"6d", x"65", x"20", x"20", x"84",                      x"83",                     x"0a", 
-      x"54", x"69", x"6d", x"65", x"20", x"20", x"20", x"20", x"20", x"20", x"20", x"20", x"20", x"82",                      x"81",                     x"0a",
-      others => x"00");
-
 
     type hub_mii_t is array(0 to 3) of integer;    
     type hub_ct    is array(0 to 16) of integer;
@@ -208,6 +194,7 @@ function generateIncludedFeatures return std_logic_vector is
     t(42 downto 42) := std_logic_vector(to_unsigned(INCLUDE_SPI,1));
     t(43 downto 43) := std_logic_vector(to_unsigned(INCLUDE_UART,1));
     t(44 downto 44) := std_logic_vector(to_unsigned(INCLUDE_STATISTICS,1));
+    t(47 downto 47) := std_logic_vector(to_unsigned(INCLUDE_I2C,1));
     t(51 downto 48) := std_logic_vector(to_unsigned(INCLUDE_TRIGGER_LOGIC,4));
     t(52 downto 52) := std_logic_vector(to_unsigned(USE_120_MHZ,1));
     t(53 downto 53) := std_logic_vector(to_unsigned(USE_RXCLOCK,1));

diff --git a/halfmasterhub/config.vhd b/halfmasterhub/config.vhd
index cbe747c22c43a0a6791068b0baee08f161c7bc4a..4c2e77b2aef0a01b78b67d45a9940e71329d9ed8 100644 (file)
--- a/halfmasterhub/config.vhd
+++ b/halfmasterhub/config.vhd
@@ -30,7 +30,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_I2C            : integer  := c_NO;
     constant INCLUDE_DEBUG_INTERFACE: integer  := c_YES;
     
     --input monitor and trigger generation logic
@@ -128,10 +128,10 @@ function generateIncludedFeatures return std_logic_vector is
     t(23 downto 23) := std_logic_vector(to_unsigned(INCLUDE_GBE,1));
     t(28 downto 28) := std_logic_vector(to_unsigned(1,1));
     t(27 downto 24) := std_logic_vector(to_unsigned(2-INCLUDE_GBE,4)); --num SFPs with TrbNet
-    t(40 downto 40) := std_logic_vector(to_unsigned(INCLUDE_LCD,1));
     t(42 downto 42) := std_logic_vector(to_unsigned(INCLUDE_SPI,1));
     t(43 downto 43) := std_logic_vector(to_unsigned(INCLUDE_UART,1));
     t(44 downto 44) := std_logic_vector(to_unsigned(INCLUDE_STATISTICS,1));
+    t(47 downto 47) := std_logic_vector(to_unsigned(INCLUDE_I2C,1));
     t(51 downto 48) := std_logic_vector(to_unsigned(INCLUDE_TRIGGER_LOGIC,4));
     t(52 downto 52) := std_logic_vector(to_unsigned(USE_120_MHZ,1));
     t(53 downto 53) := std_logic_vector(to_unsigned(USE_RXCLOCK,1));

diff --git a/hub/config.vhd b/hub/config.vhd
index fefb3d28f890161d608351000fa911bdc345691c..93fa61d8b1137eada9c547850e51c8fb01c37ffe 100644 (file)
--- a/hub/config.vhd
+++ b/hub/config.vhd
@@ -34,7 +34,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_I2C            : integer  := c_NO;
     constant INCLUDE_DEBUG_INTERFACE: integer  := c_NO;
 
     --input monitor and trigger generation logic
@@ -48,20 +48,6 @@ package config is
 --End of design configuration
 ------------------------------------------------------------------------------
 
-  type data_t is array (0 to 1023) of std_logic_vector(7 downto 0);
-  constant LCD_DATA : data_t := (
-      x"36",x"48",x"3A",x"55",x"29",x"2A",x"00",x"00", --config don't touch
-      x"00",x"EF",x"2B",x"00",x"00",x"01",x"3F",x"2C", --config don't touch
-      x"00",x"00",x"00",x"00",x"00",x"00",x"00",x"00", --config don't touch
-      x"00",x"00",x"00",x"00",x"00",x"00",x"00",x"00", --config don't touch
-      
-      x"48", x"75", x"62", x"41", x"64", x"64", x"4f", x"6e", x"0a",
-      x"0a",
-      x"41", x"64", x"64", x"72", x"65", x"73", x"73", x"20", x"20", x"20", x"20", x"20", x"20", x"20", x"20", x"20", x"20", x"80",                     x"0a",                            
-      x"43", x"6f", x"6d", x"70", x"69", x"6c", x"65", x"54", x"69", x"6d", x"65", x"20", x"20", x"84",                      x"83",                     x"0a", 
-      x"54", x"69", x"6d", x"65", x"20", x"20", x"20", x"20", x"20", x"20", x"20", x"20", x"20", x"82",                      x"81",                     x"0a",
-      others => x"00");
-
 
 
 --With GbE:
@@ -149,10 +135,10 @@ function generateIncludedFeatures return std_logic_vector is
     t(23 downto 23) := std_logic_vector(to_unsigned(INCLUDE_GBE,1));
     t(27 downto 24) := std_logic_vector(to_unsigned(INTERFACE_NUM-USE_BACKPLANE,4)); --num SFPs with TrbNet
     t(28 downto 28) := std_logic_vector(to_unsigned(USE_BACKPLANE,1));
-    t(40 downto 40) := std_logic_vector(to_unsigned(INCLUDE_LCD,1));
     t(42 downto 42) := std_logic_vector(to_unsigned(INCLUDE_SPI,1));
     t(43 downto 43) := std_logic_vector(to_unsigned(INCLUDE_UART,1));
     t(44 downto 44) := std_logic_vector(to_unsigned(INCLUDE_STATISTICS,1));
+    t(47 downto 47) := std_logic_vector(to_unsigned(INCLUDE_I2C,1));
     t(51 downto 48) := std_logic_vector(to_unsigned(INCLUDE_TRIGGER_LOGIC,4));
     t(52 downto 52) := std_logic_vector(to_unsigned(USE_120_MHZ,1));
     t(53 downto 53) := std_logic_vector(to_unsigned(USE_RXCLOCK,1));

diff --git a/shutdownlogic/config.vhd b/shutdownlogic/config.vhd
index d6d02f849bf7f49f5be8af3a1b9e1bcd3bbac1c1..246f612bf53799d88f42168a1f7fb981874a6bd0 100644 (file)
--- a/shutdownlogic/config.vhd
+++ b/shutdownlogic/config.vhd
@@ -32,7 +32,7 @@ package config is
    
     constant INCLUDE_UART           : integer  := c_YES;
     constant INCLUDE_SPI            : integer  := c_YES;
-    constant INCLUDE_LCD            : integer  := c_NO;
+    constant INCLUDE_I2C            : integer  := c_NO;
     constant INCLUDE_DEBUG_INTERFACE: integer  := c_YES;
 
     --input monitor and trigger generation logic
@@ -47,21 +47,6 @@ package config is
 ------------------------------------------------------------------------------
 
 
-  type data_t is array (0 to 1023) of std_logic_vector(7 downto 0);
-  constant LCD_DATA : data_t := (
-      x"36",x"48",x"3A",x"55",x"29",x"2A",x"00",x"00", --config don't touch
-      x"00",x"EF",x"2B",x"00",x"00",x"01",x"3F",x"2C", --config don't touch
-      x"00",x"00",x"00",x"00",x"00",x"00",x"00",x"00", --config don't touch
-      x"00",x"00",x"00",x"00",x"00",x"00",x"00",x"00", --config don't touch
-      
-      x"54", x"72", x"62", x"33", x"73", x"63", x"0a",
-      x"0a",
-      x"41", x"64", x"64", x"72", x"65", x"73", x"73", x"20", x"20", x"20", x"20", x"20", x"20", x"20", x"20", x"20", x"20", x"80",                     x"0a",                            
-      x"55", x"49", x"44", x"20", x"20", x"89",                      x"88",                      x"87",                      x"86",                     x"0a", 
-      x"43", x"6f", x"6d", x"70", x"69", x"6c", x"65", x"54", x"69", x"6d", x"65", x"20", x"20", x"84",                      x"83",                     x"0a", 
-      x"54", x"69", x"6d", x"65", x"20", x"20", x"20", x"20", x"20", x"20", x"20", x"20", x"20", x"82",                      x"81",                     x"0a",
-      x"54", x"65", x"6d", x"70", x"65", x"72", x"61", x"74", x"75", x"72", x"65", x"20", x"20", x"20", x"20", x"20", x"20", x"85",                     x"0a",
-      others => x"00");
 
 ------------------------------------------------------------------------------
 --Select settings by configuration 
@@ -96,9 +81,9 @@ function generateIncludedFeatures return std_logic_vector is
     t               := (others => '0');
     t(63 downto 56) := std_logic_vector(to_unsigned(1,8)); --table version 1
     t(28 downto 28) := std_logic_vector(to_unsigned(3-SERDES_NUM,1));
-    t(40 downto 40) := std_logic_vector(to_unsigned(INCLUDE_LCD,1));
     t(42 downto 42) := std_logic_vector(to_unsigned(INCLUDE_SPI,1));
     t(43 downto 43) := std_logic_vector(to_unsigned(INCLUDE_UART,1));
+    t(47 downto 47) := std_logic_vector(to_unsigned(INCLUDE_I2C,1));
     t(52 downto 52) := std_logic_vector(to_unsigned(USE_120_MHZ,1));
     t(53 downto 53) := std_logic_vector(to_unsigned(USE_RXCLOCK,1));
     t(54 downto 54) := std_logic_vector(to_unsigned(USE_EXTERNAL_CLOCK,1));

diff --git a/tdctemplate/config_16_crate_ada_nino.vhd b/tdctemplate/config_16_crate_ada_nino.vhd
index 893498a05aaa4b067d3fd76e7866f7904c6b9df9..a196db7a75b598fee3bd2e5570b59e65cde03c48 100644 (file)
--- a/tdctemplate/config_16_crate_ada_nino.vhd
+++ b/tdctemplate/config_16_crate_ada_nino.vhd
@@ -57,7 +57,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_I2C            : integer  := c_NO;
     constant INCLUDE_DEBUG_INTERFACE: integer  := c_YES;    
    
     --input monitor and trigger generation logic
@@ -77,24 +77,6 @@ package config is
 --End of design configuration
 ------------------------------------------------------------------------------
 
-
-  type data_t is array (0 to 1023) of std_logic_vector(7 downto 0);
-  constant LCD_DATA : data_t := (
-      x"36",x"48",x"3A",x"55",x"29",x"2A",x"00",x"00", --config don't touch
-      x"00",x"EF",x"2B",x"00",x"00",x"01",x"3F",x"2C", --config don't touch
-      x"00",x"00",x"00",x"00",x"00",x"00",x"00",x"00", --config don't touch
-      x"00",x"00",x"00",x"00",x"00",x"00",x"00",x"00", --config don't touch
-      
-      x"54", x"72", x"62", x"33", x"73", x"63", x"0a",
-      x"0a",
-      x"41", x"64", x"64", x"72", x"65", x"73", x"73", x"20", x"20", x"20", x"20", x"20", x"20", x"20", x"20", x"20", x"20", x"80",                     x"0a",                            
-      x"43", x"6f", x"6d", x"70", x"69", x"6c", x"65", x"54", x"69", x"6d", x"65", x"20", x"20", x"84",                      x"83",                     x"0a", 
-      x"54", x"69", x"6d", x"65", x"20", x"20", x"20", x"20", x"20", x"20", x"20", x"20", x"20", x"82",                      x"81",                     x"0a",
-      x"85",x"0a",
-      x"86",x"0a",
-      x"87",x"0a",
-      others => x"00");
-
 ------------------------------------------------------------------------------
 --Select settings by configuration 
 ------------------------------------------------------------------------------
@@ -137,11 +119,11 @@ function generateIncludedFeatures return std_logic_vector is
     t(15)           := '1'; --TDC
     t(17 downto 16) := std_logic_vector(to_unsigned(NUM_TDC_MODULES-1,2));
     t(28 downto 28) := std_logic_vector(to_unsigned(3-SERDES_NUM,1));
-    t(40 downto 40) := std_logic_vector(to_unsigned(INCLUDE_LCD,1));
     t(42 downto 42) := std_logic_vector(to_unsigned(INCLUDE_SPI,1));
     t(43 downto 43) := std_logic_vector(to_unsigned(INCLUDE_UART,1));
     t(44 downto 44) := std_logic_vector(to_unsigned(INCLUDE_STATISTICS,1));
     t(45 downto 45) := std_logic_vector(to_unsigned(USE_GBE,1));
+    t(47 downto 47) := std_logic_vector(to_unsigned(INCLUDE_I2C,1));
     t(51 downto 48) := std_logic_vector(to_unsigned(INCLUDE_TRIGGER_LOGIC,4));
     t(52 downto 52) := std_logic_vector(to_unsigned(USE_120_MHZ,1));
     t(53 downto 53) := std_logic_vector(to_unsigned(USE_RXCLOCK,1));

diff --git a/tdctemplate/config_32_sfp_kel.vhd b/tdctemplate/config_32_sfp_kel.vhd
index bbe12ebd602e1f11366ae855bc675ffd1c0e9e61..e3e5de1a84ec81cd38f5e246865a29dc8555f543 100644 (file)
--- a/tdctemplate/config_32_sfp_kel.vhd
+++ b/tdctemplate/config_32_sfp_kel.vhd
@@ -57,7 +57,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_I2C            : integer  := c_NO;
     constant INCLUDE_DEBUG_INTERFACE: integer  := c_NO;    
    
     --input monitor and trigger generation logic
@@ -77,24 +77,6 @@ package config is
 --End of design configuration
 ------------------------------------------------------------------------------
 
-
-  type data_t is array (0 to 1023) of std_logic_vector(7 downto 0);
-  constant LCD_DATA : data_t := (
-      x"36",x"48",x"3A",x"55",x"29",x"2A",x"00",x"00", --config don't touch
-      x"00",x"EF",x"2B",x"00",x"00",x"01",x"3F",x"2C", --config don't touch
-      x"00",x"00",x"00",x"00",x"00",x"00",x"00",x"00", --config don't touch
-      x"00",x"00",x"00",x"00",x"00",x"00",x"00",x"00", --config don't touch
-      
-      x"54", x"72", x"62", x"33", x"73", x"63", x"0a",
-      x"0a",
-      x"41", x"64", x"64", x"72", x"65", x"73", x"73", x"20", x"20", x"20", x"20", x"20", x"20", x"20", x"20", x"20", x"20", x"80",                     x"0a",                            
-      x"43", x"6f", x"6d", x"70", x"69", x"6c", x"65", x"54", x"69", x"6d", x"65", x"20", x"20", x"84",                      x"83",                     x"0a", 
-      x"54", x"69", x"6d", x"65", x"20", x"20", x"20", x"20", x"20", x"20", x"20", x"20", x"20", x"82",                      x"81",                     x"0a",
-      x"85",x"0a",
-      x"86",x"0a",
-      x"87",x"0a",
-      others => x"00");
-
 ------------------------------------------------------------------------------
 --Select settings by configuration 
 ------------------------------------------------------------------------------
@@ -138,11 +120,11 @@ function generateIncludedFeatures return std_logic_vector is
     t(15)           := '1'; --TDC
     t(17 downto 16) := std_logic_vector(to_unsigned(NUM_TDC_MODULES-1,2));
     t(28 downto 28) := std_logic_vector(to_unsigned(3-SERDES_NUM,1));
-    t(40 downto 40) := std_logic_vector(to_unsigned(INCLUDE_LCD,1));
     t(42 downto 42) := std_logic_vector(to_unsigned(INCLUDE_SPI,1));
     t(43 downto 43) := std_logic_vector(to_unsigned(INCLUDE_UART,1));
     t(44 downto 44) := std_logic_vector(to_unsigned(INCLUDE_STATISTICS,1));
     t(45 downto 45) := std_logic_vector(to_unsigned(USE_GBE,1));
+    t(47 downto 47) := std_logic_vector(to_unsigned(INCLUDE_I2C,1));
     t(51 downto 48) := std_logic_vector(to_unsigned(INCLUDE_TRIGGER_LOGIC,4));
     t(52 downto 52) := std_logic_vector(to_unsigned(USE_120_MHZ,1));
     t(53 downto 53) := std_logic_vector(to_unsigned(USE_RXCLOCK,1));

diff --git a/tdctemplate/config_32_sfp_kel_cal200.vhd b/tdctemplate/config_32_sfp_kel_cal200.vhd
index 9e3e8357da16766da935fbccba1efb2225709f0d..41e16daf2c04641c7e59339207cc3df809ff7cb9 100644 (file)
--- a/tdctemplate/config_32_sfp_kel_cal200.vhd
+++ b/tdctemplate/config_32_sfp_kel_cal200.vhd
@@ -57,7 +57,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_I2C            : integer  := c_NO;
     constant INCLUDE_DEBUG_INTERFACE: integer  := c_YES;    
    
     --input monitor and trigger generation logic
@@ -77,24 +77,6 @@ package config is
 --End of design configuration
 ------------------------------------------------------------------------------
 
-
-  type data_t is array (0 to 1023) of std_logic_vector(7 downto 0);
-  constant LCD_DATA : data_t := (
-      x"36",x"48",x"3A",x"55",x"29",x"2A",x"00",x"00", --config don't touch
-      x"00",x"EF",x"2B",x"00",x"00",x"01",x"3F",x"2C", --config don't touch
-      x"00",x"00",x"00",x"00",x"00",x"00",x"00",x"00", --config don't touch
-      x"00",x"00",x"00",x"00",x"00",x"00",x"00",x"00", --config don't touch
-      
-      x"54", x"72", x"62", x"33", x"73", x"63", x"0a",
-      x"0a",
-      x"41", x"64", x"64", x"72", x"65", x"73", x"73", x"20", x"20", x"20", x"20", x"20", x"20", x"20", x"20", x"20", x"20", x"80",                     x"0a",                            
-      x"43", x"6f", x"6d", x"70", x"69", x"6c", x"65", x"54", x"69", x"6d", x"65", x"20", x"20", x"84",                      x"83",                     x"0a", 
-      x"54", x"69", x"6d", x"65", x"20", x"20", x"20", x"20", x"20", x"20", x"20", x"20", x"20", x"82",                      x"81",                     x"0a",
-      x"85",x"0a",
-      x"86",x"0a",
-      x"87",x"0a",
-      others => x"00");
-
 ------------------------------------------------------------------------------
 --Select settings by configuration 
 ------------------------------------------------------------------------------
@@ -138,11 +120,11 @@ function generateIncludedFeatures return std_logic_vector is
     t(15)           := '1'; --TDC
     t(17 downto 16) := std_logic_vector(to_unsigned(NUM_TDC_MODULES-1,2));
     t(28 downto 28) := std_logic_vector(to_unsigned(3-SERDES_NUM,1));
-    t(40 downto 40) := std_logic_vector(to_unsigned(INCLUDE_LCD,1));
     t(42 downto 42) := std_logic_vector(to_unsigned(INCLUDE_SPI,1));
     t(43 downto 43) := std_logic_vector(to_unsigned(INCLUDE_UART,1));
     t(44 downto 44) := std_logic_vector(to_unsigned(INCLUDE_STATISTICS,1));
     t(45 downto 45) := std_logic_vector(to_unsigned(USE_GBE,1));
+    t(47 downto 47) := std_logic_vector(to_unsigned(INCLUDE_I2C,1));
     t(51 downto 48) := std_logic_vector(to_unsigned(INCLUDE_TRIGGER_LOGIC,4));
     t(52 downto 52) := std_logic_vector(to_unsigned(USE_120_MHZ,1));
     t(53 downto 53) := std_logic_vector(to_unsigned(USE_RXCLOCK,1));

diff --git a/template/config.vhd b/template/config.vhd
index c67270a07119a8b8a5861fc42c0552b1a48f97dd..c2a9e5cce5f0f33ac2c7236b2710529c36d3af23 100644 (file)
--- a/template/config.vhd
+++ b/template/config.vhd
@@ -33,7 +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_I2C            : integer  := c_NO;
     constant INCLUDE_DEBUG_INTERFACE: integer  := c_YES;
 
     --input monitor and trigger generation logic
@@ -50,22 +50,6 @@ package config is
 ------------------------------------------------------------------------------
 
 
-  type data_t is array (0 to 1023) of std_logic_vector(7 downto 0);
-  constant LCD_DATA : data_t := (
-      x"36",x"48",x"3A",x"55",x"29",x"2A",x"00",x"00", --config don't touch
-      x"00",x"EF",x"2B",x"00",x"00",x"01",x"3F",x"2C", --config don't touch
-      x"00",x"00",x"00",x"00",x"00",x"00",x"00",x"00", --config don't touch
-      x"00",x"00",x"00",x"00",x"00",x"00",x"00",x"00", --config don't touch
-      
-      x"54", x"72", x"62", x"33", x"73", x"63", x"0a",
-      x"0a",
-      x"41", x"64", x"64", x"72", x"65", x"73", x"73", x"20", x"20", x"20", x"20", x"20", x"20", x"20", x"20", x"20", x"20", x"80",                     x"0a",                            
-      x"55", x"49", x"44", x"20", x"20", x"89",                      x"88",                      x"87",                      x"86",                     x"0a", 
-      x"43", x"6f", x"6d", x"70", x"69", x"6c", x"65", x"54", x"69", x"6d", x"65", x"20", x"20", x"84",                      x"83",                     x"0a", 
-      x"54", x"69", x"6d", x"65", x"20", x"20", x"20", x"20", x"20", x"20", x"20", x"20", x"20", x"82",                      x"81",                     x"0a",
-      x"54", x"65", x"6d", x"70", x"65", x"72", x"61", x"74", x"75", x"72", x"65", x"20", x"20", x"20", x"20", x"20", x"20", x"85",                     x"0a",
-      others => x"00");
-
 ------------------------------------------------------------------------------
 --Select settings by configuration 
 ------------------------------------------------------------------------------
@@ -99,10 +83,10 @@ function generateIncludedFeatures return std_logic_vector is
     t               := (others => '0');
     t(63 downto 56) := std_logic_vector(to_unsigned(1,8)); --table version 1
     t(28 downto 28) := std_logic_vector(to_unsigned(3-SERDES_NUM,1));
-    t(40 downto 40) := std_logic_vector(to_unsigned(INCLUDE_LCD,1));
     t(42 downto 42) := std_logic_vector(to_unsigned(INCLUDE_SPI,1));
     t(43 downto 43) := std_logic_vector(to_unsigned(INCLUDE_UART,1));
     t(45 downto 45) := std_logic_vector(to_unsigned(USE_GBE,1));
+    t(47 downto 47) := std_logic_vector(to_unsigned(INCLUDE_I2C,1));
     t(52 downto 52) := std_logic_vector(to_unsigned(USE_120_MHZ,1));
     t(53 downto 53) := std_logic_vector(to_unsigned(USE_RXCLOCK,1));
     t(54 downto 54) := std_logic_vector(to_unsigned(USE_EXTERNAL_CLOCK,1));

diff --git a/triggerbox/config.vhd b/triggerbox/config.vhd
index a659169b16a5462805a8126f2a966fd37bdfd08e..c4a6864128a37577a6ad2d257a150394d80226c3 100644 (file)
--- a/triggerbox/config.vhd
+++ b/triggerbox/config.vhd
@@ -33,7 +33,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_I2C            : integer  := c_NO;
     constant INCLUDE_DEBUG_INTERFACE: integer  := c_NO;
 
     --input monitor and trigger generation logic
@@ -49,23 +49,6 @@ package config is
 --End of design configuration
 ------------------------------------------------------------------------------
 
-
-  type data_t is array (0 to 1023) of std_logic_vector(7 downto 0);
-  constant LCD_DATA : data_t := (
-      x"36",x"48",x"3A",x"55",x"29",x"2A",x"00",x"00", --config don't touch
-      x"00",x"EF",x"2B",x"00",x"00",x"01",x"3F",x"2C", --config don't touch
-      x"00",x"00",x"00",x"00",x"00",x"00",x"00",x"00", --config don't touch
-      x"00",x"00",x"00",x"00",x"00",x"00",x"00",x"00", --config don't touch
-      
-      x"54", x"72", x"62", x"33", x"73", x"63", x"0a",
-      x"0a",
-      x"41", x"64", x"64", x"72", x"65", x"73", x"73", x"20", x"20", x"20", x"20", x"20", x"20", x"20", x"20", x"20", x"20", x"80",                     x"0a",                            
-      x"55", x"49", x"44", x"20", x"20", x"89",                      x"88",                      x"87",                      x"86",                     x"0a", 
-      x"43", x"6f", x"6d", x"70", x"69", x"6c", x"65", x"54", x"69", x"6d", x"65", x"20", x"20", x"84",                      x"83",                     x"0a", 
-      x"54", x"69", x"6d", x"65", x"20", x"20", x"20", x"20", x"20", x"20", x"20", x"20", x"20", x"82",                      x"81",                     x"0a",
-      x"54", x"65", x"6d", x"70", x"65", x"72", x"61", x"74", x"75", x"72", x"65", x"20", x"20", x"20", x"20", x"20", x"20", x"85",                     x"0a",
-      others => x"00");
-
 ------------------------------------------------------------------------------
 --Select settings by configuration 
 ------------------------------------------------------------------------------
@@ -99,10 +82,10 @@ function generateIncludedFeatures return std_logic_vector is
     t               := (others => '0');
     t(63 downto 56) := std_logic_vector(to_unsigned(1,8)); --table version 1
     t(28 downto 28) := std_logic_vector(to_unsigned(3-SERDES_NUM,1));
-    t(40 downto 40) := std_logic_vector(to_unsigned(INCLUDE_LCD,1));
     t(42 downto 42) := std_logic_vector(to_unsigned(INCLUDE_SPI,1));
     t(43 downto 43) := std_logic_vector(to_unsigned(INCLUDE_UART,1));
     t(45 downto 45) := std_logic_vector(to_unsigned(USE_GBE,1));
+    t(47 downto 47) := std_logic_vector(to_unsigned(INCLUDE_I2C,1));
     t(52 downto 52) := std_logic_vector(to_unsigned(USE_120_MHZ,1));
     t(53 downto 53) := std_logic_vector(to_unsigned(USE_RXCLOCK,1));
     t(54 downto 54) := std_logic_vector(to_unsigned(USE_EXTERNAL_CLOCK,1));