X-Git-Url: https://git.libre-soc.org/?a=blobdiff_plain;f=tests%2Fconfigs%2Ftsunami-simple-atomic.py;h=0cc19e0924dc6b24a99ae7b73bf9105cae54c1ae;hb=b5a54eb64ebce9c217c1d44cc93aebb7cb508c6d;hp=ca1dd5c77c1ee9d4dd87ae95571ece32900bc22a;hpb=4e3164617ad709cb6d4b0f8fbbdfd596f4d6f236;p=gem5.git

diff --git a/tests/configs/tsunami-simple-atomic.py b/tests/configs/tsunami-simple-atomic.py
index ca1dd5c77..0cc19e092 100644
--- a/tests/configs/tsunami-simple-atomic.py
+++ b/tests/configs/tsunami-simple-atomic.py
@@ -1,6 +1,15 @@
-# Copyright (c) 2006 The Regents of The University of Michigan
+# Copyright (c) 2012 ARM Limited
 # All rights reserved.
 #
+# The license below extends only to copyright in the software and shall
+# not be construed as granting a license to any other intellectual
+# property including but not limited to intellectual property relating
+# to a hardware implementation of the functionality of the software
+# licensed hereunder.  You may use the software subject to the license
+# terms below provided that you ensure that this notice is replicated
+# unmodified and in its entirety in all distributions of the software,
+# modified or unmodified, in source code or in binary form.
+#
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions are
 # met: redistributions of source code must retain the above copyright
@@ -24,17 +33,11 @@
 # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #
-# Authors: Steve Reinhardt
+# Authors: Andreas Sandberg
 
-import m5
 from m5.objects import *
-m5.AddToPath('../configs/common')
-import FSConfig
-
-cpu = AtomicSimpleCPU()
-system = FSConfig.makeLinuxAlphaSystem('atomic')
-system.cpu = cpu
-cpu.connectMemPorts(system.membus)
-cpu.mem = system.physmem
+from alpha_generic import *
 
-root = Root(clock = '2GHz', system = system)
+root = LinuxAlphaFSSystemUniprocessor(mem_mode='atomic',
+                                      mem_class=SimpleMemory,
+                                      cpu_class=AtomicSimpleCPU).create_root()