From ffb6c62d1e8ccd05b788415514e133eccd636e2d Mon Sep 17 00:00:00 2001 From: Jerry Zhao Date: Fri, 10 Feb 2023 13:59:38 -0800 Subject: [PATCH] Set VLOG_MODEL=MODEL by default in variables.mk This is what 99% of users will want if they override `MODEL`. --- variables.mk | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/variables.mk b/variables.mk index fab54a6a9a..8f335519e9 100644 --- a/variables.mk +++ b/variables.mk @@ -67,7 +67,7 @@ SUB_PROJECT ?= chipyard ifeq ($(SUB_PROJECT),chipyard) SBT_PROJECT ?= chipyard MODEL ?= TestHarness - VLOG_MODEL ?= TestHarness + VLOG_MODEL ?= $(MODEL) MODEL_PACKAGE ?= $(SBT_PROJECT) CONFIG ?= RocketConfig CONFIG_PACKAGE ?= $(SBT_PROJECT) @@ -79,7 +79,7 @@ endif ifeq ($(SUB_PROJECT),hwacha) SBT_PROJECT ?= chipyard MODEL ?= TestHarness - VLOG_MODEL ?= TestHarness + VLOG_MODEL ?= $(MODEL) MODEL_PACKAGE ?= freechips.rocketchip.system CONFIG ?= HwachaConfig CONFIG_PACKAGE ?= hwacha @@ -91,7 +91,7 @@ endif ifeq ($(SUB_PROJECT),testchipip) SBT_PROJECT ?= chipyard MODEL ?= TestHarness - VLOG_MODEL ?= TestHarness + VLOG_MODEL ?= $(MODEL) MODEL_PACKAGE ?= chipyard.unittest CONFIG ?= TestChipUnitTestConfig CONFIG_PACKAGE ?= testchipip @@ -103,7 +103,7 @@ endif ifeq ($(SUB_PROJECT),icenet) SBT_PROJECT ?= chipyard MODEL ?= TestHarness - VLOG_MODEL ?= TestHarness + VLOG_MODEL ?= $(MODEL) MODEL_PACKAGE ?= chipyard.unittest CONFIG ?= IceNetUnitTestConfig CONFIG_PACKAGE ?= icenet @@ -115,7 +115,7 @@ endif ifeq ($(SUB_PROJECT),constellation) SBT_PROJECT ?= chipyard MODEL ?= TestHarness - VLOG_MODEL ?= TestHarness + VLOG_MODEL ?= $(MODEL) MODEL_PACKAGE ?= constellation.test CONFIG ?= TestConfig00 CONFIG_PACKAGE ?= constellation.test