From 454d619dfc7537135d0a7bfdd6f8274ea0dc64a8 Mon Sep 17 00:00:00 2001
From: Nayiri K <nayiri@berkeley.edu>
Date: Mon, 13 Mar 2023 22:50:43 -0700
Subject: [PATCH] improved tutorial makefile [skip ci]

---
 vlsi/tutorial.mk | 22 ++++++++++++----------
 1 file changed, 12 insertions(+), 10 deletions(-)

diff --git a/vlsi/tutorial.mk b/vlsi/tutorial.mk
index 9199cdb0..6b970fcb 100644
--- a/vlsi/tutorial.mk
+++ b/vlsi/tutorial.mk
@@ -2,6 +2,7 @@
 # makefile variables for Hammer tutorials
 #########################################################################################
 tutorial ?= none
+EXTRA_CONFS ?=
 
 # TODO: eventually have asap7 commercial/openroad tutorial flavors
 ifeq ($(tutorial),asap7)
@@ -9,7 +10,7 @@ ifeq ($(tutorial),asap7)
     CONFIG            ?= TinyRocketConfig
     TOOLS_CONF        ?= example-tools.yml
     TECH_CONF         ?= example-asap7.yml
-    INPUT_CONFS       ?= $(EXTRA_CONFS) $(TOOLS_CONF) $(TECH_CONF)
+    DESIGN_CONFS      ?=
     VLSI_OBJ_DIR      ?= build-asap7-commercial
 endif
 
@@ -18,9 +19,9 @@ ifeq ($(tutorial),sky130-commercial)
     CONFIG            ?= TinyRocketConfig
     TOOLS_CONF        ?= example-tools.yml
     TECH_CONF         ?= example-sky130.yml
-    DESIGN_CONF       ?= example-designs/sky130-commercial.yml
-    EXTRA_CONFS       ?= $(if $(filter $(VLSI_TOP),Rocket), example-designs/sky130-rocket.yml, )
-    INPUT_CONFS       ?= $(TOOLS_CONF) $(TECH_CONF) $(DESIGN_CONF) $(EXTRA_CONFS)
+    DESIGN_CONFS      ?= example-designs/sky130-commercial.yml \
+                        $(if $(filter $(VLSI_TOP),Rocket), \
+                            example-designs/sky130-rocket.yml, )
     VLSI_OBJ_DIR      ?= build-sky130-commercial
 endif
 
@@ -29,13 +30,14 @@ ifeq ($(tutorial),sky130-openroad)
     CONFIG            ?= TinyRocketConfig
     TOOLS_CONF        ?= example-openroad.yml
     TECH_CONF         ?= example-sky130.yml
-    DESIGN_CONF       ?= example-designs/sky130-openroad.yml
-    EXTRA_CONFS       ?= $(if $(filter $(VLSI_TOP),Rocket), \
-                            example-designs/sky130-rocket.yml, \
-                            $(if $(filter $(VLSI_TOP),RocketTile), \
-                                example-designs/sky130-openroad-rockettile.yml, ))
-    INPUT_CONFS       ?= $(TOOLS_CONF) $(TECH_CONF) $(DESIGN_CONF) $(EXTRA_CONFS)
+    DESIGN_CONFS      ?= example-designs/sky130-openroad.yml \
+                        $(if $(filter $(VLSI_TOP),Rocket), \
+                            example-designs/sky130-rocket.yml) \
+                        $(if $(filter $(VLSI_TOP),RocketTile), \
+                            example-designs/sky130-openroad-rockettile.yml, )
     VLSI_OBJ_DIR      ?= build-sky130-openroad
     # Yosys compatibility for CIRCT-generated Verilog, at the expense of elaboration time.
     ENABLE_YOSYS_FLOW  = 1
 endif
+
+INPUT_CONFS       ?= $(TOOLS_CONF) $(TECH_CONF) $(DESIGN_CONFS) $(EXTRA_CONFS)