update config files, add I2C to IncludedFeatures

diff --git a/gbe_standalone/config.vhd b/gbe_standalone/config.vhd
index 381e7d9b0b8b0e444ceeb49fdf84648505adce0b..78fc9605d7342261dc9d66b10d90ff20636d63ce 100644 (file)
--- a/gbe_standalone/config.vhd
+++ b/gbe_standalone/config.vhd
@@ -47,15 +47,15 @@ package config is
     constant INIT_ADDRESS           : std_logic_vector := x"F570";
     constant BROADCAST_SPECIAL_ADDR : std_logic_vector;
    
-    constant INCLUDE_UART           : integer  := c_YES;  --300 slices
-    constant INCLUDE_SPI            : integer  := c_YES; --300 slices
+    constant INCLUDE_UART           : integer  := c_YES;
+    constant INCLUDE_SPI            : integer  := c_YES;
     constant INCLUDE_ADC            : integer  := c_YES;
-    constant INCLUDE_LCD            : integer  := c_NO;  --800 slices
-    constant INCLUDE_DEBUG_INTERFACE: integer  := c_NO; --300 slices
+    constant INCLUDE_I2C            : integer  := c_NO;
+    constant INCLUDE_DEBUG_INTERFACE: integer  := c_NO;
 
     --input monitor and trigger generation logic
-    constant INCLUDE_TRIGGER_LOGIC  : integer  := c_YES; --400 slices @32->2
-    constant INCLUDE_STATISTICS     : integer  := c_NO; --1300 slices, 1 RAM @32
+    constant INCLUDE_TRIGGER_LOGIC  : integer  := c_YES;
+    constant INCLUDE_STATISTICS     : integer  := c_NO;
     constant TRIG_GEN_INPUT_NUM     : integer  := 32;
     constant TRIG_GEN_OUTPUT_NUM    : integer  := 4;
     constant MONITOR_INPUT_NUM      : integer  := 32;        
@@ -66,10 +66,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 := (others => x"00");
-
 ------------------------------------------------------------------------------
 --Select settings by configuration 
 ------------------------------------------------------------------------------
@@ -115,6 +111,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/mimosis/config.vhd b/mimosis/config.vhd
index 376e941afb9bdb802309b563c2f00f3a079e1e98..55941eb16517c2255250e557a24fef5ae9c54eed 100644 (file)
--- a/mimosis/config.vhd
+++ b/mimosis/config.vhd
@@ -49,16 +49,15 @@ package config is
     constant INIT_ADDRESS           : std_logic_vector := x"F575";
     constant BROADCAST_SPECIAL_ADDR : std_logic_vector := x"82";
    
-    constant INCLUDE_UART           : integer  := c_NO;  --300 slices
-    constant INCLUDE_SPI            : integer  := c_NO; --300 slices
+    constant INCLUDE_UART           : integer  := c_NO;
+    constant INCLUDE_SPI            : integer  := c_NO;
     constant INCLUDE_ADC            : integer  := c_YES; 
-    constant INCLUDE_LCD            : integer  := c_NO;  --800 slices
     constant INCLUDE_I2C            : integer  := c_YES;
-    constant INCLUDE_DEBUG_INTERFACE: integer  := c_NO; --300 slices
+    constant INCLUDE_DEBUG_INTERFACE: integer  := c_NO;
 
     --input monitor and trigger generation logic
-    constant INCLUDE_TRIGGER_LOGIC  : integer  := c_NO; --400 slices @32->2
-    constant INCLUDE_STATISTICS     : integer  := c_NO; --1300 slices, 1 RAM @32
+    constant INCLUDE_TRIGGER_LOGIC  : integer  := c_NO;
+    constant INCLUDE_STATISTICS     : integer  := c_NO;
     constant TRIG_GEN_INPUT_NUM     : integer  := 32;
     constant TRIG_GEN_OUTPUT_NUM    : integer  := 4;
     constant MONITOR_INPUT_NUM      : integer  := 32;        
@@ -67,10 +66,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 := (others => x"00");
-
 ------------------------------------------------------------------------------
 --Select settings by configuration 
 ------------------------------------------------------------------------------
@@ -115,6 +110,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/template/config.vhd b/template/config.vhd
index 1973faf5e08a368611b8ab35db97b2a2f3e9dd1a..08a45eb273d285dd87b20f5c65ed46d1a9801650 100644 (file)
--- a/template/config.vhd
+++ b/template/config.vhd
@@ -12,7 +12,7 @@ package config is
 
 
 --set to 0 for backplane serdes, set to 1 for SFP serdes
-    constant SERDES_NUM             : integer := 1;
+    constant SERDES_NUM             : integer := 0;
 
 --TDC settings
   constant FPGA_TYPE               : integer  := 5;  --3: ECP3, 5: ECP5
@@ -47,15 +47,15 @@ package config is
     constant INIT_ADDRESS           : std_logic_vector := x"F570";
     constant BROADCAST_SPECIAL_ADDR : std_logic_vector;
    
-    constant INCLUDE_UART           : integer  := c_YES;  --300 slices
-    constant INCLUDE_SPI            : integer  := c_YES; --300 slices
-    constant INCLUDE_ADC            : integer  := c_YES;
-    constant INCLUDE_LCD            : integer  := c_NO;  --800 slices
-    constant INCLUDE_DEBUG_INTERFACE: integer  := c_NO; --300 slices
+    constant INCLUDE_UART           : integer  := c_NO;
+    constant INCLUDE_SPI            : integer  := c_YES;
+    constant INCLUDE_ADC            : integer  := c_NO;
+    constant USE_I2C                : integer  := c_NO;
+    constant INCLUDE_DEBUG_INTERFACE: integer  := c_NO;
 
     --input monitor and trigger generation logic
-    constant INCLUDE_TRIGGER_LOGIC  : integer  := c_YES; --400 slices @32->2
-    constant INCLUDE_STATISTICS     : integer  := c_NO; --1300 slices, 1 RAM @32
+    constant INCLUDE_TRIGGER_LOGIC  : integer  := c_YES;
+    constant INCLUDE_STATISTICS     : integer  := c_YES; 
     constant TRIG_GEN_INPUT_NUM     : integer  := 32;
     constant TRIG_GEN_OUTPUT_NUM    : integer  := 4;
     constant MONITOR_INPUT_NUM      : integer  := 32;        
@@ -115,6 +115,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));