[flash_ctrl] re-name modules for consistency
Signed-off-by: Timothy Chen <timothytim@google.com>
diff --git a/hw/ip/flash_ctrl/flash_ctrl.core b/hw/ip/flash_ctrl/flash_ctrl.core
index b71a213..4252a2a 100644
--- a/hw/ip/flash_ctrl/flash_ctrl.core
+++ b/hw/ip/flash_ctrl/flash_ctrl.core
@@ -17,9 +17,9 @@
- rtl/flash_ctrl_reg_pkg.sv
- rtl/flash_ctrl_reg_top.sv
- rtl/flash_ctrl.sv
- - rtl/flash_erase_ctrl.sv
- - rtl/flash_prog_ctrl.sv
- - rtl/flash_rd_ctrl.sv
+ - rtl/flash_ctrl_erase.sv
+ - rtl/flash_ctrl_prog.sv
+ - rtl/flash_ctrl_rd.sv
- rtl/flash_ctrl_arb.sv
- rtl/flash_ctrl_lcmgr.sv
- rtl/flash_mp.sv
diff --git a/hw/ip/flash_ctrl/rtl/flash_ctrl.sv b/hw/ip/flash_ctrl/rtl/flash_ctrl.sv
index 797a58a..96f113d 100644
--- a/hw/ip/flash_ctrl/rtl/flash_ctrl.sv
+++ b/hw/ip/flash_ctrl/rtl/flash_ctrl.sv
@@ -294,10 +294,10 @@
);
// Program handler is consumer of prog_fifo
- flash_prog_ctrl #(
+ flash_ctrl_prog #(
.DataW(BusWidth),
.AddrW(BusAddrW)
- ) u_flash_prog_ctrl (
+ ) u_flash_ctrl_prog (
.clk_i,
.rst_ni,
@@ -373,10 +373,10 @@
);
// Read handler is consumer of rd_fifo
- flash_rd_ctrl #(
+ flash_ctrl_rd #(
.DataW(BusWidth),
.AddrW(BusAddrW)
- ) u_flash_rd_ctrl (
+ ) u_flash_ctrl_rd (
.clk_i,
.rst_ni,
@@ -402,12 +402,12 @@
);
// Erase handler does not consume fifo
- flash_erase_ctrl #(
+ flash_ctrl_erase #(
.AddrW(BusAddrW),
.PagesPerBank(PagesPerBank),
.WordsPerPage(BusWordsPerPage),
.EraseBitWidth(EraseBitWidth)
- ) u_flash_erase_ctrl (
+ ) u_flash_ctrl_erase (
// Software Interface
.op_start_i (op_start & erase_op),
.op_type_i (op_erase_type),
diff --git a/hw/ip/flash_ctrl/rtl/flash_erase_ctrl.sv b/hw/ip/flash_ctrl/rtl/flash_ctrl_erase.sv
similarity index 96%
rename from hw/ip/flash_ctrl/rtl/flash_erase_ctrl.sv
rename to hw/ip/flash_ctrl/rtl/flash_ctrl_erase.sv
index 4c12b0a..cd3363f 100644
--- a/hw/ip/flash_ctrl/rtl/flash_erase_ctrl.sv
+++ b/hw/ip/flash_ctrl/rtl/flash_ctrl_erase.sv
@@ -5,7 +5,7 @@
// Faux Flash Erase Control
//
-module flash_erase_ctrl #(
+module flash_ctrl_erase #(
parameter int AddrW = 10,
parameter int WordsPerPage = 256,
parameter int PagesPerBank = 256,
@@ -56,4 +56,4 @@
logic [WordsBitWidth-1:0] unused_addr_i;
assign unused_addr_i = op_addr_i[WordsBitWidth-1:0];
-endmodule // flash_erase_ctrl
+endmodule // flash_ctrl_erase
diff --git a/hw/ip/flash_ctrl/rtl/flash_prog_ctrl.sv b/hw/ip/flash_ctrl/rtl/flash_ctrl_prog.sv
similarity index 97%
rename from hw/ip/flash_ctrl/rtl/flash_prog_ctrl.sv
rename to hw/ip/flash_ctrl/rtl/flash_ctrl_prog.sv
index 7474425..758fa3a 100644
--- a/hw/ip/flash_ctrl/rtl/flash_prog_ctrl.sv
+++ b/hw/ip/flash_ctrl/rtl/flash_ctrl_prog.sv
@@ -5,7 +5,7 @@
// Faux Flash Prog Control
//
-module flash_prog_ctrl #(
+module flash_ctrl_prog #(
parameter int AddrW = 10,
parameter int DataW = 32
) (
@@ -107,4 +107,4 @@
assign flash_ovfl_o = int_addr[AddrW];
assign flash_last_o = flash_req_o & cnt_hit;
-endmodule // flash_prog_ctrl
+endmodule // flash_ctrl_prog
diff --git a/hw/ip/flash_ctrl/rtl/flash_rd_ctrl.sv b/hw/ip/flash_ctrl/rtl/flash_ctrl_rd.sv
similarity index 97%
rename from hw/ip/flash_ctrl/rtl/flash_rd_ctrl.sv
rename to hw/ip/flash_ctrl/rtl/flash_ctrl_rd.sv
index fc9571c..b3b7929 100644
--- a/hw/ip/flash_ctrl/rtl/flash_rd_ctrl.sv
+++ b/hw/ip/flash_ctrl/rtl/flash_ctrl_rd.sv
@@ -5,7 +5,7 @@
// Faux Flash Read Control
//
-module flash_rd_ctrl #(
+module flash_ctrl_rd #(
parameter int AddrW = 10,
parameter int DataW = 32
) (
@@ -112,4 +112,4 @@
assign data_o = err_sel ? {DataW{1'b1}} : flash_data_i;
-endmodule // flash_rd_ctrl
+endmodule // flash_ctrl_rd
