One more change in support of EF_FORMAT, to correct one of the patch
files to work with the EF_FORMAT naming convention.
diff --git a/sky130/Makefile.in b/sky130/Makefile.in
index 3aecb93..dfce02b 100644
--- a/sky130/Makefile.in
+++ b/sky130/Makefile.in
@@ -397,6 +397,7 @@
MLXX_SCRIPTS = scripts/sky130_ml_xx_hd
PR_SPICE = spi/sky130_fd_pr
HVL_SPICE = spi/sky130_fd_sc_hvl
+ HVL_PATCH4 = 4b
HVL_CDL = cdl/sky130_fd_sc_hvl
else
IO_VERILOG = sky130_fd_io/verilog
@@ -412,6 +413,7 @@
MLXX_SCRIPTS = sky130_ml_xx_hd/scripts
PR_SPICE = sky130_fd_pr/spice
HVL_SPICE = sky130_fd_sc_hvl/spice
+ HVL_PATCH4 = 4
HVL_CDL = sky130_fd_sc_hvl/cdl
endif
@@ -875,7 +877,7 @@
2>&1 | tee -a ${SKY130A}_make.log || true
# Custom: Patch the HVL library to correct the resistor device names
patch -p3 -f -d ${STAGING_PATH}/${SKY130A}/libs.ref/${HVL_SPICE} \
- < custom/patches/sky130_fd_pr_4.patch \
+ < custom/patches/sky130_fd_pr_${HVL_PATCH4}.patch \
2>&1 | tee -a ${SKY130A}_make.log || true
patch -p3 -f -d ${STAGING_PATH}/${SKY130A}/libs.ref/${HVL_CDL} \
< custom/patches/sky130_fd_pr_6.patch \
diff --git a/sky130/custom/patches/sky130_fd_pr_4b.patch b/sky130/custom/patches/sky130_fd_pr_4b.patch
new file mode 100644
index 0000000..c6f90ac
--- /dev/null
+++ b/sky130/custom/patches/sky130_fd_pr_4b.patch
@@ -0,0 +1,14 @@
+diff -Naur libs.ref/spi/sky130_fd_sc_hvl/sky130_fd_sc_hvl.spi libs.ref.fixed/spi/sky130_fd_sc_hvl/sky130_fd_sc_hvl.spi
+--- libs.ref/spi/sky130_fd_sc_hvl/sky130_fd_sc_hvl.spi 2021-04-27 15:36:47.000000000 -0400
++++ libs.ref.fixed/spi/sky130_fd_sc_hvl/sky130_fd_sc_hvl.spi 2021-04-29 13:47:15.748574423 -0400
+@@ -1860,8 +1860,8 @@
+ .subckt sky130_fd_sc_hvl__schmittbuf_1 A VGND VNB VPB VPWR X
+ X0 a_117_181# A a_231_463# VPB sky130_fd_pr__pfet_g5v0d10v5 w=750000u l=500000u
+ X1 a_117_181# A a_217_207# VNB sky130_fd_pr__nfet_g5v0d10v5 w=420000u l=500000u
+-X2 a_78_463# VGND VNB mrdn_hv w=290000u l=1.355e+06u
+-X3 a_64_207# VPWR VPB mrdp_hv w=290000u l=3.11e+06u
++X2 a_78_463# VGND VNB sky130_fd_pr__res_generic_nd__hv w=290000u l=1.355e+06u
++X3 a_64_207# VPWR VPB sky130_fd_pr__res_generic_pd__hv w=290000u l=3.11e+06u
+ X4 a_231_463# A VPWR VPB sky130_fd_pr__pfet_g5v0d10v5 w=750000u l=500000u
+ X5 a_64_207# a_117_181# a_217_207# VNB sky130_fd_pr__nfet_g5v0d10v5 w=420000u l=500000u
+ X6 VGND a_117_181# X VNB sky130_fd_pr__nfet_g5v0d10v5 w=750000u l=500000u
