diff options
| author | Lisa Hsu <hsul@eecs.umich.edu> | 2005-03-16 10:49:42 -0500 |
|---|---|---|
| committer | Lisa Hsu <hsul@eecs.umich.edu> | 2005-03-16 10:49:42 -0500 |
| commit | bc6baa4049c285322fd0601a88c352fda1996dc1 (patch) | |
| tree | a25c84a48af9185b06f5166ac386f8cedcdf3e3d /python/m5/objects/BaseSystem.mpy | |
| parent | 650306d5e5119e54190ce342e0b7afc182cd3c08 (diff) | |
| parent | d80522183992207132e638ce2bb02513758bb61f (diff) | |
| download | gem5-bc6baa4049c285322fd0601a88c352fda1996dc1.tar.xz | |
Merge zizzer:/bk/m5
into zizzer.eecs.umich.edu:/.automount/zed/z/hsul/work/m5/pact05
--HG--
extra : convert_revision : e7ff23f6ac4e434d8b3117275df12fec03964a55
Diffstat (limited to 'python/m5/objects/BaseSystem.mpy')
| -rw-r--r-- | python/m5/objects/BaseSystem.mpy | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/python/m5/objects/BaseSystem.mpy b/python/m5/objects/BaseSystem.mpy index 1cbdf4e99..450b6a58e 100644 --- a/python/m5/objects/BaseSystem.mpy +++ b/python/m5/objects/BaseSystem.mpy @@ -1,8 +1,8 @@ simobj BaseSystem(SimObject): type = 'BaseSystem' abstract = True - memctrl = Param.MemoryController(Super, "memory controller") - physmem = Param.PhysicalMemory(Super, "phsyical memory") + memctrl = Param.MemoryController(parent.any, "memory controller") + physmem = Param.PhysicalMemory(parent.any, "phsyical memory") kernel = Param.String("file that contains the kernel code") console = Param.String("file that contains the console code") pal = Param.String("file that contains palcode") |