From 2f5262eb67f0539ab6c07d56eeae1b72f6b6b509 Mon Sep 17 00:00:00 2001 From: Andreas Hansson Date: Fri, 14 Oct 2016 10:37:38 -0400 Subject: 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. --- configs/example/arm/devices.py | 6 +++--- configs/example/arm/fs_bigLITTLE.py | 7 ++++--- 2 files changed, 7 insertions(+), 6 deletions(-) (limited to 'configs/example/arm') diff --git a/configs/example/arm/devices.py b/configs/example/arm/devices.py index 65892d9e6..815e94f0c 100644 --- a/configs/example/arm/devices.py +++ b/configs/example/arm/devices.py @@ -40,9 +40,9 @@ import m5 from m5.objects import * -m5.util.addToPath('../../common') -from Caches import * -import CpuConfig +m5.util.addToPath('../../') +from common.Caches import * +from common import CpuConfig class L1I(L1_ICache): hit_latency = 1 diff --git a/configs/example/arm/fs_bigLITTLE.py b/configs/example/arm/fs_bigLITTLE.py index 80e0817eb..d1b1ee7ab 100644 --- a/configs/example/arm/fs_bigLITTLE.py +++ b/configs/example/arm/fs_bigLITTLE.py @@ -46,9 +46,10 @@ import sys import m5 from m5.objects import * -m5.util.addToPath("../../common") -import SysPaths -import CpuConfig +m5.util.addToPath("../../") + +from common import SysPaths +from common import CpuConfig import devices -- cgit v1.2.3