From 88dd427a98d920cca3d4fddfc6ca15f69dc60095 Mon Sep 17 00:00:00 2001 From: Wade Fife Date: Wed, 19 Jul 2023 16:48:35 -0500 Subject: [PATCH] fpga: Fix RFNoC OOT Makefile inclusion Original-commit: 4d73b966de307a59fe4b1cf3ad2e584d28f81e63 --- top/e31x/Makefile.e31x.inc | 2 ++ top/e320/Makefile.e320.inc | 3 ++- top/n3xx/Makefile.n3xx.inc | 3 ++- top/x300/Makefile.x300.inc | 1 + top/x400/Makefile.x4xx.inc | 2 +- 5 files changed, 8 insertions(+), 3 deletions(-) diff --git a/top/e31x/Makefile.e31x.inc b/top/e31x/Makefile.e31x.inc index c59df54..f18b579 100644 --- a/top/e31x/Makefile.e31x.inc +++ b/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/top/e320/Makefile.e320.inc b/top/e320/Makefile.e320.inc index 3d3df81..1f20616 100644 --- a/top/e320/Makefile.e320.inc +++ b/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/top/n3xx/Makefile.n3xx.inc b/top/n3xx/Makefile.n3xx.inc index 45b7234..d70543c 100644 --- a/top/n3xx/Makefile.n3xx.inc +++ b/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/top/x300/Makefile.x300.inc b/top/x300/Makefile.x300.inc index 7829d8f..2c039da 100644 --- a/top/x300/Makefile.x300.inc +++ b/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/top/x400/Makefile.x4xx.inc b/top/x400/Makefile.x4xx.inc index 773e77f..c6fc382 100644 --- a/top/x400/Makefile.x4xx.inc +++ b/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)