From db8b8f50cfa285cfe12e3513212164a69957d397 Mon Sep 17 00:00:00 2001
From: Jerry Zhao <jerryz123@berkeley.edu>
Date: Fri, 10 May 2019 15:29:28 -0700
Subject: [PATCH] Move example/utilities to generator directory

---
 common.mk                                                   | 4 ++--
 .../example}/src/main/scala/ConfigMixins.scala              | 0
 .../example}/src/main/scala/Configs.scala                   | 6 +++++-
 .../example}/src/main/scala/Generator.scala                 | 0
 {example => generators/example}/src/main/scala/PWM.scala    | 0
 .../example}/src/main/scala/TestHarness.scala               | 0
 {example => generators/example}/src/main/scala/Top.scala    | 0
 .../utilities}/src/main/resources/bootrom                   | 0
 .../utilities}/src/main/resources/csrc/emulator.cc          | 0
 .../utilities}/src/main/scala/Simulator.scala               | 0
 10 files changed, 7 insertions(+), 3 deletions(-)
 rename {example => generators/example}/src/main/scala/ConfigMixins.scala (100%)
 rename {example => generators/example}/src/main/scala/Configs.scala (94%)
 rename {example => generators/example}/src/main/scala/Generator.scala (100%)
 rename {example => generators/example}/src/main/scala/PWM.scala (100%)
 rename {example => generators/example}/src/main/scala/TestHarness.scala (100%)
 rename {example => generators/example}/src/main/scala/Top.scala (100%)
 rename {utilities => generators/utilities}/src/main/resources/bootrom (100%)
 rename {utilities => generators/utilities}/src/main/resources/csrc/emulator.cc (100%)
 rename {utilities => generators/utilities}/src/main/scala/Simulator.scala (100%)

diff --git a/common.mk b/common.mk
index 41ad6a84..990304d5 100644
--- a/common.mk
+++ b/common.mk
@@ -8,8 +8,8 @@ SHELL=/bin/bash
 #########################################################################################
 lookup_scala_srcs = $(shell find -L $(1)/ -iname "*.scala" 2> /dev/null)
 
-PACKAGES=rocket-chip testchipip boom hwacha sifive-blocks
-SCALA_SOURCES=$(foreach pkg,$(PACKAGES),$(call lookup_scala_srcs,$(base_dir)/generators/$(pkg)/src/main/scala)) $(call lookup_scala_srcs,$(base_dir)/example/src/main/scala) $(call lookup_scala_srcs,$(base_dir)/utilities/src/main/scala)
+PACKAGES=rocket-chip testchipip boom hwacha sifive-blocks utilities example
+SCALA_SOURCES=$(foreach pkg,$(PACKAGES),$(call lookup_scala_srcs,$(base_dir)/generators/$(pkg)/src/main/scala))
 
 #########################################################################################
 # rocket and testchipip classes
diff --git a/example/src/main/scala/ConfigMixins.scala b/generators/example/src/main/scala/ConfigMixins.scala
similarity index 100%
rename from example/src/main/scala/ConfigMixins.scala
rename to generators/example/src/main/scala/ConfigMixins.scala
diff --git a/example/src/main/scala/Configs.scala b/generators/example/src/main/scala/Configs.scala
similarity index 94%
rename from example/src/main/scala/Configs.scala
rename to generators/example/src/main/scala/Configs.scala
index 57e4300f..4b6f1dcb 100644
--- a/example/src/main/scala/Configs.scala
+++ b/generators/example/src/main/scala/Configs.scala
@@ -2,7 +2,7 @@ package example
 
 import chisel3._
 import freechips.rocketchip.config.{Config}
-import freechips.rocketchip.subsystem.{WithRoccExample, WithNMemoryChannels, WithNBigCores, WithRV32}
+import freechips.rocketchip.subsystem.{WithRoccExample, WithNMemoryChannels, WithNBigCores, WithRV32, WithExtMemSize}
 import testchipip._
 
 // --------------
@@ -56,6 +56,10 @@ class GPIORocketConfig extends Config(
   new WithGPIORocketTop ++
   new BaseRocketConfig)
 
+class GB1MemoryConfig extends Config(
+  new WithExtMemSize((1<<30) * 1L) ++
+  new DefaultRocketConfig)
+
 // ------------
 // BOOM Configs
 // ------------
diff --git a/example/src/main/scala/Generator.scala b/generators/example/src/main/scala/Generator.scala
similarity index 100%
rename from example/src/main/scala/Generator.scala
rename to generators/example/src/main/scala/Generator.scala
diff --git a/example/src/main/scala/PWM.scala b/generators/example/src/main/scala/PWM.scala
similarity index 100%
rename from example/src/main/scala/PWM.scala
rename to generators/example/src/main/scala/PWM.scala
diff --git a/example/src/main/scala/TestHarness.scala b/generators/example/src/main/scala/TestHarness.scala
similarity index 100%
rename from example/src/main/scala/TestHarness.scala
rename to generators/example/src/main/scala/TestHarness.scala
diff --git a/example/src/main/scala/Top.scala b/generators/example/src/main/scala/Top.scala
similarity index 100%
rename from example/src/main/scala/Top.scala
rename to generators/example/src/main/scala/Top.scala
diff --git a/utilities/src/main/resources/bootrom b/generators/utilities/src/main/resources/bootrom
similarity index 100%
rename from utilities/src/main/resources/bootrom
rename to generators/utilities/src/main/resources/bootrom
diff --git a/utilities/src/main/resources/csrc/emulator.cc b/generators/utilities/src/main/resources/csrc/emulator.cc
similarity index 100%
rename from utilities/src/main/resources/csrc/emulator.cc
rename to generators/utilities/src/main/resources/csrc/emulator.cc
diff --git a/utilities/src/main/scala/Simulator.scala b/generators/utilities/src/main/scala/Simulator.scala
similarity index 100%
rename from utilities/src/main/scala/Simulator.scala
rename to generators/utilities/src/main/scala/Simulator.scala