From 6f038dc2f69b38e715206b2e700fdd3a1bbc638e Mon Sep 17 00:00:00 2001 From: Wade Fife Date: Thu, 9 Dec 2021 14:30:30 -0600 Subject: fpga: Use PROTOVER and CHDR_W from RFNoC image builder This updates all RFNoC devices so that they get the RFNoC protocol version and CHDR width in the same way, from the output generated by the RFNoC image builder. --- fpga/usrp3/top/x300/bus_int.v | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) (limited to 'fpga/usrp3/top/x300/bus_int.v') diff --git a/fpga/usrp3/top/x300/bus_int.v b/fpga/usrp3/top/x300/bus_int.v index 90f840a4c..e97ff7ef8 100644 --- a/fpga/usrp3/top/x300/bus_int.v +++ b/fpga/usrp3/top/x300/bus_int.v @@ -177,7 +177,16 @@ module bus_int #( localparam COMPAT_MINOR = 16'h0000; localparam NUM_TIMEKEEPERS = 1; - localparam [15:0] RFNOC_PROTOVER = {8'd1, 8'd0}; + // Include the RFNoC image core header file + `ifdef RFNOC_IMAGE_CORE_HDR + `include `"`RFNOC_IMAGE_CORE_HDR`" + `else + ERROR_RFNOC_IMAGE_CORE_HDR_not_defined(); + `define CHDR_WIDTH 64 + `define RFNOC_PROTOVER { 8'd1, 8'd0 } + `endif + localparam CHDR_W = `CHDR_WIDTH; + localparam RFNOC_PROTOVER = `RFNOC_PROTOVER; wire [31:0] set_data; wire [7:0] set_addr; @@ -733,7 +742,8 @@ module bus_int #( /////////////////////////////////////////////////////////////////////////// rfnoc_image_core #( - .PROTOVER(RFNOC_PROTOVER) + .CHDR_W (CHDR_W), + .PROTOVER (RFNOC_PROTOVER) ) rfnoc_sandbox_i ( .chdr_aclk (clk ), .ctrl_aclk (clk_div2 ), -- cgit v1.2.3