From f079e0d204117b53a91da2805d31136607a5ca0e Mon Sep 17 00:00:00 2001 From: David Shah Date: Sat, 16 Jun 2018 12:17:36 +0200 Subject: ice40: Fix BRAM initialisation Signed-off-by: David Shah --- ice40/pack.cc | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'ice40/pack.cc') diff --git a/ice40/pack.cc b/ice40/pack.cc index f4c024da..b9a9fe6d 100644 --- a/ice40/pack.cc +++ b/ice40/pack.cc @@ -129,8 +129,7 @@ static void pack_ram(Design *design) ci->name.str() + "_RAM"); packed_cells.insert(ci->name); new_cells.push_back(packed); - packed->params["READ_MODE"] = ci->params.at("READ_MODE"); - packed->params["WRITE_MODE"] = ci->params.at("WRITE_MODE"); + std::copy(ci->params.begin(), ci->params.end(), std::inserter(packed->params, packed->params.begin())); packed->params["NEG_CLK_W"] = std::to_string(ci->type == "SB_RAM40_4KNW" || ci->type == "SB_RAM40_4KNRNW"); -- cgit v1.2.3 From 7ff1b7e02f7436e03aae6204e4b23f106369ca6b Mon Sep 17 00:00:00 2001 From: David Shah Date: Sat, 16 Jun 2018 14:42:00 +0200 Subject: ice40: Fix RAM config in packer Signed-off-by: David Shah --- ice40/pack.cc | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'ice40/pack.cc') diff --git a/ice40/pack.cc b/ice40/pack.cc index b9a9fe6d..e045c05c 100644 --- a/ice40/pack.cc +++ b/ice40/pack.cc @@ -129,7 +129,8 @@ static void pack_ram(Design *design) ci->name.str() + "_RAM"); packed_cells.insert(ci->name); new_cells.push_back(packed); - std::copy(ci->params.begin(), ci->params.end(), std::inserter(packed->params, packed->params.begin())); + for (auto param : ci->params) + packed->params[param.first] = param.second; packed->params["NEG_CLK_W"] = std::to_string(ci->type == "SB_RAM40_4KNW" || ci->type == "SB_RAM40_4KNRNW"); -- cgit v1.2.3