From c39aea440c884f0abb29ecc2293fd6df608bc00c Mon Sep 17 00:00:00 2001 From: Steve Reinhardt Date: Mon, 4 Sep 2006 17:14:07 -0700 Subject: More Python hacking to deal with config.py split and resulting recursive import trickiness. --HG-- extra : convert_revision : 1ea93861eb8d260c9f3920dda0b8106db3e03705 --- src/python/m5/__init__.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/python/m5/__init__.py') diff --git a/src/python/m5/__init__.py b/src/python/m5/__init__.py index bd2efac09..c37abbac9 100644 --- a/src/python/m5/__init__.py +++ b/src/python/m5/__init__.py @@ -71,8 +71,6 @@ build_env.update(defines.m5_build_env) env = smartdict.SmartDict() env.update(os.environ) -from main import options, arguments, main - # The final hook to generate .ini files. Called from the user script # once the config is built. def instantiate(root): @@ -206,5 +204,7 @@ def switchCpus(cpuList): # you can get the wrong result if foo is only partially imported # at the point you do that (i.e., because foo is in the middle of # importing *you*). +from main import options import objects import params +from SimObject import resolveSimObject -- cgit v1.2.3