Skip to content
Snippets Groups Projects
Commit 7ee7b4a0 authored by Kenneth Hiemstra's avatar Kenneth Hiemstra
Browse files

revision work

parent d6d68158
No related branches found
No related tags found
No related merge requests found
Show whitespace changes
Inline Side-by-side
Showing
with 193 additions and 186 deletions
boards/uniboard1/designs/unb1_test/revisions/unb1_test_1GbE/hdllib.cfg
+ 1
− 1
View file @ 7ee7b4a0
...@@ -30,7 +30,7 @@ quartus_tcl_files = ...@@ -30,7 +30,7 @@ quartus_tcl_files =
quartus_vhdl_files = quartus_vhdl_files =
quartus_qip_files = quartus_qip_files =
$HDL_BUILD_DIR/unb1/quartus/unb1_test_10GbE/qsys_unb1_test/synthesis/qsys_unb1_test.qip $HDL_BUILD_DIR/unb1/quartus/unb1_test_1GbE/qsys_unb1_test/synthesis/qsys_unb1_test.qip
$RADIOHDL/libraries/technology/ip_stratixiv/ddr3_uphy_4g_800_master/generated/ip_stratixiv_ddr3_uphy_4g_800_master.qip $RADIOHDL/libraries/technology/ip_stratixiv/ddr3_uphy_4g_800_master/generated/ip_stratixiv_ddr3_uphy_4g_800_master.qip
#$RADIOHDL/libraries/technology/ip_stratixiv/ddr3_uphy_4g_800_slave/generated/ip_stratixiv_ddr3_uphy_4g_800_slave.qip #$RADIOHDL/libraries/technology/ip_stratixiv/ddr3_uphy_4g_800_slave/generated/ip_stratixiv_ddr3_uphy_4g_800_slave.qip
......
boards/uniboard1/designs/unb1_test/revisions/unb1_test_all/hdllib.cfg
+ 1
− 1
View file @ 7ee7b4a0
...@@ -30,7 +30,7 @@ quartus_tcl_files = ...@@ -30,7 +30,7 @@ quartus_tcl_files =
quartus_vhdl_files = quartus_vhdl_files =
quartus_qip_files = quartus_qip_files =
$HDL_BUILD_DIR/unb1/quartus/unb1_test_10GbE/qsys_unb1_test/synthesis/qsys_unb1_test.qip $HDL_BUILD_DIR/unb1/quartus/unb1_test_all/qsys_unb1_test/synthesis/qsys_unb1_test.qip
$RADIOHDL/libraries/technology/ip_stratixiv/ddr3_uphy_4g_800_master/generated/ip_stratixiv_ddr3_uphy_4g_800_master.qip $RADIOHDL/libraries/technology/ip_stratixiv/ddr3_uphy_4g_800_master/generated/ip_stratixiv_ddr3_uphy_4g_800_master.qip
#$RADIOHDL/libraries/technology/ip_stratixiv/ddr3_uphy_4g_800_slave/generated/ip_stratixiv_ddr3_uphy_4g_800_slave.qip #$RADIOHDL/libraries/technology/ip_stratixiv/ddr3_uphy_4g_800_slave/generated/ip_stratixiv_ddr3_uphy_4g_800_slave.qip
......
boards/uniboard1/designs/unb1_test/revisions/unb1_test_all/unb1_test_all.vhd
+ 1
− 4
View file @ 7ee7b4a0
...@@ -36,10 +36,7 @@ ENTITY unb1_test_all IS ...@@ -36,10 +36,7 @@ ENTITY unb1_test_all IS
g_sim_node_nr : NATURAL := 0; -- FN0 g_sim_node_nr : NATURAL := 0; -- FN0
g_stamp_date : NATURAL := 0; -- Date (YYYYMMDD) -- set by QSF g_stamp_date : NATURAL := 0; -- Date (YYYYMMDD) -- set by QSF
g_stamp_time : NATURAL := 0; -- Time (HHMMSS) -- set by QSF g_stamp_time : NATURAL := 0; -- Time (HHMMSS) -- set by QSF
g_stamp_svn : NATURAL := 0; -- SVN revision -- set by QSF g_stamp_svn : NATURAL := 0 -- SVN revision -- set by QSF
g_nof_MB : NATURAL := c_unb1_board_nof_ddr3; -- Fixed control infrastructure for 2 modules per FPGA
g_use_MB_I : NATURAL := 0; -- 1: use MB_I 0: do not use
g_use_MB_II : NATURAL := 0
); );
PORT ( PORT (
-- GENERAL -- GENERAL
......
boards/uniboard1/designs/unb1_test/revisions/unb1_test_ddr/hdllib.cfg
+ 1
− 1
View file @ 7ee7b4a0
...@@ -30,7 +30,7 @@ quartus_tcl_files = ...@@ -30,7 +30,7 @@ quartus_tcl_files =
quartus_vhdl_files = quartus_vhdl_files =
quartus_qip_files = quartus_qip_files =
$HDL_BUILD_DIR/unb1/quartus/unb1_test_10GbE/qsys_unb1_test/synthesis/qsys_unb1_test.qip $HDL_BUILD_DIR/unb1/quartus/unb1_test_ddr/qsys_unb1_test/synthesis/qsys_unb1_test.qip
$RADIOHDL/libraries/technology/ip_stratixiv/ddr3_uphy_4g_800_master/generated/ip_stratixiv_ddr3_uphy_4g_800_master.qip $RADIOHDL/libraries/technology/ip_stratixiv/ddr3_uphy_4g_800_master/generated/ip_stratixiv_ddr3_uphy_4g_800_master.qip
#$RADIOHDL/libraries/technology/ip_stratixiv/ddr3_uphy_4g_800_slave/generated/ip_stratixiv_ddr3_uphy_4g_800_slave.qip #$RADIOHDL/libraries/technology/ip_stratixiv/ddr3_uphy_4g_800_slave/generated/ip_stratixiv_ddr3_uphy_4g_800_slave.qip
......
boards/uniboard1/designs/unb1_test/revisions/unb1_test_ddr/unb1_test_ddr.vhd
+ 1
− 4
View file @ 7ee7b4a0
...@@ -36,10 +36,7 @@ ENTITY unb1_test_ddr IS ...@@ -36,10 +36,7 @@ ENTITY unb1_test_ddr IS
g_sim_node_nr : NATURAL := 0; -- FN0 g_sim_node_nr : NATURAL := 0; -- FN0
g_stamp_date : NATURAL := 0; -- Date (YYYYMMDD) -- set by QSF g_stamp_date : NATURAL := 0; -- Date (YYYYMMDD) -- set by QSF
g_stamp_time : NATURAL := 0; -- Time (HHMMSS) -- set by QSF g_stamp_time : NATURAL := 0; -- Time (HHMMSS) -- set by QSF
g_stamp_svn : NATURAL := 0; -- SVN revision -- set by QSF g_stamp_svn : NATURAL := 0 -- SVN revision -- set by QSF
g_nof_MB : NATURAL := c_unb1_board_nof_ddr3; -- Fixed control infrastructure for 2 modules per FPGA
g_use_MB_I : NATURAL := 0; -- 1: use MB_I 0: do not use
g_use_MB_II : NATURAL := 0
); );
PORT ( PORT (
-- GENERAL -- GENERAL
......
boards/uniboard1/designs/unb1_test/src/vhdl/unb1_test.vhd
+ 188
− 175
View file @ 7ee7b4a0
...@@ -48,10 +48,7 @@ ENTITY unb1_test IS ...@@ -48,10 +48,7 @@ ENTITY unb1_test IS
g_technology : NATURAL := c_tech_stratixiv; g_technology : NATURAL := c_tech_stratixiv;
g_stamp_date : NATURAL := 0; -- Date (YYYYMMDD) -- set by QSF g_stamp_date : NATURAL := 0; -- Date (YYYYMMDD) -- set by QSF
g_stamp_time : NATURAL := 0; -- Time (HHMMSS) -- set by QSF g_stamp_time : NATURAL := 0; -- Time (HHMMSS) -- set by QSF
g_stamp_svn : NATURAL := 0; -- SVN revision -- set by QSF g_stamp_svn : NATURAL := 0 -- SVN revision -- set by QSF
g_nof_MB : NATURAL := c_unb1_board_nof_ddr3; -- Fixed control infrastructure for 2 modules per FPGA
g_use_MB_I : NATURAL := 1; -- 1: use MB_I 0: do not use
g_use_MB_II : NATURAL := 0
); );
PORT ( PORT (
-- GENERAL -- GENERAL
...@@ -76,17 +73,17 @@ ENTITY unb1_test IS ...@@ -76,17 +73,17 @@ ENTITY unb1_test IS
ETH_SGOUT : OUT STD_LOGIC; ETH_SGOUT : OUT STD_LOGIC;
-- Transceiver clocks -- Transceiver clocks
SA_CLK : IN STD_LOGIC; -- SerDes Clock BN-BI / SI_FN SA_CLK : IN STD_LOGIC := '0'; -- SerDes Clock BN-BI / SI_FN
-- Serial I/O -- Serial I/O
SI_FN_0_TX : OUT STD_LOGIC_VECTOR(c_unb1_board_ci.tr.bus_w-1 DOWNTO 0); SI_FN_0_TX : OUT STD_LOGIC_VECTOR(c_unb1_board_ci.tr.bus_w-1 DOWNTO 0);
SI_FN_0_RX : IN STD_LOGIC_VECTOR(c_unb1_board_ci.tr.bus_w-1 DOWNTO 0); SI_FN_0_RX : IN STD_LOGIC_VECTOR(c_unb1_board_ci.tr.bus_w-1 DOWNTO 0) := (OTHERS=>'0');
SI_FN_1_TX : OUT STD_LOGIC_VECTOR(c_unb1_board_ci.tr.bus_w-1 DOWNTO 0); SI_FN_1_TX : OUT STD_LOGIC_VECTOR(c_unb1_board_ci.tr.bus_w-1 DOWNTO 0);
SI_FN_1_RX : IN STD_LOGIC_VECTOR(c_unb1_board_ci.tr.bus_w-1 DOWNTO 0); SI_FN_1_RX : IN STD_LOGIC_VECTOR(c_unb1_board_ci.tr.bus_w-1 DOWNTO 0) := (OTHERS=>'0');
SI_FN_2_TX : OUT STD_LOGIC_VECTOR(c_unb1_board_ci.tr.bus_w-1 DOWNTO 0); SI_FN_2_TX : OUT STD_LOGIC_VECTOR(c_unb1_board_ci.tr.bus_w-1 DOWNTO 0);
SI_FN_2_RX : IN STD_LOGIC_VECTOR(c_unb1_board_ci.tr.bus_w-1 DOWNTO 0); SI_FN_2_RX : IN STD_LOGIC_VECTOR(c_unb1_board_ci.tr.bus_w-1 DOWNTO 0) := (OTHERS=>'0');
SI_FN_3_TX : OUT STD_LOGIC_VECTOR(c_unb1_board_ci.tr.bus_w-1 DOWNTO 0); SI_FN_3_TX : OUT STD_LOGIC_VECTOR(c_unb1_board_ci.tr.bus_w-1 DOWNTO 0);
SI_FN_3_RX : IN STD_LOGIC_VECTOR(c_unb1_board_ci.tr.bus_w-1 DOWNTO 0); SI_FN_3_RX : IN STD_LOGIC_VECTOR(c_unb1_board_ci.tr.bus_w-1 DOWNTO 0) := (OTHERS=>'0');
SI_FN_0_CNTRL : INOUT STD_LOGIC_VECTOR(c_unb1_board_ci.tr.cntrl_w-1 DOWNTO 0); -- (0 = LASI; 1=MDC; 2=MDIO) SI_FN_0_CNTRL : INOUT STD_LOGIC_VECTOR(c_unb1_board_ci.tr.cntrl_w-1 DOWNTO 0); -- (0 = LASI; 1=MDC; 2=MDIO)
SI_FN_1_CNTRL : INOUT STD_LOGIC_VECTOR(c_unb1_board_ci.tr.cntrl_w-1 DOWNTO 0); SI_FN_1_CNTRL : INOUT STD_LOGIC_VECTOR(c_unb1_board_ci.tr.cntrl_w-1 DOWNTO 0);
...@@ -95,13 +92,13 @@ ENTITY unb1_test IS ...@@ -95,13 +92,13 @@ ENTITY unb1_test IS
SI_FN_RSTN : OUT STD_LOGIC := '1'; -- ResetN is pulled up in the Vitesse chip, but pulled down again by external 1k resistor. SI_FN_RSTN : OUT STD_LOGIC := '1'; -- ResetN is pulled up in the Vitesse chip, but pulled down again by external 1k resistor.
BN_BI_0_TX : OUT STD_LOGIC_VECTOR(c_unb1_board_ci.tr.bus_w-1 DOWNTO 0); BN_BI_0_TX : OUT STD_LOGIC_VECTOR(c_unb1_board_ci.tr.bus_w-1 DOWNTO 0);
BN_BI_0_RX : IN STD_LOGIC_VECTOR(c_unb1_board_ci.tr.bus_w-1 DOWNTO 0); BN_BI_0_RX : IN STD_LOGIC_VECTOR(c_unb1_board_ci.tr.bus_w-1 DOWNTO 0) := (OTHERS=>'0');
BN_BI_1_TX : OUT STD_LOGIC_VECTOR(c_unb1_board_ci.tr.bus_w-1 DOWNTO 0); BN_BI_1_TX : OUT STD_LOGIC_VECTOR(c_unb1_board_ci.tr.bus_w-1 DOWNTO 0);
BN_BI_1_RX : IN STD_LOGIC_VECTOR(c_unb1_board_ci.tr.bus_w-1 DOWNTO 0); BN_BI_1_RX : IN STD_LOGIC_VECTOR(c_unb1_board_ci.tr.bus_w-1 DOWNTO 0) := (OTHERS=>'0');
BN_BI_2_TX : OUT STD_LOGIC_VECTOR(c_unb1_board_ci.tr.bus_w-1 DOWNTO 0); BN_BI_2_TX : OUT STD_LOGIC_VECTOR(c_unb1_board_ci.tr.bus_w-1 DOWNTO 0);
BN_BI_2_RX : IN STD_LOGIC_VECTOR(c_unb1_board_ci.tr.bus_w-1 DOWNTO 0); BN_BI_2_RX : IN STD_LOGIC_VECTOR(c_unb1_board_ci.tr.bus_w-1 DOWNTO 0) := (OTHERS=>'0');
BN_BI_3_TX : OUT STD_LOGIC_VECTOR(c_unb1_board_ci.tr.bus_w-1 DOWNTO 0); BN_BI_3_TX : OUT STD_LOGIC_VECTOR(c_unb1_board_ci.tr.bus_w-1 DOWNTO 0);
BN_BI_3_RX : IN STD_LOGIC_VECTOR(c_unb1_board_ci.tr.bus_w-1 DOWNTO 0); BN_BI_3_RX : IN STD_LOGIC_VECTOR(c_unb1_board_ci.tr.bus_w-1 DOWNTO 0) := (OTHERS=>'0');
-- SO-DIMM Memory Bank I -- SO-DIMM Memory Bank I
MB_I_IN : IN t_tech_ddr3_phy_in := c_tech_ddr3_phy_in_x; MB_I_IN : IN t_tech_ddr3_phy_in := c_tech_ddr3_phy_in_x;
...@@ -122,24 +119,35 @@ ARCHITECTURE str OF unb1_test IS ...@@ -122,24 +119,35 @@ ARCHITECTURE str OF unb1_test IS
-- Firmware version x.y -- Firmware version x.y
CONSTANT c_fw_version : t_unb1_board_fw_version := (1, 2); CONSTANT c_fw_version : t_unb1_board_fw_version := (1, 2);
CONSTANT c_use_front : BOOLEAN := TRUE; -- connect SI_FN_[0..2] CONSTANT c_use_front : BOOLEAN := g_design_name="unb1_test_10GbE" OR g_design_name="unb1_test_all";
CONSTANT c_use_back : BOOLEAN := FALSE; -- however SI_FN_[0..2] do connect to copper connectors of single board unb CONSTANT c_use_back : BOOLEAN := FALSE; -- however SI_FN_[0..2] do connect to copper connectors of single board unb
-- Revision controlled constants -- Revision controlled constants
CONSTANT c_use_1GbE : BOOLEAN := g_design_name = "unb1_test_1GbE" OR g_design_name = "unb1_test_10GbE"; CONSTANT c_use_1GbE : BOOLEAN := g_design_name="unb1_test_1GbE" OR g_design_name="unb1_test_10GbE" OR g_design_name="unb1_test_all";
CONSTANT c_use_10GbE : BOOLEAN := g_design_name = "unb1_test_10GbE"; CONSTANT c_use_10GbE : BOOLEAN := g_design_name="unb1_test_10GbE" OR g_design_name="unb1_test_all";
CONSTANT c_use_ddr : BOOLEAN := g_design_name="unb1_test_ddr" OR g_design_name="unb1_test_all";
-- max useful peripherals (FIXME read these constants from board lib)
-- CONSTANT c_max_nof_
-- ddr
CONSTANT c_nof_MB : NATURAL := c_unb1_board_nof_ddr3; -- Fixed control infrastructure for 2 modules per FPGA
CONSTANT c_use_MB_I : NATURAL := sel_a_b(c_use_ddr,1,0); -- 1: use MB_I 0: do not use
CONSTANT c_use_MB_II : NATURAL := 0;
CONSTANT c_use_phy : t_c_unb1_board_use_phy := (sel_a_b(c_use_1GbE, 1, 0), CONSTANT c_use_phy : t_c_unb1_board_use_phy := (sel_a_b(c_use_1GbE, 1, 0),
sel_a_b(c_use_front,1, 0), sel_a_b(c_use_front,1, 0),
0, 0,
sel_a_b(c_use_back, 1, 0), sel_a_b(c_use_back, 1, 0),
sel_a_b(g_use_MB_I, 1, 0), sel_a_b(c_use_MB_I, 1, 0),
sel_a_b(g_use_MB_II,1, 0), sel_a_b(c_use_MB_II,1, 0),
0, 1); 0, 1);
CONSTANT c_nof_streams_10GbE : NATURAL := sel_a_b(c_use_10GbE,3,0); CONSTANT c_nof_streams_10GbE : NATURAL := sel_a_b(c_use_10GbE,3,0);
CONSTANT c_nof_streams_1GbE : NATURAL := sel_a_b(c_use_1GbE,1,0); CONSTANT c_nof_streams_1GbE : NATURAL := sel_a_b(c_use_1GbE,1,0);
CONSTANT c_nof_streams_ddr : NATURAL := sel_a_b(g_use_MB_I,sel_a_b(g_use_MB_II,2,1),0); CONSTANT c_nof_streams_ddr : NATURAL := sel_a_b(c_use_MB_I,sel_a_b(c_use_MB_II,2,1),0);
CONSTANT c_nof_streams : NATURAL := c_nof_streams_1GbE + c_nof_streams_10GbE + c_nof_streams_ddr; CONSTANT c_nof_streams : NATURAL := c_nof_streams_1GbE + c_nof_streams_10GbE + c_nof_streams_ddr;
CONSTANT c_nof_streams_eth : NATURAL := c_nof_streams_1GbE + c_nof_streams_10GbE; CONSTANT c_nof_streams_eth : NATURAL := c_nof_streams_1GbE + c_nof_streams_10GbE;
CONSTANT c_data_w_32 : NATURAL := c_eth_data_w; -- 1GbE CONSTANT c_data_w_32 : NATURAL := c_eth_data_w; -- 1GbE
...@@ -468,9 +476,9 @@ BEGIN ...@@ -468,9 +476,9 @@ BEGIN
g_sim => g_sim, g_sim => g_sim,
g_sim_unb_nr => g_sim_unb_nr, g_sim_unb_nr => g_sim_unb_nr,
g_sim_node_nr => g_sim_node_nr, g_sim_node_nr => g_sim_node_nr,
g_nof_streams_1GbE => c_nof_streams_1GbE, g_nof_streams_1GbE => 1,--c_nof_streams_1GbE,
g_nof_streams_10GbE => c_nof_streams_10GbE, g_nof_streams_10GbE => 3,--c_nof_streams_10GbE,
g_nof_streams_ddr => c_nof_streams_ddr, g_nof_streams_ddr => 1,--c_nof_streams_ddr,
g_bg_block_size => c_bg_block_size g_bg_block_size => c_bg_block_size
) )
PORT MAP( PORT MAP(
...@@ -598,6 +606,7 @@ BEGIN ...@@ -598,6 +606,7 @@ BEGIN
); );
gen_udp_stream_1GbE : IF c_use_1GbE = TRUE GENERATE
u_udp_stream_1GbE : ENTITY work.udp_stream u_udp_stream_1GbE : ENTITY work.udp_stream
GENERIC MAP ( GENERIC MAP (
g_sim => g_sim, g_sim => g_sim,
...@@ -649,8 +658,10 @@ BEGIN ...@@ -649,8 +658,10 @@ BEGIN
ram_diag_data_buf_mosi => ram_diag_data_buf_1GbE_mosi, ram_diag_data_buf_mosi => ram_diag_data_buf_1GbE_mosi,
ram_diag_data_buf_miso => ram_diag_data_buf_1GbE_miso ram_diag_data_buf_miso => ram_diag_data_buf_1GbE_miso
); );
END GENERATE;
gen_udp_stream_10GbE : IF c_use_10GbE = TRUE GENERATE
u_udp_stream_10GbE : ENTITY work.udp_stream u_udp_stream_10GbE : ENTITY work.udp_stream
GENERIC MAP ( GENERIC MAP (
g_sim => g_sim, g_sim => g_sim,
...@@ -702,6 +713,7 @@ BEGIN ...@@ -702,6 +713,7 @@ BEGIN
ram_diag_data_buf_mosi => ram_diag_data_buf_10GbE_mosi, ram_diag_data_buf_mosi => ram_diag_data_buf_10GbE_mosi,
ram_diag_data_buf_miso => ram_diag_data_buf_10GbE_miso ram_diag_data_buf_miso => ram_diag_data_buf_10GbE_miso
); );
END GENERATE;
...@@ -814,6 +826,7 @@ BEGIN ...@@ -814,6 +826,7 @@ BEGIN
END GENERATE; END GENERATE;
gen_ddr_stream : IF c_use_ddr = TRUE GENERATE
u_ddr_stream : ENTITY work.ddr_stream u_ddr_stream : ENTITY work.ddr_stream
GENERIC MAP ( GENERIC MAP (
g_sim => g_sim, g_sim => g_sim,
...@@ -863,6 +876,6 @@ BEGIN ...@@ -863,6 +876,6 @@ BEGIN
MB_I_IO => MB_I_IO, MB_I_IO => MB_I_IO,
MB_I_OU => MB_I_OU MB_I_OU => MB_I_OU
); );
END GENERATE;
END str; END str;
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment