config: Move core timing models to config/common/cores

Change-Id: I189b6462cc64f7cc6c1b7a6c2af1abb60e1854de
Signed-off-by: Andreas Sandberg <andreas.sandberg@arm.com>
Reviewed-by: Gabor Dozsa <gabor.dozsa@arm.com>
Reviewed-on: https://gem5-review.googlesource.com/3943
Reviewed-by: Jason Lowe-Power <jason@lowepower.com>
Maintainer: Jason Lowe-Power <jason@lowepower.com>

1 files changed, 5 insertions, 5 deletions

diff --git a/configs/common/CpuConfig.py b/configs/common/CpuConfig.py
index eee6a77d3..4def9fdda 100644
--- a/configs/common/CpuConfig.py
+++ b/configs/common/CpuConfig.py
@@ -113,23 +113,23 @@ def config_etrace(cpu_cls, cpu_list, options):
 # The ARM detailed CPU is special in the sense that it doesn't exist
 # in the normal object hierarchy, so we have to add it manually.
 try:
-    from O3_ARM_v7a import O3_ARM_v7a_3
+    from cores.arm.O3_ARM_v7a import O3_ARM_v7a_3
     _cpu_classes["O3_ARM_v7a_3"] = O3_ARM_v7a_3
 except:
     pass
 
 # The calibrated ex5-model cores
 try:
-    from ex5_LITTLE import ex5_LITTLE
+    from cores.arm.ex5_LITTLE import ex5_LITTLE
     _cpu_classes["ex5_LITTLE"] = ex5_LITTLE
 except:
-     pass
+    pass
 
 try:
-    from ex5_big import ex5_big
+    from cores.arm.ex5_big import ex5_big
     _cpu_classes["ex5_big"] = ex5_big
 except:
-     pass
+    pass
 
 
 # Add all CPUs in the object hierarchy.