Merge branch 'main' into switch_pdk
diff --git a/Makefile b/Makefile
index efe9ded..2e99d6d 100644
--- a/Makefile
+++ b/Makefile
@@ -21,9 +21,12 @@
SIM?=RTL
export SKYWATER_COMMIT=c094b6e83a4f9298e47f696ec5a7fd53535ec5eb
-export OPEN_PDKS_COMMIT=7519dfb04400f224f140749cda44ee7de6f5e095
+export OPEN_PDKS_COMMIT?=7519dfb04400f224f140749cda44ee7de6f5e095
export PDK_MAGIC_COMMIT=7d601628e4e05fd17fcb80c3552dacb64e9f6e7b
export OPENLANE_TAG=2022.02.23_02.50.41
+export MISMATCHES_OK=1
+export PDKPATH?=$(PDK_ROOT)/sky130A
+export PDK?=sky130A
# Install lite version of caravel, (1): caravel-lite, (0): caravel
CARAVEL_LITE?=1
@@ -31,7 +34,7 @@
# PDK switch varient
export PDK?=sky130B
-MPW_TAG ?= test-6a
+MPW_TAG ?= mpw-6c
ifeq ($(CARAVEL_LITE),1)
CARAVEL_NAME := caravel-lite
@@ -179,8 +182,14 @@
run-precheck: check-pdk check-precheck
$(eval INPUT_DIRECTORY := $(shell pwd))
cd $(PRECHECK_ROOT) && \
- docker run -v $(PRECHECK_ROOT):$(PRECHECK_ROOT) -v $(INPUT_DIRECTORY):$(INPUT_DIRECTORY) -v $(PDK_ROOT):$(PDK_ROOT) -e INPUT_DIRECTORY=$(INPUT_DIRECTORY) -e PDK_ROOT=$(PDK_ROOT) \
- -u $(shell id -u $(USER)):$(shell id -g $(USER)) efabless/mpw_precheck:latest bash -c "cd $(PRECHECK_ROOT) ; python3 mpw_precheck.py --input_directory $(INPUT_DIRECTORY) --pdk_root $(PDK_ROOT)"
+ docker run -v $(PRECHECK_ROOT):$(PRECHECK_ROOT) \
+ -v $(INPUT_DIRECTORY):$(INPUT_DIRECTORY) \
+ -v $(PDK_ROOT):$(PDK_ROOT) \
+ -e INPUT_DIRECTORY=$(INPUT_DIRECTORY) \
+ -e PDK_ROOT=$(PDK_ROOT) \
+ -e PDKPATH=$(PDKPATH) \
+ -u $(shell id -u $(USER)):$(shell id -g $(USER)) \
+ efabless/mpw_precheck:latest bash -c "cd $(PRECHECK_ROOT) ; python3 mpw_precheck.py --input_directory $(INPUT_DIRECTORY) --pdk_root $(PDK_ROOT)"
diff --git a/docs/source/index.rst b/docs/source/index.rst
index 9bcf741..e756a3f 100644
--- a/docs/source/index.rst
+++ b/docs/source/index.rst
@@ -171,11 +171,9 @@
# set PDK_ROOT to the path you wish to use for the pdk
export PDK_ROOT=<pdk-installation-path>
-
- # set the OPENLANE_ROOT to the openlane installation path
- export OPENLANE_ROOT=<openlane-installation-path>
# use volare to download the pdk
+ # To change the default pdk version you can export OPEN_PDKS_COMMIT=<pdk_commit>
make pdk-with-volare
Running Full Chip Simulation
diff --git a/docs/source/quickstart.rst b/docs/source/quickstart.rst
index e538e7e..3ca86c0 100644
--- a/docs/source/quickstart.rst
+++ b/docs/source/quickstart.rst
@@ -53,7 +53,7 @@
.. code:: bash
# Make sure that "caravel_example" matches the empty github repo name in step 1
- git clone -b mpw-6a https://github.com/efabless/caravel_user_project caravel_example
+ git clone -b mpw-6b https://github.com/efabless/caravel_user_project caravel_example
cd caravel_example
git remote rename origin upstream
