update harden make target to have the user project wrapper fixed configs separated from the user modifiable configs

Author: passant5

Makefile

@@ -34,7 +34,7 @@ export PDK?=sky130A
 export PDKPATH?=$(PDK_ROOT)/$(PDK)
 
 .PHONY: setup
-setup: check_dependencies install-mcw install-frigate pdk-with-volare setup-cocotb 
+setup: check_dependencies install-mgmt install-frigate pdk-with-volare setup-cocotb 
 
 .PHONY: check_dependencies
 check_dependencies:
@@ -59,8 +59,8 @@ install-volare:
 	./venv/bin/$(PYTHON_BIN) -m pip install --upgrade --no-cache-dir volare
 
 # Include mgmt
-.PHONY: install-mcw
-install-mcw:
+.PHONY: install-mgmt
+install-mgmt:
 	if [ -d "$(MGMT_ROOT)" ]; then\
 		MAKE_DIR="$(PWD)"; \
 		echo "Updating $(MGMT_ROOT)"; \
@@ -117,13 +117,12 @@ echo-var:
 
 
 # Harden with Openlane2
-OPENLANE2_TAG ?= 2.3.3
+OPENLANE2_TAG ?= 2.3.5
 OPENLANE2_IMAGE_NAME ?= efabless/openlane:$(OPENLANE2_TAG)
 OPENLANE2_RUN_TAG = $(shell date '+%y_%m_%d_%H_%M')
 OPENLANE2_USE_NIX ?= 1
 ROOTLESS ?= 0
 USER_ARGS = -u $$(id -u $$USER):$$(id -g $$USER)
-designs = $(shell cd $(PROJECT_ROOT)/openlane && find * -maxdepth 0 -type d)
 current_design = null
 
 ifeq ($(ROOTLESS), 1)
@@ -182,21 +181,29 @@ list:
 	@echo $(designs)
 
 # export PYTHONPATH=$(PROJECT_ROOT)/openlane_plugin_Frigate:\$$PYTHONPATH
-.PHONY: $(designs)
-$(designs) : export current_design=$@
-$(designs) : % : $(PROJECT_ROOT)/openlane/%/config.yaml
-	# $(current_design)
-	@rm -rf $(PROJECT_ROOT)/openlane/$*/runs/$(OPENLANE2_RUN_TAG)
-ifeq ($(current_design),user_project_wrapper)
-	openlane_args += $(PROJECT_ROOT)/openlane/$(current_design)/fixed_dont_change/fixed_config.yaml
-endif
-
+designs = $(shell cd $(PROJECT_ROOT)/openlane && find * -maxdepth 0 -type d ! -name "user_project_wrapper")
 ifeq ($(OPENLANE2_USE_NIX),1)
-	nix develop --command openlane $(openlane_args) $(openlane_extra_args)
+openlane_cmd=nix develop --command openlane $(openlane_args) $(openlane_extra_args)
 else
-	$(PROJECT_ROOT)/openlane2-venv/bin/python3 -m openlane $(docker_mounts) $(openlane_extra_args) --dockerized $(openlane_args) $(openlane_extra_args)
+openlane_cmd=$(PROJECT_ROOT)/openlane2-venv/bin/python3 -m openlane $(docker_mounts) $(openlane_extra_args) --dockerized $(openlane_args) $(openlane_extra_args)
 endif
-	@sh $(PROJECT_ROOT)/openlane/copy_views.sh $(PROJECT_ROOT) $* $(OPENLANE2_RUN_TAG)
+
+define run_openlane
+	rm -rf $(PROJECT_ROOT)/openlane/$*/runs/$(OPENLANE2_RUN_TAG)
+	$(openlane_cmd) $1
+endef
+
+.PHONY: user_project_wrapper
+user_project_wrapper: % : $(PROJECT_ROOT)/openlane/user_project_wrapper/config.yaml
+	$(call run_openlane,$(PROJECT_ROOT)/openlane/user_project_wrapper/fixed_config.yaml)
+# $(openlane_cmd) $(PROJECT_ROOT)/openlane/user_project_wrapper/fixed_config.yaml -c "step"=Frigate.CustomApplyDEFTemplate
+	sh $(PROJECT_ROOT)/openlane/copy_views.sh $(PROJECT_ROOT) $* $(OPENLANE2_RUN_TAG)
+
+.PHONY: $(designs)
+$(designs) : export current_design=$@
+$(designs) : % : $(PROJECT_ROOT)/openlane/%/config.yaml
+	$(call run_openlane)
+	sh $(PROJECT_ROOT)/openlane/copy_views.sh $(PROJECT_ROOT) $* $(OPENLANE2_RUN_TAG)
 
 .PHONY: harden
 harden: $(designs)

openlane/user_project_wrapper/fixed_dont_change/fixed_config.yaml renamed to openlane/user_project_wrapper/fixed_config.yaml

@@ -43,6 +43,7 @@ FP_TEMPLATE_PINS:
     - vssa1
     - vdda2
     - vssa2
+
 meta:
   flow: Classic
   substituting_steps: