diff options
| author | Gabe Black <gblack@eecs.umich.edu> | 2012-01-30 21:07:57 -0800 |
|---|---|---|
| committer | Gabe Black <gblack@eecs.umich.edu> | 2012-01-30 21:07:57 -0800 |
| commit | e88165a431a90cf7e33e205794caed898ca6fcb1 (patch) | |
| tree | 741d1c85c83957add6250af0a208d1b976023e29 /configs | |
| parent | 39f314cc151b0a05ee0e654d52bad1c906fac668 (diff) | |
| parent | ade53def9252a36a39b2c4bd61196355906f0505 (diff) | |
| download | gem5-e88165a431a90cf7e33e205794caed898ca6fcb1.tar.xz | |
Merge with main repository.
Diffstat (limited to 'configs')
| -rw-r--r-- | configs/example/se.py | 1 | ||||
| -rw-r--r-- | configs/ruby/Ruby.py | 5 |
2 files changed, 4 insertions, 2 deletions
diff --git a/configs/example/se.py b/configs/example/se.py index 1edd99e9b..35025a8ff 100644 --- a/configs/example/se.py +++ b/configs/example/se.py @@ -181,7 +181,6 @@ if options.ruby: options.use_map = True Ruby.create_system(options, system) assert(options.num_cpus == len(system.ruby._cpu_ruby_ports)) - system.system_port = system.ruby._sys_port_proxy.port else: system.system_port = system.membus.port system.physmem.port = system.membus.port diff --git a/configs/ruby/Ruby.py b/configs/ruby/Ruby.py index b2342eed4..920eac019 100644 --- a/configs/ruby/Ruby.py +++ b/configs/ruby/Ruby.py @@ -105,6 +105,10 @@ def create_system(options, system, piobus = None, dma_devices = []): # full-fledged controller system.sys_port_proxy = sys_port_proxy + # Connect the system port for loading of binaries etc + system.system_port = system.sys_port_proxy.port + + # # Set the network classes based on the command line options # @@ -182,5 +186,4 @@ def create_system(options, system, piobus = None, dma_devices = []): ruby.profiler = ruby_profiler ruby.mem_size = total_mem_size ruby._cpu_ruby_ports = cpu_sequencers - ruby._sys_port_proxy = sys_port_proxy ruby.random_seed = options.random_seed |