diff -r 4a86763c0b30 -r 7b83be200f9e configs/example/arm/fs_bigLITTLE.py --- a/configs/example/arm/fs_bigLITTLE.py Sat Oct 15 15:11:07 2016 -0500 +++ b/configs/example/arm/fs_bigLITTLE.py Tue Oct 18 20:39:12 2016 -0700 @@ -52,7 +52,7 @@ from common import CpuConfig import devices - +import MemConfig default_dtb = 'armv8_gem5_v1_big_little_2_2.dtb' default_kernel = 'vmlinux4.3.aarch64' @@ -79,15 +79,14 @@ cpu_voltage, *cpu_config) -def createSystem(kernel, bootscript, disks=[]): +def createSystem(options, kernel, bootscript, disks=[]): sys = devices.SimpleSystem(kernel=SysPaths.binary(kernel), readfile=bootscript, machine_type="DTOnly") mem_region = sys.realview._mem_regions[0] - sys.mem_ctrls = SimpleMemory( - range=AddrRange(start=mem_region[0], size=default_mem_size)) - sys.mem_ctrls.port = sys.membus.master + sys.mem_ranges = AddrRange(start=mem_region[0], size=default_mem_size) + MemConfig.config_mem(options, sys) sys.connect() @@ -140,6 +139,21 @@ parser.add_argument("--little-cpu-clock", type=str, default="1GHz", help="Little CPU clock frequency") + parser.add_argument("--mem-type", type=str, default="DDR3_1600_x64", + help="memory controller type") + parser.add_argument("--mem-channels", type=int, default=1, + help = "number of memory channels") + parser.add_argument("--mem-ranks", type=int, default=None, + help = "number of memory ranks per channel") + parser.add_argument("--mem-size", action="store", type=str, + default="512MB", + help="Specify the physical memory size") + parser.add_argument("--tlm-memory", type=str, + help="use external port for SystemC TLM ") + parser.add_argument("--external-memory-system", type=str, + help="use external ports of this port_type for caches") + parser.add_argument("--elastic-trace-en", action="store_true", + help="Enable capture of elastic trace probe.") m5.ticks.fixGlobalFrequency() options = parser.parse_args() @@ -160,7 +174,8 @@ root = Root(full_system=True) disks = default_disk if len(options.disk) == 0 else options.disk - system = createSystem(options.kernel, options.bootscript, disks=disks) + system = createSystem(options, options.kernel, options.bootscript, + disks=disks) root.system = system system.boot_osflags = " ".join(kernel_cmd)