commit 8b57d5b83429f392f76cac424922e405bbb8b413
author Timothy Chen <timothytim@google.com> Fri Sep 27 09:31:33 2019 -0700
committer tjaychen <timothytim@google.com> Fri Sep 27 17:07:22 2019 -0700
tree ccaa6d155e5de15546f3c6774caffa4fe4496a60
parent 6d98ce1227c857bc60072566dbb1c990981d9362

Switch Multireg count to localparams

hw/ip/flash_ctrl/doc/flash_ctrl.hjson

diff --git a/hw/ip/flash_ctrl/doc/flash_ctrl.hjson b/hw/ip/flash_ctrl/doc/flash_ctrl.hjson
index efaed29..22be616 100644
--- a/hw/ip/flash_ctrl/doc/flash_ctrl.hjson
+++ b/hw/ip/flash_ctrl/doc/flash_ctrl.hjson
@@ -12,6 +12,22 @@
     { name: "op_done",    desc: "Operation complete" },
     { name: "op_error",   desc: "Operation failed with error" },
   ],
+
+  param_list: [
+    { name: "NumBanks",
+      desc: "Number of flash banks",
+      type: "int",
+      default: "2",
+      local: "true"
+    },
+    { name: "NumRegions",
+      desc: "Number of configurable flash regions",
+      type: "int",
+      default: "8",
+      local: "true"
+    },
+  ],
+
   regwidth: "32",
   registers: [
     { name: "CONTROL",
@@ -119,7 +135,7 @@
         cname: "FLASH_CTRL",
         name: "REGION_CFG_REGWEN"
         desc: "Memory region registers configuration enable.",
-        count: 8,
+        count: "NumRegions",
         swaccess: "rw0c",
         hwaccess: "none",
         fields: [
@@ -150,7 +166,7 @@
         cname: "FLASH_CTRL",
         name: "MP_REGION_CFG",
         desc: "Memory protection configuration",
-        count: 8,
+        count: "NumRegions",
         swaccess: "rw",
         hwaccess: "hro",
         regwen: "REGION_CFG_REGWEN_REGION",
@@ -236,7 +252,7 @@
         cname: "FLASH_CTRL",
         name: "BANK_CFG_REGWEN"
         desc: "Bank configuration registers configuration enable.",
-        count: 2,
+        count: "NumBanks",
         swaccess: "rw0c",
         hwaccess: "none",
         fields: [
@@ -267,7 +283,7 @@
         cname: "FLASH_CTRL",
         name: "MP_BANK_CFG",
         desc: "Memory protect bank configuration",
-        count: 2,
+        count: "NumBanks",
         swaccess: "rw",
         hwaccess: "hro",
         regwen: "BANK_CFG_REGWEN_BANK"

hw/ip/flash_ctrl/rtl/flash_ctrl_reg_pkg.sv

diff --git a/hw/ip/flash_ctrl/rtl/flash_ctrl_reg_pkg.sv b/hw/ip/flash_ctrl/rtl/flash_ctrl_reg_pkg.sv
index 9a68b92..763e8c7 100644
--- a/hw/ip/flash_ctrl/rtl/flash_ctrl_reg_pkg.sv
+++ b/hw/ip/flash_ctrl/rtl/flash_ctrl_reg_pkg.sv
@@ -7,10 +7,8 @@
 package flash_ctrl_reg_pkg;
 
   // Param list
-  localparam int REGION_CFG_REGWEN = 8;
-  localparam int MP_REGION_CFG = 8;
-  localparam int BANK_CFG_REGWEN = 2;
-  localparam int MP_BANK_CFG = 2;
+  localparam int NumBanks = 2;
+  localparam int NumRegions = 8;
 
 // Register to internal design logic
 typedef struct packed {