summaryrefslogtreecommitdiff
path: root/configs/learning_gem5
diff options
context:
space:
mode:
authorAndreas Hansson <andreas.hansson@arm.com>2016-10-14 10:37:38 -0400
committerAndreas Hansson <andreas.hansson@arm.com>2016-10-14 10:37:38 -0400
commit2f5262eb67f0539ab6c07d56eeae1b72f6b6b509 (patch)
tree1261b4decbb504ce2836b77207466c98d6a327a4 /configs/learning_gem5
parent824c87634d2d0606f9f62e8a3383c9a056069125 (diff)
downloadgem5-2f5262eb67f0539ab6c07d56eeae1b72f6b6b509.tar.xz
config: Make configs/common a Python package
Continue along the same line as the recent patch that made the Ruby-related config scripts Python packages and make also the configs/common directory a package. All affected config scripts are updated (hopefully). Note that this change makes it apparent that the current organisation and naming of the config directory and its subdirectories is rather chaotic. We mix scripts that are directly invoked with scripts that merely contain convenience functions. While it is not addressed in this patch we should follow up with a re-organisation of the config structure, and renaming of some of the packages.
Diffstat (limited to 'configs/learning_gem5')
-rw-r--r--configs/learning_gem5/part1/caches.py2
-rw-r--r--configs/learning_gem5/part1/two_level.py4
2 files changed, 3 insertions, 3 deletions
diff --git a/configs/learning_gem5/part1/caches.py b/configs/learning_gem5/part1/caches.py
index fbdd1bf3c..87256e5d0 100644
--- a/configs/learning_gem5/part1/caches.py
+++ b/configs/learning_gem5/part1/caches.py
@@ -36,7 +36,7 @@ line options from each individual class.
from m5.objects import Cache
-import SimpleOpts
+from common import SimpleOpts
# Some specific options for caches
# For all options see src/mem/cache/BaseCache.py
diff --git a/configs/learning_gem5/part1/two_level.py b/configs/learning_gem5/part1/two_level.py
index de012b30e..878baa312 100644
--- a/configs/learning_gem5/part1/two_level.py
+++ b/configs/learning_gem5/part1/two_level.py
@@ -46,13 +46,13 @@ import m5
from m5.objects import *
# Add the common scripts to our path
-m5.util.addToPath('../../common')
+m5.util.addToPath('../../')
# import the caches which we made
from caches import *
# import the SimpleOpts module
-import SimpleOpts
+from common import SimpleOpts
# Set the usage message to display
SimpleOpts.set_usage("usage: %prog [options] <binary to execute>")