diff options
| author | Steve Reinhardt <steve.reinhardt@amd.com> | 2014-01-03 17:08:44 -0800 |
|---|---|---|
| committer | Steve Reinhardt <steve.reinhardt@amd.com> | 2014-01-03 17:08:44 -0800 |
| commit | a212844f6785f896b268b678f0018528c0ecfdc7 (patch) | |
| tree | 5317addf969158bcfb4ca81513b23b93f22aa913 | |
| parent | d8c9b5431b05550ee3a232e95af50a5e3d9ce4b5 (diff) | |
| download | gem5-a212844f6785f896b268b678f0018528c0ecfdc7.tar.xz | |
config, x86: move kernel specification from tests to FSConfig.py
For some reason, the default x86 kernel is specified in
tests/configs/x86_generic.py and not in configs/common/FSConfig.py,
where the kernels for all the other ISAs are. This means that
running configs/example/fs.py for x86 fails because no kernel
is specified. Moving the specification over fixes this problem.
There is another problem that this uncovers, which is that going
past the init stage (i.e., past where the regression test stops)
fails because the fsck test on the disk device fails, but that's
a separate issue.
| -rw-r--r-- | configs/common/FSConfig.py | 1 | ||||
| -rw-r--r-- | tests/configs/x86_generic.py | 1 |
2 files changed, 1 insertions, 1 deletions
diff --git a/configs/common/FSConfig.py b/configs/common/FSConfig.py index 780e4314c..8905ba2fa 100644 --- a/configs/common/FSConfig.py +++ b/configs/common/FSConfig.py @@ -518,6 +518,7 @@ def makeLinuxX86System(mem_mode, numCPUs = 1, mdesc = None, # Command line self.boot_osflags = 'earlyprintk=ttyS0 console=ttyS0 lpj=7999923 ' + \ 'root=/dev/hda1' + self.kernel = binary('x86_64-vmlinux-2.6.22.9') return self diff --git a/tests/configs/x86_generic.py b/tests/configs/x86_generic.py index d30087df1..5dc8702ba 100644 --- a/tests/configs/x86_generic.py +++ b/tests/configs/x86_generic.py @@ -60,7 +60,6 @@ class LinuxX86SystemBuilder(object): system = FSConfig.makeLinuxX86System(self.mem_mode, numCPUs=self.num_cpus, mdesc=mdesc) - system.kernel = FSConfig.binary('x86_64-vmlinux-2.6.22.9') self.init_system(system) return system |