From af8f0b0507efa547be5062cd9203173ddaac5df5 Mon Sep 17 00:00:00 2001 From: abejgonzalez Date: Mon, 10 Jun 2019 13:56:38 -0700 Subject: [PATCH 1/3] update naming in accordance with boom --- generators/example/src/main/scala/Top.scala | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/generators/example/src/main/scala/Top.scala b/generators/example/src/main/scala/Top.scala index 5ee73906..a3fa99f8 100644 --- a/generators/example/src/main/scala/Top.scala +++ b/generators/example/src/main/scala/Top.scala @@ -16,13 +16,13 @@ import sifive.blocks.devices.gpio._ // BOOM and/or Rocket Top Level Systems // ------------------------------- -class BoomRocketTop(implicit p: Parameters) extends boom.system.ExampleBoomAndRocketSystem +class BoomRocketTop(implicit p: Parameters) extends boom.system.BoomRocketSystem with HasNoDebug with HasPeripherySerial { override lazy val module = new BoomRocketTopModule(this) } -class BoomRocketTopModule[+L <: BoomRocketTop](l: L) extends boom.system.ExampleBoomAndRocketSystemModule(l) +class BoomRocketTopModule[+L <: BoomRocketTop](l: L) extends boom.system.BoomRocketSystemModule(l) with HasNoDebugModuleImp with HasPeripherySerialModuleImp with DontTouch From ba6352afca7c0b873d5fcfbac0142020b4e7cc4b Mon Sep 17 00:00:00 2001 From: abejgonzalez Date: Wed, 12 Jun 2019 14:25:32 -0700 Subject: [PATCH 2/3] update boom hash --- generators/boom | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/generators/boom b/generators/boom index 0246aceb..22c5f9ec 160000 --- a/generators/boom +++ b/generators/boom @@ -1 +1 @@ -Subproject commit 0246aceb0443531a5f0d6525afcbe5fbe15b7c1d +Subproject commit 22c5f9ec3f0325b9bdbf1a98b5752b6ac843eb19 From 4a667c3df94a9e6309e09ad207677ec5d1b74944 Mon Sep 17 00:00:00 2001 From: abejgonzalez Date: Wed, 12 Jun 2019 14:54:49 -0700 Subject: [PATCH 3/3] correct naming in defaults --- variables.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/variables.mk b/variables.mk index f3fc05b1..76632f48 100644 --- a/variables.mk +++ b/variables.mk @@ -48,7 +48,7 @@ ifeq ($(SUB_PROJECT),boom) CONFIG_PACKAGE ?= boom.system GENERATOR_PACKAGE ?= boom.system TB ?= TestDriver - TOP ?= ExampleBoomAndRocketSystem + TOP ?= BoomRocketSystem endif # for Rocket-chip developers ifeq ($(SUB_PROJECT),rocketchip)