diff options
| author | Josh Blum <josh@joshknows.com> | 2012-02-18 22:21:28 -0800 |
|---|---|---|
| committer | Josh Blum <josh@joshknows.com> | 2012-02-18 22:21:28 -0800 |
| commit | f500b92ef52312832e81574f477dbd0308242a25 (patch) | |
| tree | 8bc4f5d7af6e0f66c99f0c94481d9e7914aea515 /fpga/usrp2/top | |
| parent | e9e670d7c9ecc6c809795b4a52d57fe612173ca9 (diff) | |
| parent | e230fefb32ad5ec2a861fdfef876da068a702b6a (diff) | |
| download | uhd-f500b92ef52312832e81574f477dbd0308242a25.tar.gz uhd-f500b92ef52312832e81574f477dbd0308242a25.tar.bz2 uhd-f500b92ef52312832e81574f477dbd0308242a25.zip | |
Merge branch 'fpga_master'
Diffstat (limited to 'fpga/usrp2/top')
| -rw-r--r-- | fpga/usrp2/top/N2x0/u2plus_core.v | 3 | ||||
| -rw-r--r-- | fpga/usrp2/top/USRP2/u2_core.v | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/fpga/usrp2/top/N2x0/u2plus_core.v b/fpga/usrp2/top/N2x0/u2plus_core.v index 378f212e4..369f01183 100644 --- a/fpga/usrp2/top/N2x0/u2plus_core.v +++ b/fpga/usrp2/top/N2x0/u2plus_core.v @@ -437,12 +437,13 @@ module u2plus_core //compatibility number -> increment when the fpga has been sufficiently altered localparam compat_num = {16'd9, 16'd0}; //major, minor + wire [31:0] churn = status; //tweak churn until timing meets! wb_readback_mux buff_pool_status (.wb_clk_i(wb_clk), .wb_rst_i(wb_rst), .wb_stb_i(s5_stb), .wb_adr_i(s5_adr), .wb_dat_o(s5_dat_i), .wb_ack_o(s5_ack), - .word00(32'b0),.word01(32'b0),.word02(32'b0),.word03(32'b0), + .word00(churn),.word01(32'b0),.word02(32'b0),.word03(32'b0), .word04(32'b0),.word05(32'b0),.word06(32'b0),.word07(32'b0), .word08(status),.word09(gpio_readback),.word10(vita_time[63:32]), .word11(vita_time[31:0]),.word12(compat_num),.word13({18'b0, button, 1'b0, clk_status, serdes_link_up, 10'b0}), diff --git a/fpga/usrp2/top/USRP2/u2_core.v b/fpga/usrp2/top/USRP2/u2_core.v index 9b26b98e1..6bf60fe58 100644 --- a/fpga/usrp2/top/USRP2/u2_core.v +++ b/fpga/usrp2/top/USRP2/u2_core.v @@ -443,12 +443,13 @@ module u2_core //compatibility number -> increment when the fpga has been sufficiently altered localparam compat_num = {16'd9, 16'd0}; //major, minor + wire [31:0] churn = 0; //tweak churn until timing meets! wb_readback_mux buff_pool_status (.wb_clk_i(wb_clk), .wb_rst_i(wb_rst), .wb_stb_i(s5_stb), .wb_adr_i(s5_adr), .wb_dat_o(s5_dat_i), .wb_ack_o(s5_ack), - .word00(32'b0),.word01(32'b0),.word02(32'b0),.word03(32'b0), + .word00(churn),.word01(32'b0),.word02(32'b0),.word03(32'b0), .word04(32'b0),.word05(32'b0),.word06(32'b0),.word07(32'b0), .word08(status),.word09(gpio_readback),.word10(vita_time[63:32]), .word11(vita_time[31:0]),.word12(compat_num),.word13({20'b0, clk_status, serdes_link_up, 10'b0}), |