UPF Generation [ci skip]

ucb-bar · Mar 15, 2023 · 4f1648d · 4f1648d
1 parent 87054e9
commit 4f1648d
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git 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
@@ -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
 #########################################################################################