fs.py (10635:ab05a080d7c5) | fs.py (10697:71c40e5c8bd4) |
---|---|
1# Copyright (c) 2010-2013 ARM Limited 2# All rights reserved. 3# 4# The license below extends only to copyright in the software and shall 5# not be construed as granting a license to any other intellectual 6# property including but not limited to intellectual property relating 7# to a hardware implementation of the functionality of the software 8# licensed hereunder. You may use the software subject to the license --- 299 unchanged lines hidden (view full) --- 308 try: 309 bm = Benchmarks[options.benchmark] 310 except KeyError: 311 print "Error benchmark %s has not been defined." % options.benchmark 312 print "Valid benchmarks are: %s" % DefinedBenchmarks 313 sys.exit(1) 314else: 315 if options.dual: | 1# Copyright (c) 2010-2013 ARM Limited 2# All rights reserved. 3# 4# The license below extends only to copyright in the software and shall 5# not be construed as granting a license to any other intellectual 6# property including but not limited to intellectual property relating 7# to a hardware implementation of the functionality of the software 8# licensed hereunder. You may use the software subject to the license --- 299 unchanged lines hidden (view full) --- 308 try: 309 bm = Benchmarks[options.benchmark] 310 except KeyError: 311 print "Error benchmark %s has not been defined." % options.benchmark 312 print "Valid benchmarks are: %s" % DefinedBenchmarks 313 sys.exit(1) 314else: 315 if options.dual: |
316 bm = [SysConfig(disk=options.disk_image, mem=options.mem_size), 317 SysConfig(disk=options.disk_image, mem=options.mem_size)] | 316 bm = [SysConfig(disk=options.disk_image, rootdev=options.root_device, 317 mem=options.mem_size), 318 SysConfig(disk=options.disk_image, rootdev=options.root_device, 319 mem=options.mem_size)] |
318 else: | 320 else: |
319 bm = [SysConfig(disk=options.disk_image, mem=options.mem_size)] | 321 bm = [SysConfig(disk=options.disk_image, rootdev=options.root_device, 322 mem=options.mem_size)] |
320 321np = options.num_cpus 322 323test_sys = build_test_system(np) 324if len(bm) == 2: 325 drive_sys = build_drive_system(np) 326 root = makeDualRoot(True, test_sys, drive_sys, options.etherdump) 327elif len(bm) == 1: --- 13 unchanged lines hidden --- | 323 324np = options.num_cpus 325 326test_sys = build_test_system(np) 327if len(bm) == 2: 328 drive_sys = build_drive_system(np) 329 root = makeDualRoot(True, test_sys, drive_sys, options.etherdump) 330elif len(bm) == 1: --- 13 unchanged lines hidden --- |