summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorSteve Reinhardt <stever@eecs.umich.edu>2006-06-09 23:33:15 -0400
committerSteve Reinhardt <stever@eecs.umich.edu>2006-06-09 23:33:15 -0400
commitf693b451a59949ef1a025fe8b391031d2234f1e1 (patch)
treeca7124d40e6cc9e7d2ec1828b863b945c406ef44 /src
parent95019d0c6f1675f42d899f2899e06d3017088f25 (diff)
downloadgem5-f693b451a59949ef1a025fe8b391031d2234f1e1.tar.xz
Fix up imports in Ozone objects/*.py files.
src/python/m5/objects/FUPool.py: src/python/m5/objects/OzoneCPU.py: src/python/m5/objects/SimpleOzoneCPU.py: Fix up imports (m5 namespace no longer includes m5.config). --HG-- extra : convert_revision : 8575ef7d19ef8dfe9524723d7c4f85234d1280d2
Diffstat (limited to 'src')
-rw-r--r--src/python/m5/objects/FUPool.py5
-rw-r--r--src/python/m5/objects/OzoneCPU.py3
-rw-r--r--src/python/m5/objects/SimpleOzoneCPU.py3
3 files changed, 5 insertions, 6 deletions
diff --git a/src/python/m5/objects/FUPool.py b/src/python/m5/objects/FUPool.py
index 5eecfd12f..cbf1089cf 100644
--- a/src/python/m5/objects/FUPool.py
+++ b/src/python/m5/objects/FUPool.py
@@ -1,7 +1,4 @@
-from m5 import *
-from FullCPU import OpType
-from FullCPU import OpDesc
-from FullCPU import FUDesc
+from m5.config import *
class FUPool(SimObject):
type = 'FUPool'
diff --git a/src/python/m5/objects/OzoneCPU.py b/src/python/m5/objects/OzoneCPU.py
index ea8b6b537..f2d9aea84 100644
--- a/src/python/m5/objects/OzoneCPU.py
+++ b/src/python/m5/objects/OzoneCPU.py
@@ -1,4 +1,5 @@
-from m5 import *
+from m5 import build_env
+from m5.config import *
from BaseCPU import BaseCPU
class DerivOzoneCPU(BaseCPU):
diff --git a/src/python/m5/objects/SimpleOzoneCPU.py b/src/python/m5/objects/SimpleOzoneCPU.py
index 0d6403383..5d968cab0 100644
--- a/src/python/m5/objects/SimpleOzoneCPU.py
+++ b/src/python/m5/objects/SimpleOzoneCPU.py
@@ -1,4 +1,5 @@
-from m5 import *
+from m5 import build_env
+from m5.config import *
from BaseCPU import BaseCPU
class SimpleOzoneCPU(BaseCPU):