summaryrefslogtreecommitdiff
path: root/configs
diff options
context:
space:
mode:
authorGabe Black <gblack@eecs.umich.edu>2007-12-01 23:09:56 -0800
committerGabe Black <gblack@eecs.umich.edu>2007-12-01 23:09:56 -0800
commit42ae409746adb2d64961af236516e8e57f52e731 (patch)
tree62fc06bc419db73cddd3addf6a3399ea375f9006 /configs
parente7fc5c42f3a8e1d1a67301ced7c76765f776a683 (diff)
downloadgem5-42ae409746adb2d64961af236516e8e57f52e731.tar.xz
X86: Move startup code to the system object to initialize a Linux system.
--HG-- extra : convert_revision : a4796c79f41aa8b8f38bf2f628bee8f1b3af64be
Diffstat (limited to 'configs')
-rw-r--r--configs/common/FSConfig.py4
-rw-r--r--configs/example/fs.py2
2 files changed, 3 insertions, 3 deletions
diff --git a/configs/common/FSConfig.py b/configs/common/FSConfig.py
index 37b9f5551..5b21dbb39 100644
--- a/configs/common/FSConfig.py
+++ b/configs/common/FSConfig.py
@@ -155,8 +155,8 @@ def makeLinuxMipsSystem(mem_mode, mdesc = None):
return self
-def makeX86System(mem_mode, mdesc = None):
- self = X86System()
+def makeLinuxX86System(mem_mode, mdesc = None):
+ self = LinuxX86System()
if not mdesc:
# generic system
mdesc = SysConfig()
diff --git a/configs/example/fs.py b/configs/example/fs.py
index 8688d7839..abfd3cc47 100644
--- a/configs/example/fs.py
+++ b/configs/example/fs.py
@@ -102,7 +102,7 @@ elif m5.build_env['TARGET_ISA'] == "mips":
elif m5.build_env['TARGET_ISA'] == "sparc":
test_sys = makeSparcSystem(test_mem_mode, bm[0])
elif m5.build_env['TARGET_ISA'] == "x86":
- test_sys = makeX86System(test_mem_mode, bm[0])
+ test_sys = makeLinuxX86System(test_mem_mode, bm[0])
else:
m5.panic("incapable of building non-alpha or non-sparc full system!")