From: Your Name <you@example.com>
Date: Wed, 10 Aug 2016 12:12:27 +0000 (+0200)
Subject: update
X-Git-Url: https://jspc29.x-matter.uni-frankfurt.de/git/?a=commitdiff_plain;h=3aa272b95c21f1cc441f9e95af91f3728a704db7;p=trb3.git

update
---

diff --git a/trb3_gbe/trb3_central_gbe.prj b/trb3_gbe/trb3_central_gbe.prj
index a1b521e..accecc8 100644
--- a/trb3_gbe/trb3_central_gbe.prj
+++ b/trb3_gbe/trb3_central_gbe.prj
@@ -99,6 +99,7 @@ add_file -vhdl -lib work "../../trbnet/gbe_trb/base/trb_net16_gbe_setup.vhd"
 add_file -vhdl -lib work "../../trbnet/gbe_trb/base/ip_configurator.vhd"
 add_file -vhdl -lib work "../../trbnet/gbe_trb/protocols/trb_net16_gbe_response_constructor_ARP.vhd"
 add_file -vhdl -lib work "../../trbnet/gbe_trb/protocols/trb_net16_gbe_response_constructor_Ping.vhd"
+add_file -vhdl -lib work "../../trbnet/gbe_trb/protocols/trb_net16_gbe_response_constructor_KillPing.vhd"
 add_file -vhdl -lib work "../../trbnet/gbe_trb/protocols/trb_net16_gbe_response_constructor_DHCP.vhd"
 add_file -vhdl -lib work "../../trbnet/gbe_trb/protocols/trb_net16_gbe_response_constructor_SCTRL.vhd"
 add_file -vhdl -lib work "../../trbnet/gbe_trb/protocols/trb_net16_gbe_response_constructor_TrbNetData.vhd"
diff --git a/trb3_gbe/trb3_central_gbe.vhd b/trb3_gbe/trb3_central_gbe.vhd
index 29d5a81..491defe 100644
--- a/trb3_gbe/trb3_central_gbe.vhd
+++ b/trb3_gbe/trb3_central_gbe.vhd
@@ -297,6 +297,8 @@ signal reset_i_temp  : std_logic;
    signal busgbeip_rx, busgbereg_rx : CTRLBUS_RX;
    signal busgbeip_tx, busgbereg_tx : CTRLBUS_TX;
 
+signal do_reboot, reboot_from_gbe : std_logic;
+
 
 begin
 
@@ -729,6 +731,8 @@ THE_MEDIA_ONBOARD : trb_net16_med_ecp3_sfp_4
       FEE_BUSY_IN              => fee_busy,       
       
       MC_UNIQUE_ID_IN          => mc_unique_id,  
+      MY_TRBNET_ADDRESS_IN => my_address,
+      ISSUE_REBOOT_OUT => reboot_from_gbe,  
       
       GSC_CLK_IN               => clk_sys_i,            
       GSC_INIT_DATAREADY_OUT   => gsc_init_dataready,   
@@ -912,7 +916,7 @@ THE_SPI_RELOAD : entity work.spi_flash_and_fpga_reload
     BUS_DATA_IN          => spimem_data_in,
     BUS_DATA_OUT         => spimem_data_out,
     
-    DO_REBOOT_IN         => common_ctrl_regs(15),     
+    DO_REBOOT_IN         => do_reboot, --common_ctrl_regs(15),     
     PROGRAMN             => PROGRAMN,
     
     SPI_CS_OUT           => FLASH_CS,
@@ -921,6 +925,8 @@ THE_SPI_RELOAD : entity work.spi_flash_and_fpga_reload
     SPI_SDI_IN           => FLASH_DOUT
     );
 
+do_reboot <= common_ctrl_regs(15) or reboot_from_gbe;
+
 ---------------------------------------------------------------------------
 -- Trigger logic
 ---------------------------------------------------------------------------