From a20fbdfc23f8c7cbbe2c0b884d28db99442feba9 Mon Sep 17 00:00:00 2001 From: Nilay Vaish Date: Mon, 17 Mar 2014 17:40:15 -0500 Subject: config: ruby: remove piobus from protocols This patch removes the piobus from the protocol config files. The ports are now connected to the piobus in the Ruby.py file. --- configs/ruby/MOESI_CMP_token.py | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) (limited to 'configs/ruby/MOESI_CMP_token.py') diff --git a/configs/ruby/MOESI_CMP_token.py b/configs/ruby/MOESI_CMP_token.py index 78ccef71a..52c1b44f4 100644 --- a/configs/ruby/MOESI_CMP_token.py +++ b/configs/ruby/MOESI_CMP_token.py @@ -55,7 +55,7 @@ def define_options(parser): parser.add_option("--allow-atomic-migration", action="store_true", help="allow migratory sharing for atomic only accessed blocks") -def create_system(options, system, piobus, dma_ports, ruby_system): +def create_system(options, system, dma_ports, ruby_system): if buildEnv['PROTOCOL'] != 'MOESI_CMP_token': panic("This script requires the MOESI_CMP_token protocol to be built.") @@ -120,13 +120,8 @@ def create_system(options, system, piobus, dma_ports, ruby_system): ruby_system = ruby_system) l1_cntrl.sequencer = cpu_seq - - if piobus != None: - cpu_seq.pio_master_port = piobus.slave - cpu_seq.mem_master_port = piobus.slave - cpu_seq.pio_slave_port = piobus.master - exec("ruby_system.l1_cntrl%d = l1_cntrl" % i) + # # Add controllers and sequencers to the appropriate lists # -- cgit v1.2.3