[prim] Rename prim_util_memload.sv to svh
prim_util_memload is meant to be only ever included; use the .svh file
suffix to indicate that.
Signed-off-by: Philipp Wagner <phw@lowrisc.org>
diff --git a/hw/ip/prim/prim_util_memload.core b/hw/ip/prim/prim_util_memload.core
index 3b9ad55..0371bd8 100644
--- a/hw/ip/prim/prim_util_memload.core
+++ b/hw/ip/prim/prim_util_memload.core
@@ -8,7 +8,7 @@
filesets:
files_rtl:
files:
- - rtl/prim_util_memload.sv: {is_include_file: true}
+ - rtl/prim_util_memload.svh: {is_include_file: true}
file_type: systemVerilogSource
targets:
diff --git a/hw/ip/prim/rtl/prim_util_memload.sv b/hw/ip/prim/rtl/prim_util_memload.svh
similarity index 100%
rename from hw/ip/prim/rtl/prim_util_memload.sv
rename to hw/ip/prim/rtl/prim_util_memload.svh
diff --git a/hw/ip/prim_generic/rtl/prim_generic_ram_1p.sv b/hw/ip/prim_generic/rtl/prim_generic_ram_1p.sv
index 6c83d3b..f0a046e 100644
--- a/hw/ip/prim_generic/rtl/prim_generic_ram_1p.sv
+++ b/hw/ip/prim_generic/rtl/prim_generic_ram_1p.sv
@@ -57,5 +57,5 @@
end
end
- `include "prim_util_memload.sv"
+ `include "prim_util_memload.svh"
endmodule
diff --git a/hw/ip/prim_generic/rtl/prim_generic_ram_2p.sv b/hw/ip/prim_generic/rtl/prim_generic_ram_2p.sv
index bdbd77d..ec205e7 100644
--- a/hw/ip/prim_generic/rtl/prim_generic_ram_2p.sv
+++ b/hw/ip/prim_generic/rtl/prim_generic_ram_2p.sv
@@ -86,6 +86,6 @@
end
end
- `include "prim_util_memload.sv"
+ `include "prim_util_memload.svh"
endmodule
diff --git a/hw/ip/prim_generic/rtl/prim_generic_rom.sv b/hw/ip/prim_generic/rtl/prim_generic_rom.sv
index 47cb80f..53c9f76 100644
--- a/hw/ip/prim_generic/rtl/prim_generic_rom.sv
+++ b/hw/ip/prim_generic/rtl/prim_generic_rom.sv
@@ -25,7 +25,7 @@
end
end
- `include "prim_util_memload.sv"
+ `include "prim_util_memload.svh"
////////////////
// ASSERTIONS //
diff --git a/util/syn_yosys.sh b/util/syn_yosys.sh
index e6988b0..b02c367 100755
--- a/util/syn_yosys.sh
+++ b/util/syn_yosys.sh
@@ -49,10 +49,6 @@
# drive strengths are not supported by Yosys
sed -i.bak -e "s/VERILATOR/SYNTHESIS/" prim_generic_pad_wrapper.sv
-# prim_util_memload.sv is only meant to be included within a module
-mv prim_util_memload.sv{,h}
-sed -i.bak -e "s/prim_util_memload\.sv/prim_util_memload.svh/" *.sv
-
rm *.sv.bak
sv2v -DSYNTHESIS *.sv +RTS -N4 > combined.v