From 4f1648d99ae20e86a9df159e3ed04b714ac9d58f Mon Sep 17 00:00:00 2001
From: Sriram Sridhar <s.sridhar@a5.Millennium.Berkeley.EDU>
Date: Tue, 14 Mar 2023 21:58:29 -0700
Subject: [PATCH] UPF Generation [ci skip]

---
 common.mk     | 2 +-
 vlsi/Makefile | 5 +++++
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/common.mk b/common.mk
index a1fb1171c9..bdd234397f 100644
--- a/common.mk
+++ b/common.mk
@@ -109,7 +109,7 @@ $(FIRRTL_FILE) $(ANNO_FILE) &: $(SCALA_SOURCES) $(SCALA_BUILDTOOL_DEPS) $(EXTRA_
 		--name $(long_name) \
 		--top-module $(MODEL_PACKAGE).$(MODEL) \
 		--legacy-configs $(CONFIG_PACKAGE):$(CONFIG) \
-		--with-aspect chipyard.upf.ChipTopUPFAspect \
+		$(UPF_ASPECT) \
 		$(EXTRA_CHISEL_OPTIONS))
 
 define mfc_extra_anno_contents
diff --git a/vlsi/Makefile b/vlsi/Makefile
index ab8438d50c..b37e6704bb 100644
--- a/vlsi/Makefile
+++ b/vlsi/Makefile
@@ -51,6 +51,11 @@ else
 	OBJ_DIR          ?= $(vlsi_dir)/$(VLSI_OBJ_DIR)/$(long_name)-$(VLSI_TOP)
 endif
 
+ifneq ($(ASPECTS), )
+	comma = ,
+	UPF_ASPECT = $(foreach aspect, $(subst $(comma), , $(ASPECTS)), --with-aspect $(aspect))
+endif
+
 #########################################################################################
 # general rules
 #########################################################################################