merge
diff --git a/Makefile b/Makefile index 2b6cc2c..84c0589 100644 --- a/Makefile +++ b/Makefile
@@ -21,17 +21,17 @@ 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 -# PDK switch varient -export PDK?=sky130B - -MPW_TAG ?= test-6a +MPW_TAG ?= mpw-6c ifeq ($(CARAVEL_LITE),1) CARAVEL_NAME := caravel-lite @@ -178,8 +178,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..099afe5 100644 --- a/docs/source/quickstart.rst +++ b/docs/source/quickstart.rst
@@ -36,38 +36,21 @@ --------------------- -#. To start the project you need to first create an empty Git project on Github and make sure your repo is public and includes a README +#. To start the project you first need to create a new repository based on the `caravel_user_project <https://github.com/efabless/caravel_user_project/>`_ template and make sure your repo is public and includes a README. -#. Open your Terminal. Create an empty folder to use as your Caravel workspace, and navigate to it. + * Follow https://github.com/efabless/caravel_user_project/generate to create a new repository. + * Clone the reposity using the following command: .. code:: bash - # Create a directory and call it anything you want - mkdir -p caravel_tutorial - - # navigate into the directory - cd caravel_tutorial - -#. Clone caravel_user_project and setup the git environment as follows - - .. 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 - cd caravel_example - git remote rename origin upstream - - # You need to put your empty github repo URL from step 1 - git remote add origin <your github repo URL> - - # Create a new branch, you can name it anything - git checkout -b <my_branch> - git push -u origin <my_branch> + git clone -b mpw-6c <your github repo URL> caravel_example #. Now that your git environment is setup, it's time to setup your local environment by running. .. code:: bash + cd caravel_example + # make sure to change <directory_name> with the directory you created in step 2 # in this case it is caravel_tutorial export OPENLANE_ROOT=~/<directory_name>/openlane # you need to export this whenever you start a new shell @@ -131,7 +114,7 @@ make precheck make run-precheck -#. You are done! now go to www.efabless.com to submit your project! +#. You are done! now go to https://efabless.com/open_shuttle_program/ to submit your project! .. |License| image:: https://img.shields.io/badge/License-Apache%202.0-blue.svg