From 92abd3945a82f06556664186d3784142084476f8 Mon Sep 17 00:00:00 2001 From: Wade Fife Date: Wed, 31 Aug 2022 12:30:41 -0500 Subject: [PATCH] fpga: n3xx: Remove unused USE_REPLAY parameter Original-commit: 244b0a575fce2eb9e489b7f46c6e6cd13ec7a0bd --- top/n3xx/Makefile | 16 ++++++++-------- top/n3xx/dboards/mg/n3xx.v | 7 +------ top/n3xx/dboards/rh/n3xx.v | 7 +------ top/n3xx/n3xx_core.v | 1 - 4 files changed, 10 insertions(+), 21 deletions(-) diff --git a/top/n3xx/Makefile b/top/n3xx/Makefile index cce5b75..aac2670 100644 --- a/top/n3xx/Makefile +++ b/top/n3xx/Makefile @@ -24,14 +24,14 @@ # OPTIONS += QSFP_LANES=4 # Additional definitions specific to the various targets: -WX_DEFS=SFP0_WR=1 SFP1_10GBE=1 USE_REPLAY=1 BUILD_WR=1 BUILD_10G=1 $(OPTIONS) -HG_DEFS=SFP0_1GBE=1 SFP1_10GBE=1 USE_REPLAY=1 BUILD_1G=1 BUILD_10G=1 $(OPTIONS) -XG_DEFS=SFP0_10GBE=1 SFP1_10GBE=1 USE_REPLAY=1 BUILD_10G=1 $(OPTIONS) -HA_DEFS=SFP0_1GBE=1 SFP1_AURORA=1 USE_REPLAY=1 BUILD_1G=1 BUILD_AURORA=1 $(OPTIONS) -XA_DEFS=SFP0_10GBE=1 SFP1_AURORA=1 USE_REPLAY=1 BUILD_10G=1 BUILD_AURORA=1 $(OPTIONS) -AA_DEFS=SFP0_AURORA=1 SFP1_AURORA=1 BUILD_AURORA=1 $(OPTIONS) -XQ_DEFS=SFP0_WR=1 QSFP_10GBE=1 USE_REPLAY=1 BUILD_WR=1 BUILD_10G=1 QSFP_LANES=2 $(OPTIONS) -AQ_DEFS=SFP0_10GBE=1 SFP1_10GBE=1 QSFP_AURORA=1 USE_REPLAY=1 BUILD_10G=1 BUILD_AURORA=1 QSFP_LANES=4 $(OPTIONS) +WX_DEFS=SFP0_WR=1 SFP1_10GBE=1 BUILD_WR=1 BUILD_10G=1 $(OPTIONS) +HG_DEFS=SFP0_1GBE=1 SFP1_10GBE=1 BUILD_1G=1 BUILD_10G=1 $(OPTIONS) +XG_DEFS=SFP0_10GBE=1 SFP1_10GBE=1 BUILD_10G=1 $(OPTIONS) +HA_DEFS=SFP0_1GBE=1 SFP1_AURORA=1 BUILD_1G=1 BUILD_AURORA=1 $(OPTIONS) +XA_DEFS=SFP0_10GBE=1 SFP1_AURORA=1 BUILD_10G=1 BUILD_AURORA=1 $(OPTIONS) +AA_DEFS=SFP0_AURORA=1 SFP1_AURORA=1 BUILD_AURORA=1 $(OPTIONS) +XQ_DEFS=SFP0_WR=1 QSFP_10GBE=1 BUILD_WR=1 BUILD_10G=1 QSFP_LANES=2 $(OPTIONS) +AQ_DEFS=SFP0_10GBE=1 SFP1_10GBE=1 QSFP_AURORA=1 BUILD_10G=1 BUILD_AURORA=1 QSFP_LANES=4 $(OPTIONS) # Defaults specific to the various targets: N300_DEFAULTS:=DEFAULT_RFNOC_IMAGE_CORE_FILE=$(abspath n300_rfnoc_image_core.v) DEFAULT_EDGE_FILE=$(abspath n300_static_router.hex) diff --git a/top/n3xx/dboards/mg/n3xx.v b/top/n3xx/dboards/mg/n3xx.v index 59ddff5..bc0cf54 100644 --- a/top/n3xx/dboards/mg/n3xx.v +++ b/top/n3xx/dboards/mg/n3xx.v @@ -3551,12 +3551,7 @@ module n3xx ( .NUM_CHANNELS(NUM_CHANNELS), .NUM_DBOARDS(NUM_DBOARDS), .CHDR_W(CHDR_W), - .RFNOC_PROTOVER(RFNOC_PROTOVER), - `ifdef USE_REPLAY - .USE_REPLAY(1) - `else - .USE_REPLAY(0) - `endif + .RFNOC_PROTOVER(RFNOC_PROTOVER) ) n3xx_core( // Clocks and resets `ifdef NO_DB diff --git a/top/n3xx/dboards/rh/n3xx.v b/top/n3xx/dboards/rh/n3xx.v index 7aa5ff0..4a237a0 100644 --- a/top/n3xx/dboards/rh/n3xx.v +++ b/top/n3xx/dboards/rh/n3xx.v @@ -3471,12 +3471,7 @@ module n3xx ( .NUM_SPI_PER_DBOARD(4), .USE_CORRECTION(1), .CHDR_W(CHDR_W), - .RFNOC_PROTOVER(RFNOC_PROTOVER), - `ifdef USE_REPLAY - .USE_REPLAY(1) - `else - .USE_REPLAY(0) - `endif + .RFNOC_PROTOVER(RFNOC_PROTOVER) ) n3xx_core( // Clocks and resets `ifdef NO_DB diff --git a/top/n3xx/n3xx_core.v b/top/n3xx/n3xx_core.v index ab1982d..0ba9bff 100644 --- a/top/n3xx/n3xx_core.v +++ b/top/n3xx/n3xx_core.v @@ -24,7 +24,6 @@ module n3xx_core #( parameter NUM_DBOARDS = 2, parameter NUM_SPI_PER_DBOARD = 8, parameter USE_CORRECTION = 0, - parameter USE_REPLAY = 0, // 1 for Replay block instead of DMA FIFO parameter FP_GPIO_WIDTH = 12, // Front panel GPIO width parameter CHDR_W = 64, parameter RFNOC_PROTOVER = {8'd1, 8'd0}