From d0b0710368fbf75b14057b4c921763c3ef6198d4 Mon Sep 17 00:00:00 2001
From: Zanting <zanting>
Date: Wed, 12 Aug 2015 08:52:41 +0000
Subject: [PATCH] Changed register constants to be inline with new DDR
controller setup
---
.../src/vhdl/unb1_board_peripherals_pkg.vhd | 20 +++++++++++++++----
1 file changed, 16 insertions(+), 4 deletions(-)
diff --git a/boards/uniboard1/libraries/unb1_board/src/vhdl/unb1_board_peripherals_pkg.vhd b/boards/uniboard1/libraries/unb1_board/src/vhdl/unb1_board_peripherals_pkg.vhd
index cc30d0a045..79b4c37a20 100644
--- a/boards/uniboard1/libraries/unb1_board/src/vhdl/unb1_board_peripherals_pkg.vhd
+++ b/boards/uniboard1/libraries/unb1_board/src/vhdl/unb1_board_peripherals_pkg.vhd
@@ -87,9 +87,12 @@ PACKAGE unb1_board_peripherals_pkg IS
-- pi_remu
reg_remu_adr_w : NATURAL; -- = 3 -- fixed, from c_mm_reg in remu_reg
- -- pi_ddr3
+ -- pi_ddr
-- pi_ddr_capture (uses DP-MM read FIFO for data access)
- reg_ddr3_adr_w : NATURAL; -- = 3 -- fixed, from c_mm_reg in ddr3_reg
+ reg_ddr_adr_w : NATURAL; -- = 3 -- fixed, from c_mm_reg in ddr_reg
+
+ -- pi_io_ddr
+ reg_io_ddr_adr_w : NATURAL; -- = 16 -- fixed, from c_mm_reg in io_ddr (3) and in io_ddr_reg (8) that get multiplexed in on addresses 0..2, 8..15
-- pi_tr_nonbonded
reg_tr_nonbonded_adr_w : NATURAL; -- = 4 -- fixed, from c_mm_reg in tr_nonbonded_reg
@@ -136,7 +139,13 @@ PACKAGE unb1_board_peripherals_pkg IS
-- pi_diag_block_gen (defaults when used with the BF for Apertif)
reg_diag_bg_adr_w : NATURAL; -- = 3
ram_diag_bg_adr_w : NATURAL; -- = 11 -- = ceil_log2(c_bf.nof_subbands*c_bf.nof_signal_paths/c_bf.nof_input_streams = 24*64/16 = 96) + ceil_log2(c_bf.nof_input_streams = 16)
-
+
+ -- pi_diag_tx_seq.py
+ reg_diag_tx_seq_w : NATURAL; -- = 2
+
+ -- pi_diag_tx_seq.py
+ reg_diag_rx_seq_w : NATURAL; -- = 3
+
-- pi_bf_bf (defaults for the BF for Apertif)
reg_bf_offsets_adr_w : NATURAL; -- = 5 -- = ceil_log2(c_bf.nof_offsets = 6) + ceil_log2(c_bf.nof_bf_units = 4)
ram_bf_weights_adr_w : NATURAL; -- = 16 -- = ceil_log2(c_bf.nof_bf_units*c_bf.nof_signal_paths*c_bf.nof_weights = 4 * 64 * 256 = 65536)
@@ -144,9 +153,12 @@ PACKAGE unb1_board_peripherals_pkg IS
-- pi_mdio
reg_mdio_adr_w : NATURAL; -- = 3
+
+ -- dp_offload
+ reg_dp_offload_tx_adr_w : NATURAL; -- = 1
END RECORD;
- CONSTANT c_unb1_board_peripherals_mm_reg_default : t_c_unb1_board_peripherals_mm_reg := (TRUE, 10, 4, 10, 5, 10, 1, 1, 3, 1, 1, 1, 1, 1, 3, 3, 3, 4, 6, 2, 2, 1, 4, 3, 6, 13, 12, 2, 32, 8, 2, 8, 10, 16, 1024, 14, 5, 3, 11, 5, 16, 11, 3);
+ CONSTANT c_unb1_board_peripherals_mm_reg_default : t_c_unb1_board_peripherals_mm_reg := (TRUE, 10, 4, 10, 5, 10, 1, 1, 3, 1, 1, 1, 1, 1, 3, 3, 3, 16, 4, 6, 2, 2, 1, 4, 3, 6, 13, 12, 2, 32, 8, 2, 8, 10, 16, 1024, 14, 5, 3, 11, 2, 3, 5, 16, 11, 3, 1);
END unb1_board_peripherals_pkg;
--
GitLab