From 35ba31630a83b94137497be08bc614b13153b6ac Mon Sep 17 00:00:00 2001
From: Erik Kooistra <kooistra@astron.nl>
Date: Wed, 25 Mar 2015 15:34:55 +0000
Subject: [PATCH] Use external DDR memory model in top level test bench,
instead of the internal DDR memory model in tech_ddr.
---
.../unb1_reorder/src/vhdl/node_unb1_reorder.vhd | 4 ++--
.../unb1_reorder/tb/vhdl/tb_unb1_reorder.vhd | 16 +++++++++++++++-
2 files changed, 17 insertions(+), 3 deletions(-)
diff --git a/applications/unb1_reorder/src/vhdl/node_unb1_reorder.vhd b/applications/unb1_reorder/src/vhdl/node_unb1_reorder.vhd
index 0998a2ba45..7b84e5acf3 100644
--- a/applications/unb1_reorder/src/vhdl/node_unb1_reorder.vhd
+++ b/applications/unb1_reorder/src/vhdl/node_unb1_reorder.vhd
@@ -163,9 +163,9 @@ BEGIN
u_ddr_mem_ctrl : ENTITY io_ddr_lib.io_ddr
GENERIC MAP(
- g_sim => g_sim,
g_technology => g_tech_select_default,
- g_tech_ddr => c_tech_ddr,
+ g_tech_ddr => c_tech_ddr,
+ g_use_ddr_memory_model => FALSE,
g_cross_domain_dvr_ctlr => FALSE,
g_wr_data_w => c_wr_data_w,
g_wr_fifo_depth => c_wr_fifo_depth,
diff --git a/applications/unb1_reorder/tb/vhdl/tb_unb1_reorder.vhd b/applications/unb1_reorder/tb/vhdl/tb_unb1_reorder.vhd
index a10576812c..8ca33028b5 100644
--- a/applications/unb1_reorder/tb/vhdl/tb_unb1_reorder.vhd
+++ b/applications/unb1_reorder/tb/vhdl/tb_unb1_reorder.vhd
@@ -140,7 +140,8 @@ BEGIN
GENERIC MAP (
g_sim => c_sim,
g_sim_unb_nr => c_unb_nr,
- g_sim_node_nr => c_node_nr
+ g_sim_node_nr => c_node_nr,
+ g_tech_ddr => c_ddr
)
PORT MAP (
-- GENERAL
@@ -169,6 +170,19 @@ BEGIN
);
+ ------------------------------------------------------------------------------
+ -- DDR3 memory model
+ ------------------------------------------------------------------------------
+ u_tech_ddr_memory_model : ENTITY tech_ddr_lib.tech_ddr_memory_model
+ GENERIC MAP (
+ g_sim => TRUE,
+ g_tech_ddr => c_ddr
+ )
+ PORT MAP (
+ mem_in => phy_ou(0),
+ mem_io => phy_io(0)
+ );
+
------------------------------------------------------------------------------
-- UniBoard sensors
------------------------------------------------------------------------------
--
GitLab