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

diff --git a/src/python/m5/objects/FUPool.py b/src/python/m5/objects/FUPool.py
index 5eecfd12f736c9210e5f898ac37165f25d881e85..cbf1089cfb62be1ad77b3563b2d453a93a7199b9 100644 (file)
--- 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 ea8b6b537f235120851e266a37c9044ed126434c..f2d9aea849f5a0fd99ad8867a035fb01a695fe9a 100644 (file)
--- 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 0d6403383b4d9521d7033a7604de9ee175e32c8c..5d968cab0f2370a192ab3b6ab76740428a52cc9a 100644 (file)
--- 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):