From 72e833e7bb71b2b2891ef5b07ada5aaf856a266a Mon Sep 17 00:00:00 2001 From: Wade Fife Date: Fri, 8 Nov 2019 10:32:48 -0600 Subject: rfnoc: Replace DDC/DUC YAML variants with single version --- host/include/uhd/rfnoc/blocks/ddc.yml | 56 ++++++++++++++++++++++++ host/include/uhd/rfnoc/blocks/ddc_1x64.yml | 56 ------------------------ host/include/uhd/rfnoc/blocks/ddc_2x64.yml | 68 ------------------------------ host/include/uhd/rfnoc/blocks/duc.yml | 56 ++++++++++++++++++++++++ host/include/uhd/rfnoc/blocks/duc_1x64.yml | 54 ------------------------ host/include/uhd/rfnoc/blocks/duc_2x64.yml | 68 ------------------------------ 6 files changed, 112 insertions(+), 246 deletions(-) create mode 100644 host/include/uhd/rfnoc/blocks/ddc.yml delete mode 100644 host/include/uhd/rfnoc/blocks/ddc_1x64.yml delete mode 100644 host/include/uhd/rfnoc/blocks/ddc_2x64.yml create mode 100644 host/include/uhd/rfnoc/blocks/duc.yml delete mode 100644 host/include/uhd/rfnoc/blocks/duc_1x64.yml delete mode 100644 host/include/uhd/rfnoc/blocks/duc_2x64.yml (limited to 'host/include') diff --git a/host/include/uhd/rfnoc/blocks/ddc.yml b/host/include/uhd/rfnoc/blocks/ddc.yml new file mode 100644 index 000000000..86b2ebe89 --- /dev/null +++ b/host/include/uhd/rfnoc/blocks/ddc.yml @@ -0,0 +1,56 @@ +schema: rfnoc_modtool_args +module_name: ddc +version: 1.0 +rfnoc_version: 1.0 +chdr_width: 64 +noc_id: 0xDDC00000 + +parameters: + NUM_PORTS: 1 + NUM_HB: 3 + CIC_MAX_DECIM: 255 + +clocks: + - name: rfnoc_chdr + freq: "[]" + - name: rfnoc_ctrl + freq: "[]" + - name: ce + freq: "[]" + +control: + sw_iface: nocscript + fpga_iface: ctrlport + interface_direction: slave + fifo_depth: 32 + clk_domain: ce + ctrlport: + byte_mode: False + timed: False + has_status: False + +data: + fpga_iface: axis_data + clk_domain: ce + inputs: + in: + num_ports: NUM_PORTS + item_width: 32 + nipc: 1 + info_fifo_depth: 32 + payload_fifo_depth: MTU + format: int32 + mdata_sig: ~ + outputs: + out: + num_ports: NUM_PORTS + item_width: 32 + nipc: 1 + info_fifo_depth: 32 + payload_fifo_depth: MTU + format: int32 + mdata_sig: ~ + +registers: + +properties: diff --git a/host/include/uhd/rfnoc/blocks/ddc_1x64.yml b/host/include/uhd/rfnoc/blocks/ddc_1x64.yml deleted file mode 100644 index bfdbca04f..000000000 --- a/host/include/uhd/rfnoc/blocks/ddc_1x64.yml +++ /dev/null @@ -1,56 +0,0 @@ -schema: rfnoc_modtool_args -module_name: ddc -version: 1.0 -rfnoc_version: 1.0 -chdr_width: 64 -noc_id: 0xDDC00000 - -parameters: - NUM_PORTS: 1 - NUM_HB: 3 - CIC_MAX_DECIM: 255 - -clocks: - - name: rfnoc_chdr - freq: "[]" - - name: rfnoc_ctrl - freq: "[]" - - name: ce - freq: "[]" - -control: - sw_iface: nocscript - fpga_iface: ctrlport - interface_direction: slave - fifo_depth: 32 - clk_domain: ce - ctrlport: - byte_mode: False - timed: False - has_status: False - -data: - fpga_iface: axis_data - clk_domain: ce - inputs: - in_0: - num_ports: NUM_PORTS - item_width: 32 - nipc: 1 - info_fifo_depth: 5 - payload_fifo_depth: MTU - format: int32 - mdata_sig: ~ - outputs: - out_0: - num_ports: NUM_PORTS - item_width: 32 - nipc: 1 - info_fifo_depth: 5 - payload_fifo_depth: MTU - format: int32 - mdata_sig: ~ - -registers: - -properties: diff --git a/host/include/uhd/rfnoc/blocks/ddc_2x64.yml b/host/include/uhd/rfnoc/blocks/ddc_2x64.yml deleted file mode 100644 index 2aa864b3a..000000000 --- a/host/include/uhd/rfnoc/blocks/ddc_2x64.yml +++ /dev/null @@ -1,68 +0,0 @@ -schema: rfnoc_modtool_args -module_name: ddc -version: 1.0 -rfnoc_version: 1.0 -chdr_width: 64 -noc_id: 0xDDC00000 - -parameters: - NUM_PORTS: 2 - NUM_HB: 3 - CIC_MAX_DECIM: 255 - -clocks: - - name: rfnoc_chdr - freq: "[]" - - name: rfnoc_ctrl - freq: "[]" - - name: ce - freq: "[]" - -control: - sw_iface: nocscript - fpga_iface: ctrlport - interface_direction: slave - fifo_depth: 32 - clk_domain: ce - ctrlport: - byte_mode: False - timed: False - has_status: False - -data: - fpga_iface: axis_data - clk_domain: ce - inputs: - in_0: - item_width: 32 - nipc: 1 - info_fifo_depth: 5 - payload_fifo_depth: MTU - format: int32 - mdata_sig: ~ - in_1: - item_width: 32 - nipc: 1 - info_fifo_depth: 5 - payload_fifo_depth: MTU - format: int32 - mdata_sig: ~ - outputs: - out_0: - item_width: 32 - nipc: 1 - info_fifo_depth: 5 - payload_fifo_depth: MTU - format: int32 - mdata_sig: ~ - out_1: - item_width: 32 - nipc: 1 - info_fifo_depth: 5 - payload_fifo_depth: MTU - format: int32 - mdata_sig: ~ - -registers: - -properties: diff --git a/host/include/uhd/rfnoc/blocks/duc.yml b/host/include/uhd/rfnoc/blocks/duc.yml new file mode 100644 index 000000000..e5cd712ea --- /dev/null +++ b/host/include/uhd/rfnoc/blocks/duc.yml @@ -0,0 +1,56 @@ +schema: rfnoc_modtool_args +module_name: duc +version: 1.0 +rfnoc_version: 1.0 +chdr_width: 64 +noc_id: 0xD0C00000 + +parameters: + NUM_PORTS: 1 + NUM_HB: 3 + CIC_MAX_INTERP: 255 + +clocks: + - name: rfnoc_chdr + freq: "[]" + - name: rfnoc_ctrl + freq: "[]" + - name: ce + freq: "[]" + +control: + sw_iface: nocscript + fpga_iface: ctrlport + interface_direction: slave + fifo_depth: 32 + clk_domain: ce + ctrlport: + byte_mode: False + timed: False + has_status: False + +data: + fpga_iface: axis_data + clk_domain: ce + inputs: + in: + num_ports: NUM_PORTS + item_width: 32 + nipc: 1 + info_fifo_depth: 32 + payload_fifo_depth: MTU + format: int32 + mdata_sig: ~ + outputs: + out: + num_ports: NUM_PORTS + item_width: 32 + nipc: 1 + info_fifo_depth: 32 + payload_fifo_depth: MTU + format: int32 + mdata_sig: ~ + +registers: + +properties: diff --git a/host/include/uhd/rfnoc/blocks/duc_1x64.yml b/host/include/uhd/rfnoc/blocks/duc_1x64.yml deleted file mode 100644 index adcdf1554..000000000 --- a/host/include/uhd/rfnoc/blocks/duc_1x64.yml +++ /dev/null @@ -1,54 +0,0 @@ -schema: rfnoc_modtool_args -module_name: duc -version: 1.0 -rfnoc_version: 1.0 -chdr_width: 64 -noc_id: 0xD0C00000 - -parameters: - NUM_PORTS: 1 - NUM_HB: 3 - CIC_MAX_INTERP: 255 - -clocks: - - name: rfnoc_chdr - freq: "[]" - - name: rfnoc_ctrl - freq: "[]" - - name: ce - freq: "[]" - -control: - sw_iface: nocscript - fpga_iface: ctrlport - interface_direction: slave - fifo_depth: 32 - clk_domain: ce - ctrlport: - byte_mode: False - timed: False - has_status: False - -data: - fpga_iface: axis_data - clk_domain: ce - inputs: - in_0: - item_width: 32 - nipc: 1 - info_fifo_depth: 5 - payload_fifo_depth: MTU - format: int32 - mdata_sig: ~ - outputs: - out_0: - item_width: 32 - nipc: 1 - info_fifo_depth: 5 - payload_fifo_depth: MTU - format: int32 - mdata_sig: ~ - -registers: - -properties: diff --git a/host/include/uhd/rfnoc/blocks/duc_2x64.yml b/host/include/uhd/rfnoc/blocks/duc_2x64.yml deleted file mode 100644 index 7fb88dd22..000000000 --- a/host/include/uhd/rfnoc/blocks/duc_2x64.yml +++ /dev/null @@ -1,68 +0,0 @@ -schema: rfnoc_modtool_args -module_name: duc -version: 1.0 -rfnoc_version: 1.0 -chdr_width: 64 -noc_id: 0xD0C00000 - -parameters: - NUM_PORTS: 2 - NUM_HB: 3 - CIC_MAX_INTERP: 255 - -clocks: - - name: rfnoc_chdr - freq: "[]" - - name: rfnoc_ctrl - freq: "[]" - - name: ce - freq: "[]" - -control: - sw_iface: nocscript - fpga_iface: ctrlport - interface_direction: slave - fifo_depth: 32 - clk_domain: ce - ctrlport: - byte_mode: False - timed: False - has_status: False - -data: - fpga_iface: axis_data - clk_domain: ce - inputs: - in_0: - item_width: 32 - nipc: 1 - info_fifo_depth: 5 - payload_fifo_depth: MTU - format: int32 - mdata_sig: ~ - in_1: - item_width: 32 - nipc: 1 - info_fifo_depth: 5 - payload_fifo_depth: MTU - format: int32 - mdata_sig: ~ - outputs: - out_0: - item_width: 32 - nipc: 1 - info_fifo_depth: 5 - payload_fifo_depth: MTU - format: int32 - mdata_sig: ~ - out_1: - item_width: 32 - nipc: 1 - info_fifo_depth: 5 - payload_fifo_depth: MTU - format: int32 - mdata_sig: ~ - -registers: - -properties: -- cgit v1.2.3