diff options
| author |   Wade Fife <wade.fife@ettus.com> | 2023-07-19 16:48:35 -0500 |
|---|---|---|
| committer | Wade Fife <wade.fife@ettus.com> | 2023-07-26 15:13:50 -0500 |
| commit | 4d73b966de307a59fe4b1cf3ad2e584d28f81e63 (patch) | |
| tree | 838062547f9b9503f89d2cad7ff37717b94906fd | |
| parent | tools: add devtest rule for changeset_analyzer (diff) | |
| download | uhd-4d73b966de307a59fe4b1cf3ad2e584d28f81e63.tar.xz uhd-4d73b966de307a59fe4b1cf3ad2e584d28f81e63.zip | |
fpga: Fix RFNoC OOT Makefile inclusion
| -rw-r--r-- | fpga/usrp3/top/e31x/Makefile.e31x.inc | 2 | ||||
| -rw-r--r-- | fpga/usrp3/top/e320/Makefile.e320.inc | 3 | ||||
| -rw-r--r-- | fpga/usrp3/top/n3xx/Makefile.n3xx.inc | 3 | ||||
| -rw-r--r-- | fpga/usrp3/top/x300/Makefile.x300.inc | 1 | ||||
| -rw-r--r-- | fpga/usrp3/top/x400/Makefile.x4xx.inc | 2 |
5 files changed, 8 insertions, 3 deletions
diff --git a/fpga/usrp3/top/e31x/Makefile.e31x.inc b/fpga/usrp3/top/e31x/Makefile.e31x.inc index c59df54e0..f18b5796c 100644 --- a/fpga/usrp3/top/e31x/Makefile.e31x.inc +++ b/fpga/usrp3/top/e31x/Makefile.e31x.inc @@ -31,6 +31,7 @@ include $(LIB_DIR)/packet_proc/Makefile.srcs include $(LIB_DIR)/dsp/Makefile.srcs include $(LIB_DIR)/io_cap_gen/Makefile.srcs include $(LIB_DIR)/rfnoc/Makefile.srcs + # For the sake of convenience, we include the Makefile.srcs for the DDC, DUC, # radio, replay and FIFO blocks. Any other block needs to use the # RFNOC_OOT_MAKEFILE_SRCS variable (see below). @@ -39,6 +40,7 @@ include $(LIB_DIR)/rfnoc/blocks/rfnoc_block_ddc/Makefile.srcs include $(LIB_DIR)/rfnoc/blocks/rfnoc_block_duc/Makefile.srcs include $(LIB_DIR)/rfnoc/blocks/rfnoc_block_replay/Makefile.srcs include $(LIB_DIR)/rfnoc/blocks/rfnoc_block_axi_ram_fifo/Makefile.srcs + # If out-of-tree modules want to be compiled into this image, then they need to # pass in the RFNOC_OOT_MAKEFILE_SRCS as a list of Makefile.srcs files. # Those files need to amend the RFNOC_OOT_SRCS variable with a list of actual diff --git a/fpga/usrp3/top/e320/Makefile.e320.inc b/fpga/usrp3/top/e320/Makefile.e320.inc index 3d3df81dd..1f2061650 100644 --- a/fpga/usrp3/top/e320/Makefile.e320.inc +++ b/fpga/usrp3/top/e320/Makefile.e320.inc @@ -43,11 +43,12 @@ include $(LIB_DIR)/rfnoc/blocks/rfnoc_block_axi_ram_fifo/Makefile.srcs include $(LIB_DIR)/rfnoc/blocks/rfnoc_block_radio/Makefile.srcs include $(LIB_DIR)/rfnoc/blocks/rfnoc_block_ddc/Makefile.srcs include $(LIB_DIR)/rfnoc/blocks/rfnoc_block_duc/Makefile.srcs + # If out-of-tree modules want to be compiled into this image, then they need to # pass in the RFNOC_OOT_MAKEFILE_SRCS as a list of Makefile.srcs files. # Those files need to amend the RFNOC_OOT_SRCS variable with a list of actual # source files. -include $(RFNOC_OOT_MAKEFILE_SRCS) +-include $(RFNOC_OOT_MAKEFILE_SRCS) IMAGE_CORE ?= $(DEFAULT_RFNOC_IMAGE_CORE_FILE) EDGE_FILE ?= $(DEFAULT_EDGE_FILE) diff --git a/fpga/usrp3/top/n3xx/Makefile.n3xx.inc b/fpga/usrp3/top/n3xx/Makefile.n3xx.inc index 45b7234fb..d70543c87 100644 --- a/fpga/usrp3/top/n3xx/Makefile.n3xx.inc +++ b/fpga/usrp3/top/n3xx/Makefile.n3xx.inc @@ -48,11 +48,12 @@ include $(LIB_DIR)/rfnoc/blocks/rfnoc_block_radio/Makefile.srcs include $(LIB_DIR)/rfnoc/blocks/rfnoc_block_ddc/Makefile.srcs include $(LIB_DIR)/rfnoc/blocks/rfnoc_block_duc/Makefile.srcs include $(LIB_DIR)/rfnoc/blocks/rfnoc_block_replay/Makefile.srcs + # If out-of-tree modules want to be compiled into this image, then they need to # pass in the RFNOC_OOT_MAKEFILE_SRCS as a list of Makefile.srcs files. # Those files need to amend the RFNOC_OOT_SRCS variable with a list of actual # source files. -include $(RFNOC_OOT_MAKEFILE_SRCS) +-include $(RFNOC_OOT_MAKEFILE_SRCS) IMAGE_CORE ?= $(DEFAULT_RFNOC_IMAGE_CORE_FILE) EDGE_FILE ?= $(DEFAULT_EDGE_FILE) diff --git a/fpga/usrp3/top/x300/Makefile.x300.inc b/fpga/usrp3/top/x300/Makefile.x300.inc index 7829d8f58..2c039dac7 100644 --- a/fpga/usrp3/top/x300/Makefile.x300.inc +++ b/fpga/usrp3/top/x300/Makefile.x300.inc @@ -47,6 +47,7 @@ include $(LIB_DIR)/rfnoc/blocks/rfnoc_block_radio/Makefile.srcs include $(LIB_DIR)/rfnoc/blocks/rfnoc_block_ddc/Makefile.srcs include $(LIB_DIR)/rfnoc/blocks/rfnoc_block_duc/Makefile.srcs include $(LIB_DIR)/rfnoc/blocks/rfnoc_block_replay/Makefile.srcs + # If out-of-tree modules want to be compiled into this image, then they need to # pass in the RFNOC_OOT_MAKEFILE_SRCS as a list of Makefile.srcs files. # Those files need to amend the RFNOC_OOT_SRCS variable with a list of actual diff --git a/fpga/usrp3/top/x400/Makefile.x4xx.inc b/fpga/usrp3/top/x400/Makefile.x4xx.inc index 773e77fb0..c6fc382bf 100644 --- a/fpga/usrp3/top/x400/Makefile.x4xx.inc +++ b/fpga/usrp3/top/x400/Makefile.x4xx.inc @@ -55,7 +55,7 @@ include $(LIB_DIR)/rfnoc/blocks/rfnoc_block_replay/Makefile.srcs # pass in the RFNOC_OOT_MAKEFILE_SRCS as a list of Makefile.srcs files. # Those files need to amend the RFNOC_OOT_SRCS variable with a list of actual # source files. -include $(RFNOC_OOT_MAKEFILE_SRCS) +-include $(RFNOC_OOT_MAKEFILE_SRCS) IMAGE_CORE ?= $(DEFAULT_RFNOC_IMAGE_CORE_FILE) EDGE_FILE ?= $(DEFAULT_EDGE_FILE) |