summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNikos Nikoleris <nikos.nikoleris@arm.com>2017-07-25 17:18:00 +0100
committerAndreas Sandberg <andreas.sandberg@arm.com>2017-07-25 17:08:06 +0000
commitacf233bb247e256e0cf447ace74990988dd1f0d2 (patch)
treeba534bb4accca7ec45d539269ae3deeeb13836e7
parent355b2ee8f0c1058d4b36857e50bc9be13f810012 (diff)
downloadgem5-acf233bb247e256e0cf447ace74990988dd1f0d2.tar.xz
tests: Fix path for module imports in ARM system configs
Change-Id: I6fd660da3899de1f8c61bf012532ff0437467302 Reviewed-by: Andreas Sandberg <andreas.sandberg@arm.com> Reviewed-on: https://gem5-review.googlesource.com/4220 Maintainer: Andreas Sandberg <andreas.sandberg@arm.com>
-rw-r--r--tests/configs/realview-o3-checker.py4
-rw-r--r--tests/configs/realview-o3-dual.py4
-rw-r--r--tests/configs/realview64-o3-checker.py4
-rw-r--r--tests/configs/realview64-o3-dual.py4
-rw-r--r--tests/configs/realview64-o3.py4
5 files changed, 10 insertions, 10 deletions
diff --git a/tests/configs/realview-o3-checker.py b/tests/configs/realview-o3-checker.py
index b2e61d258..5bb266ff3 100644
--- a/tests/configs/realview-o3-checker.py
+++ b/tests/configs/realview-o3-checker.py
@@ -1,4 +1,4 @@
-# Copyright (c) 2012 ARM Limited
+# Copyright (c) 2012, 2017 ARM Limited
# All rights reserved.
#
# The license below extends only to copyright in the software and shall
@@ -37,7 +37,7 @@
from m5.objects import *
from arm_generic import *
-from common.O3_ARM_v7a import O3_ARM_v7a_3
+from common.cores.arm.O3_ARM_v7a import O3_ARM_v7a_3
root = LinuxArmFSSystemUniprocessor(mem_mode='timing',
mem_class=DDR3_1600_8x8,
diff --git a/tests/configs/realview-o3-dual.py b/tests/configs/realview-o3-dual.py
index f2042cd4e..7b035ba7f 100644
--- a/tests/configs/realview-o3-dual.py
+++ b/tests/configs/realview-o3-dual.py
@@ -1,4 +1,4 @@
-# Copyright (c) 2012 ARM Limited
+# Copyright (c) 2012, 2017 ARM Limited
# All rights reserved.
#
# The license below extends only to copyright in the software and shall
@@ -37,7 +37,7 @@
from m5.objects import *
from arm_generic import *
-from common.O3_ARM_v7a import O3_ARM_v7a_3
+from common.cores.arm.O3_ARM_v7a import O3_ARM_v7a_3
root = LinuxArmFSSystem(mem_mode='timing',
mem_class=DDR3_1600_8x8,
diff --git a/tests/configs/realview64-o3-checker.py b/tests/configs/realview64-o3-checker.py
index 0d5232996..5fd50e677 100644
--- a/tests/configs/realview64-o3-checker.py
+++ b/tests/configs/realview64-o3-checker.py
@@ -1,4 +1,4 @@
-# Copyright (c) 2012 ARM Limited
+# Copyright (c) 2012, 2017 ARM Limited
# All rights reserved.
#
# The license below extends only to copyright in the software and shall
@@ -37,7 +37,7 @@
from m5.objects import *
from arm_generic import *
-from common.O3_ARM_v7a import O3_ARM_v7a_3
+from common.cores.arm.O3_ARM_v7a import O3_ARM_v7a_3
root = LinuxArmFSSystemUniprocessor(machine_type='VExpress_EMM64',
mem_mode='timing',
diff --git a/tests/configs/realview64-o3-dual.py b/tests/configs/realview64-o3-dual.py
index 6675c6e3b..6c5dc0a2b 100644
--- a/tests/configs/realview64-o3-dual.py
+++ b/tests/configs/realview64-o3-dual.py
@@ -1,4 +1,4 @@
-# Copyright (c) 2012 ARM Limited
+# Copyright (c) 2012, 2017 ARM Limited
# All rights reserved.
#
# The license below extends only to copyright in the software and shall
@@ -37,7 +37,7 @@
from m5.objects import *
from arm_generic import *
-from common.O3_ARM_v7a import O3_ARM_v7a_3
+from common.cores.arm.O3_ARM_v7a import O3_ARM_v7a_3
root = LinuxArmFSSystem(machine_type='VExpress_EMM64',
mem_mode='timing',
diff --git a/tests/configs/realview64-o3.py b/tests/configs/realview64-o3.py
index 090db1e63..2558093e7 100644
--- a/tests/configs/realview64-o3.py
+++ b/tests/configs/realview64-o3.py
@@ -1,4 +1,4 @@
-# Copyright (c) 2012 ARM Limited
+# Copyright (c) 2012, 2017 ARM Limited
# All rights reserved.
#
# The license below extends only to copyright in the software and shall
@@ -37,7 +37,7 @@
from m5.objects import *
from arm_generic import *
-from common.O3_ARM_v7a import O3_ARM_v7a_3
+from common.cores.arm.O3_ARM_v7a import O3_ARM_v7a_3
root = LinuxArmFSSystemUniprocessor(machine_type='VExpress_EMM64',
mem_mode='timing',