Merge branch 'develop' of https://github.com/efabless/caravel into develop
Pull because somebody pushed before I could.
diff --git a/Makefile b/Makefile
index a57fe1a..bf31e73 100644
--- a/Makefile
+++ b/Makefile
@@ -47,8 +47,8 @@
STD_CELL_LIBRARY ?= sky130_fd_sc_hd
SPECIAL_VOLTAGE_LIBRARY ?= sky130_fd_sc_hvl
IO_LIBRARY ?= sky130_fd_io
-SKYWATER_COMMIT ?= 3d7617a1acb92ea883539bcf22a632d6361a5de4
-OPEN_PDKS_COMMIT ?= 49fc7125db927de199d1f69e002beadc0a29881b
+SKYWATER_COMMIT ?= f6f76f3dc99526c6fc2cfede19b5b1227d4ebde7
+OPEN_PDKS_COMMIT ?= 145911d09c439cd2a0db1e8d20b05e2dba8027c9
.DEFAULT_GOAL := ship
# We need portable GDS_FILE pointers...
@@ -287,11 +287,13 @@
rm -rf $(PDK_ROOT)/sky130A) || \
true
cd $(PDK_ROOT)/open_pdks && \
- ./configure --enable-sky130-pdk=$(PDK_ROOT)/skywater-pdk/libraries --with-sky130-local-path=$(PDK_ROOT) && \
+ ./configure --enable-alpha-lib --enable-sky130-pdk=$(PDK_ROOT)/skywater-pdk/libraries --with-sky130-local-path=$(PDK_ROOT) && \
cd sky130 && \
+ sed -i 's/REPO_PATH = ~\/gits/REPO_PATH = \$$\(PDK_ROOT\)\/open_pdks\/libs/g' Makefile && \
$(MAKE) veryclean && \
$(MAKE) && \
- $(MAKE) install-local
+ $(MAKE) install-local && \
+ $(MAKE) clean
.RECIPE: manifest
manifest: mag/ maglef/ verilog/rtl/ scripts/ Makefile
