docker images hardcoded and pdk path local docker path/opt/pdk
diff --git a/Makefile b/Makefile
index e097b0f..4570335 100644
--- a/Makefile
+++ b/Makefile
@@ -55,24 +55,14 @@
PATTERNS=$(shell cd verilog/dv && find * -maxdepth 0 -type d)
DV_PATTERNS = $(foreach dv, $(PATTERNS), verify-$(dv))
TARGET_PATH=$(shell pwd)
-PDK_PATH=${PDK_ROOT}/sky130A
VERIFY_COMMAND="cd ${TARGET_PATH}/verilog/dv/$* && export SIM=${SIM} DUMP=${DUMP} && make"
$(DV_PATTERNS): verify-% : ./verilog/dv/%
- @if [ ! -d "$(PDK_ROOT)" ]; then \
- docker run -v ${TARGET_PATH}:${TARGET_PATH} \
+ docker run -v ${TARGET_PATH}:${TARGET_PATH} \
-v ${CARAVEL_ROOT}:${CARAVEL_ROOT} \
-e TARGET_PATH=${TARGET_PATH} \
-e CARAVEL_ROOT=${CARAVEL_ROOT} \
-u $(id -u $$USER):$(id -g $$USER) dineshannayya/dv_setup:latest \
- sh -c $(VERIFY_COMMAND); \
- else \
- docker run -v ${TARGET_PATH}:${TARGET_PATH} -v ${PDK_PATH}:${PDK_PATH} \
- -v ${CARAVEL_ROOT}:${CARAVEL_ROOT} \
- -e TARGET_PATH=${TARGET_PATH} -e PDK_PATH=${PDK_PATH} \
- -e CARAVEL_ROOT=${CARAVEL_ROOT} \
- -u $(id -u $$USER):$(id -g $$USER) dineshannayya/dv_setup:latest \
- sh -c $(VERIFY_COMMAND); \
- fi
+ sh -c $(VERIFY_COMMAND)
# Openlane Makefile Targets
BLOCKS = $(shell cd openlane && find * -maxdepth 0 -type d)
diff --git a/openlane/Makefile b/openlane/Makefile
index 62637fe..928af55 100644
--- a/openlane/Makefile
+++ b/openlane/Makefile
@@ -14,12 +14,13 @@
#
# SPDX-License-Identifier: Apache-2.0
+#SHELL = sh -xv
BLOCKS = $(shell find * -maxdepth 0 -type d)
CONFIG = $(foreach block,$(BLOCKS), ./$(block)/config.tcl)
CLEAN = $(foreach block,$(BLOCKS), clean-$(block))
-OPENLANE_TAG ?= 2021.09.19_20.25.16
-OPENLANE_IMAGE_NAME ?= efabless/openlane:$(OPENLANE_TAG)
+OPENLANE_TAG = mpw3
+OPENLANE_IMAGE_NAME ?= dineshannayya/openlane:$(OPENLANE_TAG)
OPENLANE_BASIC_COMMAND = "cd /project/openlane && flow.tcl -design ./$* -save_path .. -save -tag $* -overwrite"
OPENLANE_INTERACTIVE_COMMAND = "cd /project/openlane && flow.tcl -it -file ./$*/interactive.tcl -design ./$* -save_path .. -save -tag $* -overwrite"
@@ -30,32 +31,29 @@
@exit 1
$(BLOCKS) : % : ./%/config.tcl FORCE
-ifeq ($(OPENLANE_ROOT),)
- @echo "Please export OPENLANE_ROOT"
- @exit 1
-endif
-ifeq ($(PDK_ROOT),)
- @echo "Please export PDK_ROOT"
- @exit 1
-endif
+#ifeq ($(OPENLANE_ROOT),)
+# @echo "Please export OPENLANE_ROOT"
+# @exit 1
+#endif
+#ifeq ($(PDK_ROOT),)
+# @echo "Please export PDK_ROOT"
+# @exit 1
+#endif
@echo "###############################################"
@sleep 1
@if [ -f ./$*/interactive.tcl ]; then\
- docker run -it -v $(OPENLANE_ROOT):/openLANE_flow \
+ docker run -it \
-v $(PDK_ROOT):$(PDK_ROOT) \
-v $(PWD)/..:/project \
-v $(CARAVEL_ROOT):$(CARAVEL_ROOT) \
- -e PDK_ROOT=$(PDK_ROOT) \
-e CARAVEL_ROOT=$(CARAVEL_ROOT) \
-u $(shell id -u $(USER)):$(shell id -g $(USER)) \
$(OPENLANE_IMAGE_NAME) sh -c $(OPENLANE_INTERACTIVE_COMMAND);\
else\
- docker run -it -v $(OPENLANE_ROOT):/openLANE_flow \
- -v $(PDK_ROOT):$(PDK_ROOT) \
+ docker run -it \
-v $(PWD)/..:/project \
-v $(CARAVEL_ROOT):$(CARAVEL_ROOT) \
- -e PDK_ROOT=$(PDK_ROOT) \
-e CARAVEL_ROOT=$(CARAVEL_ROOT) \
-u $(shell id -u $(USER)):$(shell id -g $(USER)) \
$(OPENLANE_IMAGE_NAME) sh -c $(OPENLANE_BASIC_COMMAND);\
