summaryrefslogtreecommitdiff
path: root/configs/common/CpuConfig.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/CpuConfig.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/CpuConfig.py')
-rw-r--r--configs/common/CpuConfig.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/configs/common/CpuConfig.py b/configs/common/CpuConfig.py
index 3220acecd..757ec2d08 100644
--- a/configs/common/CpuConfig.py
+++ b/configs/common/CpuConfig.py
@@ -70,7 +70,7 @@ def is_cpu_class(cls):
return issubclass(cls, m5.objects.BaseCPU) and \
not cls.abstract and \
not issubclass(cls, m5.objects.CheckerCPU)
- except TypeError:
+ except (TypeError, AttributeError):
return False
def get(name):