From d7b4222140137f95651637ffa1e0ab513393c8ea Mon Sep 17 00:00:00 2001
From: Donn <me@donn.website>
Date: Thu, 3 Feb 2022 18:28:36 +0000
Subject: [PATCH 1/2] Update Caravel to `mpw-5a`

Also remove `make pdk-nonnative`.
---
 Makefile              |  9 ++-------
 docs/source/index.rst | 17 +----------------
 2 files changed, 3 insertions(+), 23 deletions(-)

diff --git a/Makefile b/Makefile
index 8e49efa7..c448f844 100644
--- a/Makefile
+++ b/Makefile
@@ -24,11 +24,11 @@ CARAVEL_LITE?=1
 ifeq ($(CARAVEL_LITE),1) 
 	CARAVEL_NAME := caravel-lite
 	CARAVEL_REPO := https://github.com/efabless/caravel-lite
-	CARAVEL_TAG := 'mpw-5'
+	CARAVEL_TAG := 'mpw-5a'
 else
 	CARAVEL_NAME := caravel
 	CARAVEL_REPO := https://github.com/efabless/caravel
-	CARAVEL_TAG := 'mpw-5'
+	CARAVEL_TAG := 'mpw-5a'
 endif
 
 # Include Caravel Makefile Targets
@@ -110,11 +110,6 @@ run-precheck: check-precheck check-pdk check-caravel
 	docker run -e INPUT_DIRECTORY=$(INPUT_DIRECTORY) -e PDK_ROOT=$(PDK_ROOT) -v $(PRECHECK_ROOT):$(PRECHECK_ROOT) -v $(INPUT_DIRECTORY):$(INPUT_DIRECTORY) -v $(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 --pdk_root $(PDK_ROOT) --input_directory $(INPUT_DIRECTORY)"
 
-# Install PDK using OL's Docker Image
-.PHONY: pdk-nonnative
-pdk-nonnative: skywater-pdk skywater-library skywater-timing open_pdks
-	docker run --rm -v $(PDK_ROOT):$(PDK_ROOT) -v $(CARAVEL_ROOT):$(CARAVEL_ROOT) -e CARAVEL_ROOT=$(CARAVEL_ROOT) -e PDK_ROOT=$(PDK_ROOT) -u $(shell id -u $(USER)):$(shell id -g $(USER)) efabless/openlane:current sh -c "cd $(CARAVEL_ROOT); make build-pdk; make gen-sources"
-
 # Clean 
 .PHONY: clean
 clean:
diff --git a/docs/source/index.rst b/docs/source/index.rst
index b5f711d0..77ee7c28 100644
--- a/docs/source/index.rst
+++ b/docs/source/index.rst
@@ -128,11 +128,7 @@ power supply to the circuit.
 Building the PDK 
 ================
 
-You have two options for building the pdk: 
-
-- Build the pdk natively. 
-
-Make sure you have `Magic VLSI Layout Tool <http://opencircuitdesign.com/magic/index.html>`__   `version 8.3.160 <https://github.com/RTimothyEdwards/magic/tree/8.3.160>`__ installed on your machine before building the pdk. 
+Make sure you have `Magic VLSI Layout Tool <http://opencircuitdesign.com/magic/index.html>`__   `version 8.3.265 <https://github.com/RTimothyEdwards/magic/tree/8.3.160>`__ installed on your machine before building the pdk. 
 
 .. code:: bash
 
@@ -145,18 +141,7 @@ Make sure you have `Magic VLSI Layout Tool <http://opencircuitdesign.com/magic/i
 
     make pdk
 
-- Build the pdk using openlane's docker image which has magic installed. 
-
-.. code:: bash
-
-    # set PDK_ROOT to the path you wish to use for the pdk
-    export PDK_ROOT=<pdk-installation-path>
-
-    # you can optionally specify skywater-pdk and open-pdks commit used
-    # by setting and exporting SKYWATER_COMMIT and OPEN_PDKS_COMMIT
-    # if you do not set them, they default to the last verfied commits tested for this project
 
-    make pdk-nonnative
 
 Running Full Chip Simulation
 ============================

From 38f5a2dbc0f277a5218ebab826304f20c0ba41bb Mon Sep 17 00:00:00 2001
From: Donn <me@donn.website>
Date: Thu, 3 Feb 2022 20:29:50 +0200
Subject: [PATCH 2/2] Update index.rst

---
 docs/source/index.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/source/index.rst b/docs/source/index.rst
index 77ee7c28..0a7c0c7d 100644
--- a/docs/source/index.rst
+++ b/docs/source/index.rst
@@ -128,7 +128,7 @@ power supply to the circuit.
 Building the PDK 
 ================
 
-Make sure you have `Magic VLSI Layout Tool <http://opencircuitdesign.com/magic/index.html>`__   `version 8.3.265 <https://github.com/RTimothyEdwards/magic/tree/8.3.160>`__ installed on your machine before building the pdk. 
+Make sure you have `Magic VLSI Layout Tool <http://opencircuitdesign.com/magic/index.html>`__   `version 8.3.265 <https://github.com/RTimothyEdwards/magic/tree/8.3.265>`__ installed on your machine before building the pdk. 
 
 .. code:: bash