From b481c4a8db12cabd161d9c0b3f4ef93919207d47 Mon Sep 17 00:00:00 2001 From: hadeshyp Date: Thu, 23 Aug 2012 17:12:38 +0000 Subject: [PATCH] *** empty log message *** --- trb3_gbe/trb3_central.p2t | 2 +- trb3_gbe/trb3_central.vhd | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/trb3_gbe/trb3_central.p2t b/trb3_gbe/trb3_central.p2t index 09ab769..3838d81 100644 --- a/trb3_gbe/trb3_central.p2t +++ b/trb3_gbe/trb3_central.p2t @@ -4,7 +4,7 @@ -n 1 -y -s 12 --t 11 +-t 10 -c 1 -e 2 #-g guidefile.ncd diff --git a/trb3_gbe/trb3_central.vhd b/trb3_gbe/trb3_central.vhd index 771682b..c02dc7f 100644 --- a/trb3_gbe/trb3_central.vhd +++ b/trb3_gbe/trb3_central.vhd @@ -279,14 +279,14 @@ THE_RESET_HANDLER : trb_net_reset_handler SYSCLK_IN => clk_100_i, -- PLL/DLL remastered clock PLL_LOCKED_IN => pll_lock, -- master PLL lock signal (async) RESET_IN => '0', -- general reset signal (SYSCLK) - TRB_RESET_IN => '0', -- TRBnet reset signal (SYSCLK) + TRB_RESET_IN => trb_reset_in, -- TRBnet reset signal (SYSCLK) CLEAR_OUT => clear_i, -- async reset out, USE WITH CARE! RESET_OUT => reset_i_temp, -- synchronous reset out (SYSCLK) DEBUG_OUT => open ); -trb_reset_in <= med_stat_op(4*16+13) or reset_via_gbe_delayed(2); -reset_i <= reset_i_temp or trb_reset_in; +trb_reset_in <= med_stat_op(4*16+13) or reset_via_gbe; --_delayed(2); +reset_i <= reset_i_temp; process begin wait until rising_edge(clk_100_i); @@ -493,7 +493,7 @@ gen_ethernet_hub : if USE_ETHERNET = c_YES generate -- MII_IS_UPLINK_ONLY => (0,0,0,0,0,1,1,0,0,0,0,0,0,0,0,0,0), --optical link SFP1 is uplink on TRG & IPU and downlink on sctrl (e.g. connect a CTS, sctrl via GbE) - MII_IS_UPLINK => (0,0,0,0,1,0,1,0,0,0,0,0,0,0,0,0,0), + MII_IS_UPLINK => (0,0,0,0,1,1,1,0,0,0,0,0,0,0,0,0,0), MII_IS_DOWNLINK => (1,1,1,1,1,1,0,0,0,0,0,0,0,0,0,0,0), MII_IS_UPLINK_ONLY => (0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0), -- 2.43.0