summaryrefslogtreecommitdiff
path: root/configs/common/Simulation.py
diff options
context:
space:
mode:
authorAndreas Hansson <andreas.hansson@arm.com>2016-10-26 14:50:54 -0400
committerAndreas Hansson <andreas.hansson@arm.com>2016-10-26 14:50:54 -0400
commit90b087171b048aa226be96dc32d73624f957b793 (patch)
tree6492ef9c4ff47d889c24fc22d96d65e9305829cc /configs/common/Simulation.py
parent607c2772915628c2c67c1c5bfdefaa33ae66a06e (diff)
downloadgem5-90b087171b048aa226be96dc32d73624f957b793.tar.xz
config: Break out base options for usage with NULL ISA
This patch breaks out the most basic configuration options into a set of base options, to allow them to be used also by scripts that do not involve any ISA, and thus no actual CPUs or devices. The patch also fixes a few modules so that they can be imported in a NULL build, and avoid dragging in FSConfig every time Options is imported.
Diffstat (limited to 'configs/common/Simulation.py')
-rw-r--r--configs/common/Simulation.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/configs/common/Simulation.py b/configs/common/Simulation.py
index b18d65cbc..c4d5c9644 100644
--- a/configs/common/Simulation.py
+++ b/configs/common/Simulation.py
@@ -43,8 +43,8 @@ import sys
from os import getcwd
from os.path import join as joinpath
-import CpuConfig
-import MemConfig
+from common import CpuConfig
+from common import MemConfig
import m5
from m5.defines import buildEnv