Merge branch 'main' of https://github.com/efabless/caravel_user_project into mpw6

Makefile

diff --git a/Makefile b/Makefile
index a648732..6f8e5b8 100644
--- a/Makefile
+++ b/Makefile
@@ -26,11 +26,12 @@
 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
 
-MPW_TAG ?= mpw-6b
+MPW_TAG ?= mpw-6c
 
 ifeq ($(CARAVEL_LITE),1)
 	CARAVEL_NAME := caravel-lite
@@ -85,6 +86,7 @@
 		-e CARAVEL_ROOT=${CARAVEL_ROOT} \
 		-e TOOLS=/opt/riscv32i \
 		-e DESIGNS=$(TARGET_PATH) \
+		-e PDK=$(PDK) \
 		-e CORE_VERILOG_PATH=$(TARGET_PATH)/mgmt_core_wrapper/verilog \
 		-e GCC_PREFIX=riscv32-unknown-elf \
 		-e MCW_ROOT=$(MCW_ROOT) \