Gabe Black has uploaded this change for review. (
https://gem5-review.googlesource.com/3320
Change subject: config: Changes to boot Android N
......................................................................
config: Changes to boot Android N
(1) necessary kernel command line options in FSConfig.py
(2) load_addr_mask in VExpress_GEM5_V1 in order to boot with the 64-bit
kernel
Change-Id: Id66f640b6beb4efa9c23080c3d2516eda688c72d
---
M configs/common/FSConfig.py
M src/dev/arm/RealView.py
2 files changed, 13 insertions(+), 3 deletions(-)
diff --git a/configs/common/FSConfig.py b/configs/common/FSConfig.py
index 3a169a4..cf9f034 100644
--- a/configs/common/FSConfig.py
+++ b/configs/common/FSConfig.py
@@ -53,7 +53,8 @@
'android-gingerbread',
'android-ics',
'android-jellybean',
- 'android-kitkat' ],
+ 'android-kitkat',
+ 'android-nougat', ],
}
class CowIdeDisk(IdeDisk):
@@ -347,7 +348,14 @@
# 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)
diff --git a/src/dev/arm/RealView.py b/src/dev/arm/RealView.py
index a2bac2b..595020b 100644
--- a/src/dev/arm/RealView.py
+++ b/src/dev/arm/RealView.py
@@ -955,7 +955,9 @@
self.nvmem.port = mem_bus.master
cur_sys.boot_loader = [ loc('boot_emm.arm64'), loc('boot_emm.arm')
]
cur_sys.atags_addr = 0x8000000
- cur_sys.load_addr_mask = 0xfffffff
+ # the old load_add_mask 0xfffffff works for 32-bit kernel
+ # but not the 64-bit one. The new value 0x7ffffff works for both
+ cur_sys.load_addr_mask = 0x7ffffff
cur_sys.load_offset = 0x80000000
# Setup m5ops. It's technically not a part of the boot
--
To view, visit https://gem5-review.googlesource.com/3320
To unsubscribe, visit https://gem5-review.googlesource.com/settings
Gerrit-Project: public/gem5
Gerrit-Branch: master
Gerrit-MessageType: newchange
Gerrit-Change-Id: Id66f640b6beb4efa9c23080c3d2516eda688c72d
Gerrit-Change-Number: 3320
Gerrit-PatchSet: 1
Gerrit-Owner: Gabe Black <[email protected]>
Gerrit-Reviewer: Weiping Liao <[email protected]>
_______________________________________________
gem5-dev mailing list
[email protected]
http://m5sim.org/mailman/listinfo/gem5-dev
