summaryrefslogtreecommitdiff
path: root/tests
diff options
context:
space:
mode:
authorAli Saidi <Ali.Saidi@ARM.com>2011-02-23 15:10:48 -0600
committerAli Saidi <Ali.Saidi@ARM.com>2011-02-23 15:10:48 -0600
commit79dac89552e7ef0fa4376ba028b10ad7d2f1ca69 (patch)
treed4f274c7f23254dd339ca0ac0c86d154327c582e /tests
parente2a6275c037c6be1bad1f876aa7fbaf3864e9e53 (diff)
downloadgem5-79dac89552e7ef0fa4376ba028b10ad7d2f1ca69.tar.xz
ARM: Clarifies creation of Linux and baremetal ARM systems.
makeArmSystem creates both bare-metal and Linux systems more cleanly. machine_type was never optional though listed as an optional argument; a system such as "RealView_PBX" must now be explicitly specified. Now that it is a required argument, the placement of the arguments has changed slightly requiring some changes to calls that create ARM systems.
Diffstat (limited to 'tests')
-rw-r--r--tests/configs/realview-simple-atomic.py2
-rw-r--r--tests/configs/realview-simple-timing.py2
2 files changed, 2 insertions, 2 deletions
diff --git a/tests/configs/realview-simple-atomic.py b/tests/configs/realview-simple-atomic.py
index c20a67df7..ab6d612d4 100644
--- a/tests/configs/realview-simple-atomic.py
+++ b/tests/configs/realview-simple-atomic.py
@@ -68,7 +68,7 @@ class IOCache(BaseCache):
#cpu
cpu = AtomicSimpleCPU(cpu_id=0)
#the system
-system = FSConfig.makeLinuxArmSystem('atomic', None, False, "RealView_PBX")
+system = FSConfig.makeArmSystem('atomic', "RealView_PBX", None, False)
system.bridge.filter_ranges_a=[AddrRange(0, Addr.max)]
system.bridge.filter_ranges_b=[AddrRange(0, size='128MB')]
system.iocache = IOCache()
diff --git a/tests/configs/realview-simple-timing.py b/tests/configs/realview-simple-timing.py
index a1e363447..53b6ab2b2 100644
--- a/tests/configs/realview-simple-timing.py
+++ b/tests/configs/realview-simple-timing.py
@@ -69,7 +69,7 @@ class IOCache(BaseCache):
#cpu
cpu = TimingSimpleCPU(cpu_id=0)
#the system
-system = FSConfig.makeLinuxArmSystem('timing', None, False, "RealView_PBX")
+system = FSConfig.makeArmSystem('timing', "RealView_PBX", None, False)
system.cpu = cpu
#create the l1/l2 bus