From fd428fae5aa727dd08bd88d4268bf4982f66f413 Mon Sep 17 00:00:00 2001
From: donker <donker@astron.nl>
Date: Fri, 11 Feb 2022 17:47:32 +0100
Subject: [PATCH] L2SDP-592, changed size of epcs and remu rigisters from 24 to
32 bit in aria10 designs
---
.../designs/lofar2_unb2b_adc/lofar2_unb2b_adc.fpga.yaml | 4 ++++
.../lofar2_unb2b_beamformer/lofar2_unb2b_beamformer.fpga.yaml | 4 ++++
.../lofar2_unb2b_filterbank/lofar2_unb2b_filterbank.fpga.yaml | 4 ++++
.../designs/lofar2_unb2b_ring/lofar2_unb2b_ring.fpga.yaml | 4 ++++
.../lofar2_unb2b_sdp_station.fpga.yaml | 4 ++++
.../designs/lofar2_unb2c_ring/lofar2_unb2c_ring.fpga.yaml | 4 ++++
.../lofar2_unb2c_sdp_station.fpga.yaml | 4 ++++
libraries/io/epcs/epcs.peripheral.yaml | 2 +-
8 files changed, 29 insertions(+), 1 deletion(-)
diff --git a/applications/lofar2/designs/lofar2_unb2b_adc/lofar2_unb2b_adc.fpga.yaml b/applications/lofar2/designs/lofar2_unb2b_adc/lofar2_unb2b_adc.fpga.yaml
index 931256ec79..0846344d25 100644
--- a/applications/lofar2/designs/lofar2_unb2b_adc/lofar2_unb2b_adc.fpga.yaml
+++ b/applications/lofar2/designs/lofar2_unb2b_adc/lofar2_unb2b_adc.fpga.yaml
@@ -40,6 +40,8 @@ peripherals:
- PIO_PPS
- peripheral_name: epcs/epcs
+ parameter_overrides:
+ - { name: "g_epcs_addr_w", value: 32 }
mm_port_names:
- REG_EPCS
@@ -54,6 +56,8 @@ peripherals:
- REG_MMDP_DATA
- peripheral_name: remu/remu
+ parameter_overrides:
+ - { name: g_data_w, value: 32 }
mm_port_names:
- REG_REMU
diff --git a/applications/lofar2/designs/lofar2_unb2b_beamformer/lofar2_unb2b_beamformer.fpga.yaml b/applications/lofar2/designs/lofar2_unb2b_beamformer/lofar2_unb2b_beamformer.fpga.yaml
index 3c6ba74af6..657960c434 100644
--- a/applications/lofar2/designs/lofar2_unb2b_beamformer/lofar2_unb2b_beamformer.fpga.yaml
+++ b/applications/lofar2/designs/lofar2_unb2b_beamformer/lofar2_unb2b_beamformer.fpga.yaml
@@ -67,6 +67,8 @@ peripherals:
- PIO_PPS
- peripheral_name: epcs/epcs
+ parameter_overrides:
+ - { name: "g_epcs_addr_w", value: 32 }
mm_port_names:
- REG_EPCS
@@ -81,6 +83,8 @@ peripherals:
- REG_MMDP_DATA
- peripheral_name: remu/remu
+ parameter_overrides:
+ - { name: g_data_w, value: 32 }
mm_port_names:
- REG_REMU
diff --git a/applications/lofar2/designs/lofar2_unb2b_filterbank/lofar2_unb2b_filterbank.fpga.yaml b/applications/lofar2/designs/lofar2_unb2b_filterbank/lofar2_unb2b_filterbank.fpga.yaml
index c7da0c5726..6942eb3619 100644
--- a/applications/lofar2/designs/lofar2_unb2b_filterbank/lofar2_unb2b_filterbank.fpga.yaml
+++ b/applications/lofar2/designs/lofar2_unb2b_filterbank/lofar2_unb2b_filterbank.fpga.yaml
@@ -40,6 +40,8 @@ peripherals:
- PIO_PPS
- peripheral_name: epcs/epcs
+ parameter_overrides:
+ - { name: "g_epcs_addr_w", value: 32 }
mm_port_names:
- REG_EPCS
@@ -54,6 +56,8 @@ peripherals:
- REG_MMDP_DATA
- peripheral_name: remu/remu
+ parameter_overrides:
+ - { name: g_data_w, value: 32 }
mm_port_names:
- REG_REMU
diff --git a/applications/lofar2/designs/lofar2_unb2b_ring/lofar2_unb2b_ring.fpga.yaml b/applications/lofar2/designs/lofar2_unb2b_ring/lofar2_unb2b_ring.fpga.yaml
index 5d68950eda..51766f1eec 100644
--- a/applications/lofar2/designs/lofar2_unb2b_ring/lofar2_unb2b_ring.fpga.yaml
+++ b/applications/lofar2/designs/lofar2_unb2b_ring/lofar2_unb2b_ring.fpga.yaml
@@ -46,6 +46,8 @@ peripherals:
- PIO_PPS
- peripheral_name: epcs/epcs
+ parameter_overrides:
+ - { name: "g_epcs_addr_w", value: 32 }
mm_port_names:
- REG_EPCS
@@ -60,6 +62,8 @@ peripherals:
- REG_MMDP_DATA
- peripheral_name: remu/remu
+ parameter_overrides:
+ - { name: g_data_w, value: 32 }
mm_port_names:
- REG_REMU
diff --git a/applications/lofar2/designs/lofar2_unb2b_sdp_station/lofar2_unb2b_sdp_station.fpga.yaml b/applications/lofar2/designs/lofar2_unb2b_sdp_station/lofar2_unb2b_sdp_station.fpga.yaml
index 0304bd91ce..d712c37ea9 100644
--- a/applications/lofar2/designs/lofar2_unb2b_sdp_station/lofar2_unb2b_sdp_station.fpga.yaml
+++ b/applications/lofar2/designs/lofar2_unb2b_sdp_station/lofar2_unb2b_sdp_station.fpga.yaml
@@ -76,6 +76,8 @@ peripherals:
- PIO_PPS
- peripheral_name: epcs/epcs
+ parameter_overrides:
+ - { name: "g_epcs_addr_w", value: 32 }
mm_port_names:
- REG_EPCS
@@ -90,6 +92,8 @@ peripherals:
- REG_MMDP_DATA
- peripheral_name: remu/remu
+ parameter_overrides:
+ - { name: g_data_w, value: 32 }
mm_port_names:
- REG_REMU
diff --git a/applications/lofar2/designs/lofar2_unb2c_ring/lofar2_unb2c_ring.fpga.yaml b/applications/lofar2/designs/lofar2_unb2c_ring/lofar2_unb2c_ring.fpga.yaml
index b300946134..7ce0a03e8f 100644
--- a/applications/lofar2/designs/lofar2_unb2c_ring/lofar2_unb2c_ring.fpga.yaml
+++ b/applications/lofar2/designs/lofar2_unb2c_ring/lofar2_unb2c_ring.fpga.yaml
@@ -46,6 +46,8 @@ peripherals:
- PIO_PPS
- peripheral_name: epcs/epcs
+ parameter_overrides:
+ - { name: "g_epcs_addr_w", value: 32 }
mm_port_names:
- REG_EPCS
@@ -60,6 +62,8 @@ peripherals:
- REG_MMDP_DATA
- peripheral_name: remu/remu
+ parameter_overrides:
+ - { name: g_data_w, value: 32 }
mm_port_names:
- REG_REMU
diff --git a/applications/lofar2/designs/lofar2_unb2c_sdp_station/lofar2_unb2c_sdp_station.fpga.yaml b/applications/lofar2/designs/lofar2_unb2c_sdp_station/lofar2_unb2c_sdp_station.fpga.yaml
index 0cd431c31c..f6a22135a9 100644
--- a/applications/lofar2/designs/lofar2_unb2c_sdp_station/lofar2_unb2c_sdp_station.fpga.yaml
+++ b/applications/lofar2/designs/lofar2_unb2c_sdp_station/lofar2_unb2c_sdp_station.fpga.yaml
@@ -76,6 +76,8 @@ peripherals:
- PIO_PPS
- peripheral_name: epcs/epcs
+ parameter_overrides:
+ - { name: "g_epcs_addr_w", value: 32 }
mm_port_names:
- REG_EPCS
@@ -90,6 +92,8 @@ peripherals:
- REG_MMDP_DATA
- peripheral_name: remu/remu
+ parameter_overrides:
+ - { name: g_data_w, value: 32 }
mm_port_names:
- REG_REMU
diff --git a/libraries/io/epcs/epcs.peripheral.yaml b/libraries/io/epcs/epcs.peripheral.yaml
index 8a0d28ba86..1d030bb54c 100644
--- a/libraries/io/epcs/epcs.peripheral.yaml
+++ b/libraries/io/epcs/epcs.peripheral.yaml
@@ -28,7 +28,7 @@ peripherals:
- - field_name: addr
field_description: "Address to write to or read from."
address_offset: 0x0
- mm_width: 24
+ mm_width: g_epcs_addr_w
access_mode: WO
- - field_name: rden
--
GitLab