diff -r d06e5a6b4b7f -r 2d8b73ec3b08 configs/example/fs.py --- a/configs/example/fs.py Sun Jan 17 19:18:49 2016 -0800 +++ b/configs/example/fs.py Mon Jan 18 16:49:51 2016 -0700 @@ -99,7 +99,9 @@ options.num_cpus, bm[0], options.dtb_filename, bare_metal=options.bare_metal, cmdline=cmdline, - external_memory=options.external_memory_system) + external_memory=options.external_memory_system, + enable_nomali=options.enable_nomali) + if options.enable_context_switch_stats_dump: test_sys.enable_context_switch_stats_dump = True else: @@ -137,6 +139,14 @@ test_sys.init_param = options.init_param + if options.enable_nomali: + test_sys.gpu = NoMaliGpu( + gpu_type="T760", + ver_maj=0, ver_min=0, ver_status=1, + int_job=114, int_mmu=115, int_gpu=116, + pio_addr=0x2d000000, + pio=test_sys.membus.master) + # For now, assign all the CPUs to the same clock domain test_sys.cpu = [TestCPUClass(clk_domain=test_sys.cpu_clk_domain, cpu_id=i) for i in xrange(np)] diff -r d06e5a6b4b7f -r 2d8b73ec3b08 configs/common/Options.py --- a/configs/common/Options.py Sun Jan 17 19:18:49 2016 -0800 +++ b/configs/common/Options.py Mon Jan 18 16:49:51 2016 -0700 @@ -293,6 +293,8 @@ parser.add_option("--enable-context-switch-stats-dump", \ action="store_true", help="Enable stats dump at context "\ "switches and dump tasks file (required for Streamline)") + parser.add_option("--enable-nomali", action="store_true", \ + help="Enable NoMali options (kernel arguments, python instantiation)") # Benchmark options parser.add_option("--dual", action="store_true", diff -r d06e5a6b4b7f -r 2d8b73ec3b08 configs/common/FSConfig.py --- a/configs/common/FSConfig.py Sun Jan 17 19:18:49 2016 -0800 +++ b/configs/common/FSConfig.py Mon Jan 18 16:49:51 2016 -0700 @@ -203,7 +203,7 @@ def makeArmSystem(mem_mode, machine_type, num_cpus=1, mdesc=None, dtb_filename=None, bare_metal=False, cmdline=None, - external_memory=""): + external_memory="", enable_nomali=False): assert machine_type default_dtbs = { @@ -345,8 +345,8 @@ # release-specific tweaks if 'kitkat' in mdesc.os_type(): - cmdline += " androidboot.hardware=gem5 qemu=1 qemu.gles=0 " + \ - "android.bootanim=0" + cmdline += " androidboot.hardware=gem5 qemu=1 " + \ + "qemu.gles=%0d android.bootanim=0" % (enable_nomali) self.boot_osflags = fillInCmdline(mdesc, cmdline)