From 899e9354aa550f9d9196fba3250fc9d384d0e46d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tomasz=20W=C5=82ostowski?= <tomasz.wlostowski@cern.ch>
Date: Fri, 9 Feb 2018 11:43:17 +0100
Subject: [PATCH] genrams: expose g_fail_if_init_file_not_found property
---
modules/genrams/genram_pkg.vhd | 14 ++++++++++----
modules/genrams/memory_loader_pkg.vhd | 2 +-
2 files changed, 11 insertions(+), 5 deletions(-)
diff --git a/modules/genrams/genram_pkg.vhd b/modules/genrams/genram_pkg.vhd
index 30e4efee..2eccea81 100644
--- a/modules/genrams/genram_pkg.vhd
+++ b/modules/genrams/genram_pkg.vhd
@@ -6,7 +6,7 @@
-- Author : Tomasz Wlostowski
-- Company : CERN BE-CO-HT
-- Created : 2011-01-25
--- Last update: 2013-10-30
+-- Last update: 2018-02-06
-- Platform :
-- Standard : VHDL'93
-------------------------------------------------------------------------------
@@ -56,7 +56,9 @@ package genram_pkg is
g_size : natural;
g_with_byte_enable : boolean := false;
g_init_file : string := "none";
- g_addr_conflict_resolution : string := "dont_care") ;
+ g_addr_conflict_resolution : string := "dont_care";
+ g_fail_if_file_not_found : boolean := true
+ ) ;
port (
rst_n_i : in std_logic;
clk_i : in std_logic;
@@ -74,7 +76,9 @@ package genram_pkg is
g_with_byte_enable : boolean := false;
g_addr_conflict_resolution : string := "dont_care";
g_init_file : string := "none";
- g_dual_clock : boolean := true);
+ g_dual_clock : boolean := true;
+ g_fail_if_file_not_found : boolean := true
+ );
port (
rst_n_i : in std_logic := '1';
clka_i : in std_logic;
@@ -94,7 +98,9 @@ package genram_pkg is
g_with_byte_enable : boolean := false;
g_addr_conflict_resolution : string := "dont_care";
g_init_file : string := "none";
- g_dual_clock : boolean := true);
+ g_dual_clock : boolean := true;
+ g_fail_if_file_not_found : boolean := true
+ );
port (
rst_n_i : in std_logic := '1';
clka_i : in std_logic;
diff --git a/modules/genrams/memory_loader_pkg.vhd b/modules/genrams/memory_loader_pkg.vhd
index 67e1639d..7759e63e 100644
--- a/modules/genrams/memory_loader_pkg.vhd
+++ b/modules/genrams/memory_loader_pkg.vhd
@@ -37,7 +37,7 @@ package body memory_loader_pkg is
variable mem: t_meminit_array(0 to mem_size-1, mem_width-1 downto 0);
variable status : file_open_status;
begin
- if(file_name = "" or file_name = "none") then
+ if(file_name = "" or file_name(1 to 4) = "none") then
mem:= (others => (others => '0'));
return mem;
end if;
--
GitLab