diff options
| author | Martin Braun <martin.braun@ettus.com> | 2019-11-01 11:58:21 -0700 |
|---|---|---|
| committer | Martin Braun <martin.braun@ettus.com> | 2019-11-26 12:21:33 -0800 |
| commit | d997c235b84148f90ecfd16febc25190b1a7bc25 (patch) | |
| tree | 01699bab31519b4ad4cfe4b80c561c8a446e9d8b /host/include | |
| parent | 4693f9d1f093b28181996b02fda97e3346571de9 (diff) | |
| download | uhd-d997c235b84148f90ecfd16febc25190b1a7bc25.tar.gz uhd-d997c235b84148f90ecfd16febc25190b1a7bc25.tar.bz2 uhd-d997c235b84148f90ecfd16febc25190b1a7bc25.zip | |
image builder: Add ability to pick up extra Makefile.srcs from YAMLS
The blocks that are neither OOT, nor core blocks (like the DDC/DUC,
etc.) require additional info to find their appropriate Makefile.srcs
files. We don't include them in every build, to avoid building IP for
the FFT, FIR, and other blocks when they're not needed. However, those
blocks are in-tree, and don't follow the same directory structure as
out-of-tree modules, either.
We therefore allow the YAML files for those blocks (which are shipped
with UHD) to contain a path hint to their appropriate Makefile.srcs. The
image builder uses those paths to amend the `make` command
appropriately.
Diffstat (limited to 'host/include')
| -rw-r--r-- | host/include/uhd/rfnoc/blocks/fft_1x64.yml | 3 | ||||
| -rw-r--r-- | host/include/uhd/rfnoc/blocks/null_src_sink.yml | 3 |
2 files changed, 6 insertions, 0 deletions
diff --git a/host/include/uhd/rfnoc/blocks/fft_1x64.yml b/host/include/uhd/rfnoc/blocks/fft_1x64.yml index 090e4e507..488d9b7c4 100644 --- a/host/include/uhd/rfnoc/blocks/fft_1x64.yml +++ b/host/include/uhd/rfnoc/blocks/fft_1x64.yml @@ -4,6 +4,9 @@ version: 1.0 rfnoc_version: 1.0 chdr_width: 64 noc_id: 0xFF700000 +# Provide a custom path to Makefile.srcs for this block relative to the +# FPGA repository +makefile_srcs: "${fpga_lib_dir}/blocks/rfnoc_block_fft/Makefile.srcs" clocks: - name: rfnoc_chdr diff --git a/host/include/uhd/rfnoc/blocks/null_src_sink.yml b/host/include/uhd/rfnoc/blocks/null_src_sink.yml index 1636ea046..b285201b1 100644 --- a/host/include/uhd/rfnoc/blocks/null_src_sink.yml +++ b/host/include/uhd/rfnoc/blocks/null_src_sink.yml @@ -4,6 +4,9 @@ version: 1.0 rfnoc_version: 1.0 chdr_width: 64 noc_id: 0x1 +# Provide a custom path to Makefile.srcs for this block relative to the +# FPGA repository +makefile_srcs: "${fpga_lib_dir}/blocks/rfnoc_block_null_src_sink/Makefile.srcs" clocks: - name: rfnoc_chdr |