diff options
| author | Kevin Lim <ktlim@umich.edu> | 2005-03-18 15:32:53 -0500 |
|---|---|---|
| committer | Kevin Lim <ktlim@umich.edu> | 2005-03-18 15:32:53 -0500 |
| commit | cfa4221e19459d2179ba5601cf71a7a53753a3b1 (patch) | |
| tree | 108c984e4fb9ef421557f610c210aa76c4dd70ed /python/m5/objects/BaseSystem.mpy | |
| parent | 363f02a1fd0a8ae8c91152ccde4453b934d7d3d4 (diff) | |
| parent | 3efabb657948e53462bfe60ca93a2ac147074ea1 (diff) | |
| download | gem5-cfa4221e19459d2179ba5601cf71a7a53753a3b1.tar.xz | |
Merge ktlim@zizzer.eecs.umich.edu:/bk/m5
into zamp.eecs.umich.edu:/z/ktlim2/m5
--HG--
extra : convert_revision : cbf8da2fe5c4155d9ed8318597d543ff105449d3
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") |