3 files changed, 29 insertions, 43 deletions

diff --git a/cad/yosys/Makefile b/cad/yosys/Makefile
index 904ee6f67791..e83388c5c38f 100644
--- a/cad/yosys/Makefile
+++ b/cad/yosys/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	yosys
 DISTVERSIONPREFIX=	yosys-
-DISTVERSION=	0.17
+DISTVERSION=	0.18
 CATEGORIES=	cad
 
 MAINTAINER=	yuri@FreeBSD.org
diff --git a/cad/yosys/distinfo b/cad/yosys/distinfo
index d5a18e9b2add..a4eb43eec087 100644
--- a/cad/yosys/distinfo
+++ b/cad/yosys/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1652131201
-SHA256 (YosysHQ-yosys-yosys-0.17_GH0.tar.gz) = 37db450d08884a7c411f44ddf639284967ed1a39e11cd6b78d816186113d0173
-SIZE (YosysHQ-yosys-yosys-0.17_GH0.tar.gz) = 2260241
+TIMESTAMP = 1654985019
+SHA256 (YosysHQ-yosys-yosys-0.18_GH0.tar.gz) = 63af1b4cca91e6a3cb302e30852d0a0e396fd161471ea17f5f04eddc0f23f5f1
+SIZE (YosysHQ-yosys-yosys-0.18_GH0.tar.gz) = 2318964
diff --git a/cad/yosys/pkg-plist b/cad/yosys/pkg-plist
index 0d804d42c397..f021a4719cbb 100644
--- a/cad/yosys/pkg-plist
+++ b/cad/yosys/pkg-plist
@@ -10,14 +10,10 @@ bin/yosys-smtbmc
 %%DATADIR%%/adff2dff.v
 %%DATADIR%%/anlogic/arith_map.v
 %%DATADIR%%/anlogic/brams.txt
-%%DATADIR%%/anlogic/brams_init_16.vh
-%%DATADIR%%/anlogic/brams_init_8.vh
-%%DATADIR%%/anlogic/brams_init_9.vh
 %%DATADIR%%/anlogic/brams_map.v
 %%DATADIR%%/anlogic/cells_map.v
 %%DATADIR%%/anlogic/cells_sim.v
 %%DATADIR%%/anlogic/eagle_bb.v
-%%DATADIR%%/anlogic/lutram_init_16x4.vh
 %%DATADIR%%/anlogic/lutrams.txt
 %%DATADIR%%/anlogic/lutrams_map.v
 %%DATADIR%%/cells.lib
@@ -30,14 +26,6 @@ bin/yosys-smtbmc
 %%DATADIR%%/coolrunner2/xc2_dff.lib
 %%DATADIR%%/dff2ff.v
 %%DATADIR%%/ecp5/arith_map.v
-%%DATADIR%%/ecp5/bram_conn_1.vh
-%%DATADIR%%/ecp5/bram_conn_18.vh
-%%DATADIR%%/ecp5/bram_conn_2.vh
-%%DATADIR%%/ecp5/bram_conn_36.vh
-%%DATADIR%%/ecp5/bram_conn_4.vh
-%%DATADIR%%/ecp5/bram_conn_9.vh
-%%DATADIR%%/ecp5/bram_init_1_2_4.vh
-%%DATADIR%%/ecp5/bram_init_9_18_36.vh
 %%DATADIR%%/ecp5/brams.txt
 %%DATADIR%%/ecp5/brams_map.v
 %%DATADIR%%/ecp5/cells_bb.v
@@ -68,9 +56,7 @@ bin/yosys-smtbmc
 %%DATADIR%%/gatemate/mux_map.v
 %%DATADIR%%/gatemate/reg_map.v
 %%DATADIR%%/gowin/arith_map.v
-%%DATADIR%%/gowin/bram_init_16.vh
 %%DATADIR%%/gowin/brams.txt
-%%DATADIR%%/gowin/brams_init3.vh
 %%DATADIR%%/gowin/brams_map.v
 %%DATADIR%%/gowin/cells_map.v
 %%DATADIR%%/gowin/cells_sim.v
@@ -87,15 +73,14 @@ bin/yosys-smtbmc
 %%DATADIR%%/ice40/abc9_model.v
 %%DATADIR%%/ice40/arith_map.v
 %%DATADIR%%/ice40/brams.txt
-%%DATADIR%%/ice40/brams_init1.vh
-%%DATADIR%%/ice40/brams_init2.vh
-%%DATADIR%%/ice40/brams_init3.vh
 %%DATADIR%%/ice40/brams_map.v
 %%DATADIR%%/ice40/cells_map.v
 %%DATADIR%%/ice40/cells_sim.v
 %%DATADIR%%/ice40/dsp_map.v
 %%DATADIR%%/ice40/ff_map.v
 %%DATADIR%%/ice40/latches_map.v
+%%DATADIR%%/ice40/spram.txt
+%%DATADIR%%/ice40/spram_map.v
 %%DATADIR%%/include/backends/cxxrtl/cxxrtl.h
 %%DATADIR%%/include/backends/cxxrtl/cxxrtl_capi.cc
 %%DATADIR%%/include/backends/cxxrtl/cxxrtl_capi.h
@@ -165,12 +150,15 @@ bin/yosys-smtbmc
 %%DATADIR%%/intel_alm/common/misc_sim.v
 %%DATADIR%%/intel_alm/common/quartus_rename.v
 %%DATADIR%%/intel_alm/cyclonev/cells_sim.v
+%%DATADIR%%/machxo2/brams.txt
+%%DATADIR%%/machxo2/brams_map.v
 %%DATADIR%%/machxo2/cells_map.v
 %%DATADIR%%/machxo2/cells_sim.v
+%%DATADIR%%/machxo2/lutrams.txt
+%%DATADIR%%/machxo2/lutrams_map.v
 %%DATADIR%%/mul2dsp.v
 %%DATADIR%%/nexus/arith_map.v
 %%DATADIR%%/nexus/brams.txt
-%%DATADIR%%/nexus/brams_init.vh
 %%DATADIR%%/nexus/brams_map.v
 %%DATADIR%%/nexus/cells_map.v
 %%DATADIR%%/nexus/cells_sim.v
@@ -178,7 +166,6 @@ bin/yosys-smtbmc
 %%DATADIR%%/nexus/dsp_map.v
 %%DATADIR%%/nexus/latches_map.v
 %%DATADIR%%/nexus/lrams.txt
-%%DATADIR%%/nexus/lrams_init.vh
 %%DATADIR%%/nexus/lrams_map.v
 %%DATADIR%%/nexus/lutrams.txt
 %%DATADIR%%/nexus/lutrams_map.v
@@ -203,36 +190,35 @@ bin/yosys-smtbmc
 %%DATADIR%%/techmap.v
 %%DATADIR%%/xilinx/abc9_model.v
 %%DATADIR%%/xilinx/arith_map.v
-%%DATADIR%%/xilinx/brams_init_16.vh
-%%DATADIR%%/xilinx/brams_init_18.vh
-%%DATADIR%%/xilinx/brams_init_32.vh
-%%DATADIR%%/xilinx/brams_init_36.vh
-%%DATADIR%%/xilinx/brams_init_8.vh
-%%DATADIR%%/xilinx/brams_init_9.vh
+%%DATADIR%%/xilinx/brams_defs.vh
+%%DATADIR%%/xilinx/brams_xc2v.txt
+%%DATADIR%%/xilinx/brams_xc2v_map.v
+%%DATADIR%%/xilinx/brams_xc3sda.txt
+%%DATADIR%%/xilinx/brams_xc3sda_map.v
+%%DATADIR%%/xilinx/brams_xc4v.txt
+%%DATADIR%%/xilinx/brams_xc4v_map.v
+%%DATADIR%%/xilinx/brams_xc5v_map.v
+%%DATADIR%%/xilinx/brams_xc6v_map.v
+%%DATADIR%%/xilinx/brams_xcu_map.v
+%%DATADIR%%/xilinx/brams_xcv.txt
+%%DATADIR%%/xilinx/brams_xcv_map.v
 %%DATADIR%%/xilinx/cells_map.v
 %%DATADIR%%/xilinx/cells_sim.v
 %%DATADIR%%/xilinx/cells_xtra.v
 %%DATADIR%%/xilinx/ff_map.v
-%%DATADIR%%/xilinx/lut4_lutrams.txt
-%%DATADIR%%/xilinx/lut6_lutrams.txt
 %%DATADIR%%/xilinx/lut_map.v
-%%DATADIR%%/xilinx/lutrams_map.v
+%%DATADIR%%/xilinx/lutrams_xc5v.txt
+%%DATADIR%%/xilinx/lutrams_xc5v_map.v
+%%DATADIR%%/xilinx/lutrams_xcu.txt
+%%DATADIR%%/xilinx/lutrams_xcv.txt
+%%DATADIR%%/xilinx/lutrams_xcv_map.v
 %%DATADIR%%/xilinx/mux_map.v
-%%DATADIR%%/xilinx/xc2v_brams.txt
-%%DATADIR%%/xilinx/xc2v_brams_map.v
+%%DATADIR%%/xilinx/urams.txt
+%%DATADIR%%/xilinx/urams_map.v
 %%DATADIR%%/xilinx/xc3s_mult_map.v
-%%DATADIR%%/xilinx/xc3sa_brams.txt
-%%DATADIR%%/xilinx/xc3sda_brams.txt
 %%DATADIR%%/xilinx/xc3sda_dsp_map.v
 %%DATADIR%%/xilinx/xc4v_dsp_map.v
 %%DATADIR%%/xilinx/xc5v_dsp_map.v
-%%DATADIR%%/xilinx/xc6s_brams.txt
-%%DATADIR%%/xilinx/xc6s_brams_map.v
 %%DATADIR%%/xilinx/xc6s_dsp_map.v
-%%DATADIR%%/xilinx/xc7_brams_map.v
 %%DATADIR%%/xilinx/xc7_dsp_map.v
-%%DATADIR%%/xilinx/xc7_xcu_brams.txt
-%%DATADIR%%/xilinx/xcu_brams_map.v
 %%DATADIR%%/xilinx/xcu_dsp_map.v
-%%DATADIR%%/xilinx/xcup_urams.txt
-%%DATADIR%%/xilinx/xcup_urams_map.v