From 595e692de09e1b7cbc5f57ac01da299afc066fdd Mon Sep 17 00:00:00 2001 From: Weiping Liao Date: Thu, 12 Jan 2017 18:12:20 -0800 Subject: config: Changes to boot Android N necessary kernel command line options in FSConfig.py Change-Id: Id66f640b6beb4efa9c23080c3d2516eda688c72d Reviewed-on: https://gem5-review.googlesource.com/3320 Reviewed-by: Andreas Sandberg Maintainer: Andreas Sandberg --- configs/common/FSConfig.py | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/configs/common/FSConfig.py b/configs/common/FSConfig.py index 3a169a4bb..cf9f034bc 100644 --- a/configs/common/FSConfig.py +++ b/configs/common/FSConfig.py @@ -53,7 +53,8 @@ os_types = { 'alpha' : [ 'linux' ], 'android-gingerbread', 'android-ics', 'android-jellybean', - 'android-kitkat' ], + 'android-kitkat', + 'android-nougat', ], } class CowIdeDisk(IdeDisk): @@ -347,7 +348,14 @@ def makeArmSystem(mem_mode, machine_type, num_cpus=1, mdesc=None, # release-specific tweaks if 'kitkat' in mdesc.os_type(): cmdline += " androidboot.hardware=gem5 qemu=1 qemu.gles=0 " + \ - "android.bootanim=0" + "android.bootanim=0 " + elif 'nougat' in mdesc.os_type(): + cmdline += " androidboot.hardware=gem5 qemu=1 qemu.gles=0 " + \ + "android.bootanim=0 " + \ + "vmalloc=640MB " + \ + "android.early.fstab=/fstab.gem5 " + \ + "androidboot.selinux=permissive " + \ + "video=Virtual-1:1920x1080-16" self.boot_osflags = fillInCmdline(mdesc, cmdline) -- cgit v1.2.3