From a8dbc391a15334050aa4b4f658343d8c192565f0 Mon Sep 17 00:00:00 2001 From: abejgonzalez Date: Wed, 24 Jul 2019 22:55:00 -0700 Subject: [PATCH] remove boom variables | update ci --- .circleci/defaults.sh | 2 +- generators/boom | 2 +- variables.mk | 12 ------------ 3 files changed, 2 insertions(+), 14 deletions(-) diff --git a/.circleci/defaults.sh b/.circleci/defaults.sh index 25b365d8..cdccc3ba 100755 --- a/.circleci/defaults.sh +++ b/.circleci/defaults.sh @@ -38,7 +38,7 @@ declare -A mapping mapping["example"]="SUB_PROJECT=example" mapping["boomexample"]="SUB_PROJECT=example CONFIG=DefaultBoomConfig" mapping["boomrocketexample"]="SUB_PROJECT=example CONFIG=DefaultBoomAndRocketConfig" -mapping["boom"]="SUB_PROJECT=boom" +mapping["boom"]="SUB_PROJECT=example CONFIG=SmallBoomConfig" mapping["rocketchip"]="SUB_PROJECT=rocketchip" mapping["blockdevrocketchip"]="SUB_PROJECT=example CONFIG=BlockDeviceModelRocketConfig TOP=BoomRocketTopWithBlockDevice" mapping["hwacha"]="SUB_PROJECT=example CONFIG=HwachaL2Config GENERATOR_PACKAGE=hwacha" diff --git a/generators/boom b/generators/boom index 962e9467..3a06403d 160000 --- a/generators/boom +++ b/generators/boom @@ -1 +1 @@ -Subproject commit 962e94674ebd859d4798efe44cb6e404be9a5076 +Subproject commit 3a06403df71d46f2c42f9baac134a3b2997595e5 diff --git a/variables.mk b/variables.mk index fa7bb494..66eb0518 100644 --- a/variables.mk +++ b/variables.mk @@ -38,18 +38,6 @@ ifeq ($(SUB_PROJECT),example) TB ?= TestDriver TOP ?= BoomRocketTop endif -# for BOOM developers -ifeq ($(SUB_PROJECT),boom) - SBT_PROJECT ?= boom - MODEL ?= TestHarness - VLOG_MODEL ?= TestHarness - MODEL_PACKAGE ?= boom.system - CONFIG ?= LargeBoomConfig - CONFIG_PACKAGE ?= boom.system - GENERATOR_PACKAGE ?= boom.system - TB ?= TestDriver - TOP ?= BoomRocketSystem -endif # for Rocket-chip developers ifeq ($(SUB_PROJECT),rocketchip) SBT_PROJECT ?= rocketchip