Skip to content
Snippets Groups Projects
Commit b21f0e59 authored by Eric Kooistra's avatar Eric Kooistra
Browse files

Merge branch 'L2SDP-476' into 'master'

Resolve L2SDP-476 + L2SDP-267

Closes L2SDP-476

See merge request desp/hdl!149
parents a2e24900 1f4d1475
No related branches found
No related tags found
1 merge request!149Resolve L2SDP-476 + L2SDP-267
...@@ -227,7 +227,7 @@ regression_test_vhdl = ...@@ -227,7 +227,7 @@ regression_test_vhdl =
tb/vhdl/tb_tb_common_fanout_tree.vhd tb/vhdl/tb_tb_common_fanout_tree.vhd
tb/vhdl/tb_tb_common_multiplexer.vhd tb/vhdl/tb_tb_common_multiplexer.vhd
tb/vhdl/tb_tb_common_operation_tree.vhd tb/vhdl/tb_tb_common_operation_tree.vhd
#tb/vhdl/tb_tb_common_paged_ram_ww_rr.vhd -- fails for unb2c tb/vhdl/tb_tb_common_paged_ram_ww_rr.vhd
tb/vhdl/tb_tb_common_reorder_symbol.vhd tb/vhdl/tb_tb_common_reorder_symbol.vhd
tb/vhdl/tb_tb_common_rl.vhd tb/vhdl/tb_tb_common_rl.vhd
tb/vhdl/tb_tb_common_rl_register.vhd tb/vhdl/tb_tb_common_rl_register.vhd
......
...@@ -42,7 +42,7 @@ test_bench_files = ...@@ -42,7 +42,7 @@ test_bench_files =
regression_test_vhdl = regression_test_vhdl =
tb/vhdl/tb_tb_reorder_col_wide_row_select.vhd tb/vhdl/tb_tb_reorder_col_wide_row_select.vhd
# tb/vhdl/tb_tb_reorder_col.vhd -- fails in unb2c tb/vhdl/tb_tb_reorder_col.vhd
[modelsim_project_file] [modelsim_project_file]
......
...@@ -20,7 +20,7 @@ test_bench_files = ...@@ -20,7 +20,7 @@ test_bench_files =
tb/vhdl/tb_tb_ss.vhd tb/vhdl/tb_tb_ss.vhd
regression_test_vhdl = regression_test_vhdl =
# tb/vhdl/tb_tb_ss.vhd -- fails in unb2c tb/vhdl/tb_tb_ss.vhd
[modelsim_project_file] [modelsim_project_file]
......
...@@ -14,7 +14,7 @@ test_bench_files = ...@@ -14,7 +14,7 @@ test_bench_files =
tb/vhdl/tb_tb_tr_10GbE.vhd tb/vhdl/tb_tb_tr_10GbE.vhd
regression_test_vhdl = regression_test_vhdl =
# tb/vhdl/tb_tb_tr_10GbE.vhd -- fails in unb2c tb/vhdl/tb_tb_tr_10GbE.vhd
[modelsim_project_file] [modelsim_project_file]
......
...@@ -26,7 +26,7 @@ test_bench_files = ...@@ -26,7 +26,7 @@ test_bench_files =
tb_tb_tech_eth_10g.vhd tb_tb_tech_eth_10g.vhd
regression_test_vhdl = regression_test_vhdl =
# tb_tb_tech_eth_10g.vhd -- fails in unb2c tb_tb_tech_eth_10g.vhd
[modelsim_project_file] [modelsim_project_file]
......
...@@ -71,6 +71,7 @@ ARCHITECTURE SYN OF ip_arria10_e2sg_ram_cr_cw IS ...@@ -71,6 +71,7 @@ ARCHITECTURE SYN OF ip_arria10_e2sg_ram_cr_cw IS
outdata_aclr_b : string; outdata_aclr_b : string;
outdata_reg_b : string; outdata_reg_b : string;
power_up_uninitialized : string; power_up_uninitialized : string;
read_during_write_mode_mixed_ports : string;
widthad_a : integer; widthad_a : integer;
widthad_b : integer; widthad_b : integer;
width_a : integer; width_a : integer;
...@@ -116,6 +117,7 @@ BEGIN ...@@ -116,6 +117,7 @@ BEGIN
outdata_aclr_b => "NONE", outdata_aclr_b => "NONE",
outdata_reg_b => c_outdata_reg_b, outdata_reg_b => c_outdata_reg_b,
power_up_uninitialized => "FALSE", power_up_uninitialized => "FALSE",
read_during_write_mode_mixed_ports => "OLD_DATA",
widthad_a => g_adr_w, widthad_a => g_adr_w,
widthad_b => g_adr_w, widthad_b => g_adr_w,
width_a => g_dat_w, width_a => g_dat_w,
......
...@@ -80,6 +80,7 @@ ARCHITECTURE SYN OF ip_arria10_e2sg_ram_crw_crw IS ...@@ -80,6 +80,7 @@ ARCHITECTURE SYN OF ip_arria10_e2sg_ram_crw_crw IS
power_up_uninitialized : string; power_up_uninitialized : string;
read_during_write_mode_port_a : string; read_during_write_mode_port_a : string;
read_during_write_mode_port_b : string; read_during_write_mode_port_b : string;
read_during_write_mode_mixed_ports : string;
widthad_a : integer; widthad_a : integer;
widthad_b : integer; widthad_b : integer;
width_a : integer; width_a : integer;
...@@ -137,6 +138,7 @@ BEGIN ...@@ -137,6 +138,7 @@ BEGIN
power_up_uninitialized => "FALSE", power_up_uninitialized => "FALSE",
read_during_write_mode_port_a => "NEW_DATA_NO_NBE_READ", read_during_write_mode_port_a => "NEW_DATA_NO_NBE_READ",
read_during_write_mode_port_b => "NEW_DATA_NO_NBE_READ", read_during_write_mode_port_b => "NEW_DATA_NO_NBE_READ",
read_during_write_mode_mixed_ports => "OLD_DATA",
widthad_a => g_adr_w, widthad_a => g_adr_w,
widthad_b => g_adr_w, widthad_b => g_adr_w,
width_a => g_dat_w, width_a => g_dat_w,
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment