From c793fbb42a7a2a7ce26c3eb229cea0943f6741ba Mon Sep 17 00:00:00 2001 From: Wade Fife Date: Tue, 25 Jan 2022 16:23:23 -0600 Subject: fpga: rfnoc: Remove rfnoc_version from target YAML This causes the latest RFNoC protocol version to be used by default and avoids the need to update YAML files every time the RFNoC protocol version gets bumped. --- fpga/usrp3/top/e31x/e310_rfnoc_image_core.yml | 1 - fpga/usrp3/top/e320/e320_rfnoc_image_core.yml | 1 - fpga/usrp3/top/n3xx/n300_bist_image_core.yml | 1 - fpga/usrp3/top/n3xx/n300_rfnoc_image_core.yml | 1 - fpga/usrp3/top/n3xx/n310_bist_image_core.yml | 1 - fpga/usrp3/top/n3xx/n310_rfnoc_image_core.yml | 1 - fpga/usrp3/top/n3xx/n320_bist_image_core.yml | 1 - fpga/usrp3/top/n3xx/n320_rfnoc_image_core.yml | 1 - fpga/usrp3/top/x300/x300_rfnoc_image_core.yml | 1 - fpga/usrp3/top/x300/x310_rfnoc_image_core.yml | 1 - fpga/usrp3/top/x400/x410_100_rfnoc_image_core.yml | 1 - fpga/usrp3/top/x400/x410_200_rfnoc_image_core.yml | 1 - fpga/usrp3/top/x400/x410_400_128_rfnoc_image_core.yml | 1 - fpga/usrp3/top/x400/x410_400_rfnoc_image_core.yml | 1 - host/examples/rfnoc-example/icores/x310_rfnoc_image_core.yml | 1 - 15 files changed, 15 deletions(-) diff --git a/fpga/usrp3/top/e31x/e310_rfnoc_image_core.yml b/fpga/usrp3/top/e31x/e310_rfnoc_image_core.yml index 24b4db9f7..c2d2b4803 100644 --- a/fpga/usrp3/top/e31x/e310_rfnoc_image_core.yml +++ b/fpga/usrp3/top/e31x/e310_rfnoc_image_core.yml @@ -6,7 +6,6 @@ copyright: >- # Copyright information used in file hea license: >- # License information used in file headers SPDX-License-Identifier: LGPL-3.0-or-later version: '1.0' # File version -rfnoc_version: '1.0' # RFNoC protocol version chdr_width: 64 # Bit width of the CHDR bus for this image device: 'e310' # USRP type image_core_name: 'e310' # Name to use for the RFNoC Image Core files diff --git a/fpga/usrp3/top/e320/e320_rfnoc_image_core.yml b/fpga/usrp3/top/e320/e320_rfnoc_image_core.yml index 277f9b366..8061b1bd2 100644 --- a/fpga/usrp3/top/e320/e320_rfnoc_image_core.yml +++ b/fpga/usrp3/top/e320/e320_rfnoc_image_core.yml @@ -6,7 +6,6 @@ copyright: >- # Copyright information used in file hea license: >- # License information used in file headers SPDX-License-Identifier: LGPL-3.0-or-later version: '1.0' # File version -rfnoc_version: '1.0' # RFNoC protocol version chdr_width: 64 # Bit width of the CHDR bus for this image device: 'e320' default_target: 'E320_1G' diff --git a/fpga/usrp3/top/n3xx/n300_bist_image_core.yml b/fpga/usrp3/top/n3xx/n300_bist_image_core.yml index 34325daeb..372a5608b 100644 --- a/fpga/usrp3/top/n3xx/n300_bist_image_core.yml +++ b/fpga/usrp3/top/n3xx/n300_bist_image_core.yml @@ -6,7 +6,6 @@ copyright: >- # Copyright information used in file hea license: >- # License information used in file headers SPDX-License-Identifier: LGPL-3.0-or-later version: '1.0' # File version -rfnoc_version: '1.0' # RFNoC protocol version chdr_width: 64 # Bit width of the CHDR bus for this image device: 'n300' default_target: 'N300_AA' diff --git a/fpga/usrp3/top/n3xx/n300_rfnoc_image_core.yml b/fpga/usrp3/top/n3xx/n300_rfnoc_image_core.yml index 71ac5a403..198413dae 100644 --- a/fpga/usrp3/top/n3xx/n300_rfnoc_image_core.yml +++ b/fpga/usrp3/top/n3xx/n300_rfnoc_image_core.yml @@ -6,7 +6,6 @@ copyright: >- # Copyright information used in file hea license: >- # License information used in file headers SPDX-License-Identifier: LGPL-3.0-or-later version: '1.0' # File version -rfnoc_version: '1.0' # RFNoC protocol version chdr_width: 64 # Bit width of the CHDR bus for this image device: 'n300' default_target: 'N300_HG' diff --git a/fpga/usrp3/top/n3xx/n310_bist_image_core.yml b/fpga/usrp3/top/n3xx/n310_bist_image_core.yml index fe9ed9169..8f5b56859 100644 --- a/fpga/usrp3/top/n3xx/n310_bist_image_core.yml +++ b/fpga/usrp3/top/n3xx/n310_bist_image_core.yml @@ -6,7 +6,6 @@ copyright: >- # Copyright information used in file hea license: >- # License information used in file headers SPDX-License-Identifier: LGPL-3.0-or-later version: '1.0' # File version -rfnoc_version: '1.0' # RFNoC protocol version chdr_width: 64 # Bit width of the CHDR bus for this block device: 'n310' default_target: 'N310_AA' diff --git a/fpga/usrp3/top/n3xx/n310_rfnoc_image_core.yml b/fpga/usrp3/top/n3xx/n310_rfnoc_image_core.yml index 13fd8cfc0..b38b235f5 100644 --- a/fpga/usrp3/top/n3xx/n310_rfnoc_image_core.yml +++ b/fpga/usrp3/top/n3xx/n310_rfnoc_image_core.yml @@ -6,7 +6,6 @@ copyright: >- # Copyright information used in file hea license: >- # License information used in file headers SPDX-License-Identifier: LGPL-3.0-or-later version: '1.0' # File version -rfnoc_version: '1.0' # RFNoC protocol version chdr_width: 64 # Bit width of the CHDR bus for this image device: 'n310' default_target: 'N310_HG' diff --git a/fpga/usrp3/top/n3xx/n320_bist_image_core.yml b/fpga/usrp3/top/n3xx/n320_bist_image_core.yml index 478440219..0a3c94e51 100644 --- a/fpga/usrp3/top/n3xx/n320_bist_image_core.yml +++ b/fpga/usrp3/top/n3xx/n320_bist_image_core.yml @@ -6,7 +6,6 @@ copyright: >- # Copyright information used in file hea license: >- # License information used in file headers SPDX-License-Identifier: LGPL-3.0-or-later version: '1.0' # File version -rfnoc_version: '1.0' # RFNoC protocol version chdr_width: 64 # Bit width of the CHDR bus for this block device: 'n320' default_target: 'N320_AA' diff --git a/fpga/usrp3/top/n3xx/n320_rfnoc_image_core.yml b/fpga/usrp3/top/n3xx/n320_rfnoc_image_core.yml index 32af29600..4d748488c 100644 --- a/fpga/usrp3/top/n3xx/n320_rfnoc_image_core.yml +++ b/fpga/usrp3/top/n3xx/n320_rfnoc_image_core.yml @@ -6,7 +6,6 @@ copyright: >- # Copyright information used in file hea license: >- # License information used in file headers SPDX-License-Identifier: LGPL-3.0-or-later version: '1.0' # File version -rfnoc_version: '1.0' # RFNoC protocol version chdr_width: 64 # Bit width of the CHDR bus for this image device: 'n320' default_target: 'N320_HG' diff --git a/fpga/usrp3/top/x300/x300_rfnoc_image_core.yml b/fpga/usrp3/top/x300/x300_rfnoc_image_core.yml index acf2deee8..225d9c923 100644 --- a/fpga/usrp3/top/x300/x300_rfnoc_image_core.yml +++ b/fpga/usrp3/top/x300/x300_rfnoc_image_core.yml @@ -6,7 +6,6 @@ copyright: >- # Copyright information used in file hea license: >- # License information used in file headers SPDX-License-Identifier: LGPL-3.0-or-later version: '1.0' # File version -rfnoc_version: '1.0' # RFNoC protocol version chdr_width: 64 # Bit width of the CHDR bus for this image device: 'x300' default_target: 'X300_HG' diff --git a/fpga/usrp3/top/x300/x310_rfnoc_image_core.yml b/fpga/usrp3/top/x300/x310_rfnoc_image_core.yml index d1c37937e..bdd3f117d 100644 --- a/fpga/usrp3/top/x300/x310_rfnoc_image_core.yml +++ b/fpga/usrp3/top/x300/x310_rfnoc_image_core.yml @@ -6,7 +6,6 @@ copyright: >- # Copyright information used in file hea license: >- # License information used in file headers SPDX-License-Identifier: LGPL-3.0-or-later version: '1.0' # File version -rfnoc_version: '1.0' # RFNoC protocol version chdr_width: 64 # Bit width of the CHDR bus for this image device: 'x310' default_target: 'X310_HG' diff --git a/fpga/usrp3/top/x400/x410_100_rfnoc_image_core.yml b/fpga/usrp3/top/x400/x410_100_rfnoc_image_core.yml index 78c0b3cb9..4f79e0aee 100644 --- a/fpga/usrp3/top/x400/x410_100_rfnoc_image_core.yml +++ b/fpga/usrp3/top/x400/x410_100_rfnoc_image_core.yml @@ -6,7 +6,6 @@ copyright: >- # Copyright information used in file hea license: >- # License information used in file headers SPDX-License-Identifier: LGPL-3.0-or-later version: '1.0' # File version -rfnoc_version: '1.0' # RFNoC protocol version chdr_width: 64 # Bit width of the CHDR bus for this image device: 'x410' # USRP type image_core_name: 'x410_100' # Name to use for the RFNoC Image Core files diff --git a/fpga/usrp3/top/x400/x410_200_rfnoc_image_core.yml b/fpga/usrp3/top/x400/x410_200_rfnoc_image_core.yml index f9246dee1..a3ee079b3 100644 --- a/fpga/usrp3/top/x400/x410_200_rfnoc_image_core.yml +++ b/fpga/usrp3/top/x400/x410_200_rfnoc_image_core.yml @@ -6,7 +6,6 @@ copyright: >- # Copyright information used in file hea license: >- # License information used in file headers SPDX-License-Identifier: LGPL-3.0-or-later version: '1.0' # File version -rfnoc_version: '1.0' # RFNoC protocol version chdr_width: 64 # Bit width of the CHDR bus for this image device: 'x410' # USRP type image_core_name: 'x410_200' # Name to use for the RFNoC Image Core files diff --git a/fpga/usrp3/top/x400/x410_400_128_rfnoc_image_core.yml b/fpga/usrp3/top/x400/x410_400_128_rfnoc_image_core.yml index a2a86e6a1..0d7704749 100644 --- a/fpga/usrp3/top/x400/x410_400_128_rfnoc_image_core.yml +++ b/fpga/usrp3/top/x400/x410_400_128_rfnoc_image_core.yml @@ -6,7 +6,6 @@ copyright: >- # Copyright information used in file hea license: >- # License information used in file headers SPDX-License-Identifier: LGPL-3.0-or-later version: '1.0' # File version -rfnoc_version: '1.0' # RFNoC protocol version chdr_width: 128 # Bit width of the CHDR bus for this image device: 'x410' # USRP type image_core_name: 'x410_400_128' # Name to use for the RFNoC Image Core files diff --git a/fpga/usrp3/top/x400/x410_400_rfnoc_image_core.yml b/fpga/usrp3/top/x400/x410_400_rfnoc_image_core.yml index 000d5976a..7c06da3bd 100644 --- a/fpga/usrp3/top/x400/x410_400_rfnoc_image_core.yml +++ b/fpga/usrp3/top/x400/x410_400_rfnoc_image_core.yml @@ -6,7 +6,6 @@ copyright: >- # Copyright information used in file hea license: >- # License information used in file headers SPDX-License-Identifier: LGPL-3.0-or-later version: '1.0' # File version -rfnoc_version: '1.0' # RFNoC protocol version chdr_width: 512 # Bit width of the CHDR bus for this image device: 'x410' # USRP type image_core_name: 'x410_400' # Name to use for the RFNoC Image Core files diff --git a/host/examples/rfnoc-example/icores/x310_rfnoc_image_core.yml b/host/examples/rfnoc-example/icores/x310_rfnoc_image_core.yml index 1286c81a0..b54487a20 100644 --- a/host/examples/rfnoc-example/icores/x310_rfnoc_image_core.yml +++ b/host/examples/rfnoc-example/icores/x310_rfnoc_image_core.yml @@ -6,7 +6,6 @@ copyright: >- # Copyright information used in file hea license: >- # License information used in file headers SPDX-License-Identifier: LGPL-3.0-or-later version: '1.0' # File version (must be string so we can distinguish 1.1 and 1.10) -rfnoc_version: '1.0' # RFNoC protocol version chdr_width: 64 # Bit width of the CHDR bus for this image device: 'x310' default_target: 'X310_HG' -- cgit v1.2.3