From 0f2478d68c077eebc7de91a0b53f9775735e4108 Mon Sep 17 00:00:00 2001 From: Alex Forencich Date: Wed, 20 Oct 2021 17:21:16 -0700 Subject: [PATCH] Fix wires --- example/ADM_PCIE_9V3/fpga_10g/rtl/fpga_core.v | 2 -- example/ADM_PCIE_9V3/fpga_25g/rtl/fpga_core.v | 2 -- example/ATLYS/fpga/rtl/fpga.v | 2 ++ example/AU280/fpga_10g/rtl/fpga_core.v | 3 --- example/Arty/fpga/rtl/fpga.v | 2 ++ example/ExaNIC_X10/fpga/rtl/fpga_core.v | 2 +- example/ExaNIC_X25/fpga_10g/rtl/fpga_core.v | 2 +- example/HTG9200/fpga_10g/rtl/fpga.v | 7 +++++-- example/NetFPGA_SUME/fpga/rtl/fpga.v | 7 +++++++ example/NexysVideo/fpga/rtl/fpga.v | 2 ++ example/S10MX_DK/fpga_10g/rtl/fpga.v | 3 +++ example/ZCU102/fpga/rtl/fpga.v | 2 ++ example/fb2CG/fpga_10g/rtl/fpga.v | 8 ++++---- example/fb2CG/fpga_10g/rtl/fpga_core.v | 2 -- 14 files changed, 29 insertions(+), 17 deletions(-) diff --git a/example/ADM_PCIE_9V3/fpga_10g/rtl/fpga_core.v b/example/ADM_PCIE_9V3/fpga_10g/rtl/fpga_core.v index 113099a0..81246eaf 100644 --- a/example/ADM_PCIE_9V3/fpga_10g/rtl/fpga_core.v +++ b/example/ADM_PCIE_9V3/fpga_10g/rtl/fpga_core.v @@ -356,8 +356,6 @@ assign user_led_g = ~led_reg[1:0]; assign user_led_r = 1'b1; assign front_led = 2'b00; -assign phy_reset_n = !rst; - assign qsfp_0_txd_1 = 64'h0707070707070707; assign qsfp_0_txc_1 = 8'hff; assign qsfp_0_txd_2 = 64'h0707070707070707; diff --git a/example/ADM_PCIE_9V3/fpga_25g/rtl/fpga_core.v b/example/ADM_PCIE_9V3/fpga_25g/rtl/fpga_core.v index 2c198101..1e5d774a 100644 --- a/example/ADM_PCIE_9V3/fpga_25g/rtl/fpga_core.v +++ b/example/ADM_PCIE_9V3/fpga_25g/rtl/fpga_core.v @@ -356,8 +356,6 @@ assign user_led_g = ~led_reg[1:0]; assign user_led_r = 1'b1; assign front_led = 2'b00; -assign phy_reset_n = !rst; - assign qsfp_0_txd_1 = 64'h0707070707070707; assign qsfp_0_txc_1 = 8'hff; assign qsfp_0_txd_2 = 64'h0707070707070707; diff --git a/example/ATLYS/fpga/rtl/fpga.v b/example/ATLYS/fpga/rtl/fpga.v index 9afe0712..addf6c3a 100644 --- a/example/ATLYS/fpga/rtl/fpga.v +++ b/example/ATLYS/fpga/rtl/fpga.v @@ -169,6 +169,8 @@ debounce_switch_inst ( sw_int}) ); +wire uart_rxd_int; + sync_signal #( .WIDTH(1), .N(2) diff --git a/example/AU280/fpga_10g/rtl/fpga_core.v b/example/AU280/fpga_10g/rtl/fpga_core.v index 16d94ba7..e55921ac 100644 --- a/example/AU280/fpga_10g/rtl/fpga_core.v +++ b/example/AU280/fpga_10g/rtl/fpga_core.v @@ -344,9 +344,6 @@ always @(posedge clk) begin end end -//assign led = sw; -assign led = led_reg; - assign qsfp0_txd_2 = 64'h0707070707070707; assign qsfp0_txc_2 = 8'hff; assign qsfp0_txd_3 = 64'h0707070707070707; diff --git a/example/Arty/fpga/rtl/fpga.v b/example/Arty/fpga/rtl/fpga.v index 9ed6cf37..f881ee66 100644 --- a/example/Arty/fpga/rtl/fpga.v +++ b/example/Arty/fpga/rtl/fpga.v @@ -202,6 +202,8 @@ debounce_switch_inst ( sw_int}) ); +wire uart_rxd_int; + sync_signal #( .WIDTH(1), .N(2) diff --git a/example/ExaNIC_X10/fpga/rtl/fpga_core.v b/example/ExaNIC_X10/fpga/rtl/fpga_core.v index 0a5728d3..e894c601 100644 --- a/example/ExaNIC_X10/fpga/rtl/fpga_core.v +++ b/example/ExaNIC_X10/fpga/rtl/fpga_core.v @@ -300,7 +300,7 @@ always @(posedge clk) begin end end -assign led = led_reg; +assign sma_led = led_reg; assign sfp_2_txd = 64'h0707070707070707; assign sfp_2_txc = 8'hff; diff --git a/example/ExaNIC_X25/fpga_10g/rtl/fpga_core.v b/example/ExaNIC_X25/fpga_10g/rtl/fpga_core.v index 0a5728d3..e894c601 100644 --- a/example/ExaNIC_X25/fpga_10g/rtl/fpga_core.v +++ b/example/ExaNIC_X25/fpga_10g/rtl/fpga_core.v @@ -300,7 +300,7 @@ always @(posedge clk) begin end end -assign led = led_reg; +assign sma_led = led_reg; assign sfp_2_txd = 64'h0707070707070707; assign sfp_2_txc = 8'hff; diff --git a/example/HTG9200/fpga_10g/rtl/fpga.v b/example/HTG9200/fpga_10g/rtl/fpga.v index 4ee1d799..f27c901f 100644 --- a/example/HTG9200/fpga_10g/rtl/fpga.v +++ b/example/HTG9200/fpga_10g/rtl/fpga.v @@ -160,12 +160,15 @@ module fpga ( wire ref_clk_ibufg; -wire clk_125mhz_mmcm_out; - // Internal 125 MHz clock +wire clk_125mhz_mmcm_out; wire clk_125mhz_int; wire rst_125mhz_int; +// Internal 156.25 MHz clock +wire clk_156mhz_int; +wire rst_156mhz_int; + wire mmcm_rst = ~btn[0]; wire mmcm_locked; wire mmcm_clkfb; diff --git a/example/NetFPGA_SUME/fpga/rtl/fpga.v b/example/NetFPGA_SUME/fpga/rtl/fpga.v index 91a32575..fb7134c0 100644 --- a/example/NetFPGA_SUME/fpga/rtl/fpga.v +++ b/example/NetFPGA_SUME/fpga/rtl/fpga.v @@ -218,6 +218,13 @@ debounce_switch_inst ( ); // I2C +wire i2c_scl_i; +wire i2c_scl_o; +wire i2c_scl_t; +wire i2c_sda_i; +wire i2c_sda_o; +wire i2c_sda_t; + assign i2c_scl_i = i2c_scl; assign i2c_scl = i2c_scl_t ? 1'bz : i2c_scl_o; assign i2c_sda_i = i2c_sda; diff --git a/example/NexysVideo/fpga/rtl/fpga.v b/example/NexysVideo/fpga/rtl/fpga.v index e9cef290..b79dd493 100644 --- a/example/NexysVideo/fpga/rtl/fpga.v +++ b/example/NexysVideo/fpga/rtl/fpga.v @@ -211,6 +211,8 @@ debounce_switch_inst ( sw_int}) ); +wire uart_rxd_int; + sync_signal #( .WIDTH(1), .N(2) diff --git a/example/S10MX_DK/fpga_10g/rtl/fpga.v b/example/S10MX_DK/fpga_10g/rtl/fpga.v index d448e4f9..688c9df4 100644 --- a/example/S10MX_DK/fpga_10g/rtl/fpga.v +++ b/example/S10MX_DK/fpga_10g/rtl/fpga.v @@ -85,6 +85,9 @@ sync_reset_100mhz_inst ( .out(rst_100mhz) ); +wire clk_156mhz_int; +wire rst_156mhz_int; + // XGMII 10G PHY assign qsfp0_modsel_l = 1'b0; assign qsfp0_reset_l = 1'b1; diff --git a/example/ZCU102/fpga/rtl/fpga.v b/example/ZCU102/fpga/rtl/fpga.v index d632913d..6cd71740 100644 --- a/example/ZCU102/fpga/rtl/fpga.v +++ b/example/ZCU102/fpga/rtl/fpga.v @@ -281,6 +281,8 @@ assign rst_156mhz_int = sfp0_tx_rst_int; wire sfp0_rx_block_lock; wire sfp1_rx_block_lock; +wire sfp2_rx_block_lock; +wire sfp3_rx_block_lock; wire sfp_mgt_refclk_0; diff --git a/example/fb2CG/fpga_10g/rtl/fpga.v b/example/fb2CG/fpga_10g/rtl/fpga.v index 9c862276..7c601f2f 100644 --- a/example/fb2CG/fpga_10g/rtl/fpga.v +++ b/example/fb2CG/fpga_10g/rtl/fpga.v @@ -324,7 +324,7 @@ eth_xcvr_phy_wrapper #( ) qsfp_0_phy_0_inst ( .xcvr_ctrl_clk(clk_125mhz_int), - .xcvr_ctrl_rst(qsfp_0_reset), + .xcvr_ctrl_rst(qsfp_0_rst), // Common .xcvr_gtpowergood_out(qsfp_0_gtpowergood), @@ -370,7 +370,7 @@ eth_xcvr_phy_wrapper #( ) qsfp_0_phy_1_inst ( .xcvr_ctrl_clk(clk_125mhz_int), - .xcvr_ctrl_rst(qsfp_0_reset), + .xcvr_ctrl_rst(qsfp_0_rst), // Common .xcvr_gtpowergood_out(), @@ -416,7 +416,7 @@ eth_xcvr_phy_wrapper #( ) qsfp_0_phy_2_inst ( .xcvr_ctrl_clk(clk_125mhz_int), - .xcvr_ctrl_rst(qsfp_0_reset), + .xcvr_ctrl_rst(qsfp_0_rst), // Common .xcvr_gtpowergood_out(), @@ -462,7 +462,7 @@ eth_xcvr_phy_wrapper #( ) qsfp_0_phy_3_inst ( .xcvr_ctrl_clk(clk_125mhz_int), - .xcvr_ctrl_rst(qsfp_0_reset), + .xcvr_ctrl_rst(qsfp_0_rst), // Common .xcvr_gtpowergood_out(), diff --git a/example/fb2CG/fpga_10g/rtl/fpga_core.v b/example/fb2CG/fpga_10g/rtl/fpga_core.v index ae1a9696..d38ee928 100644 --- a/example/fb2CG/fpga_10g/rtl/fpga_core.v +++ b/example/fb2CG/fpga_10g/rtl/fpga_core.v @@ -357,8 +357,6 @@ assign led_green = led_reg; assign led_bmc = 2'b00; assign led_exp = 2'b11; -assign phy_reset_n = !rst; - assign qsfp_0_txd_1 = 64'h0707070707070707; assign qsfp_0_txc_1 = 8'hff; assign qsfp_0_txd_2 = 64'h0707070707070707;