summaryrefslogtreecommitdiffstats
path: root/scripts/runqemu
diff options
context:
space:
mode:
authorJoerg Vehlow <joerg.vehlow@aox-tech.de>2019-10-11 08:03:57 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2019-10-29 09:08:17 +0000
commit5fb336e9579420a90561f57908a2300d1c4abd64 (patch)
tree227dcef7e9f8836cfaa99f7a17b3ad9d253d4576 /scripts/runqemu
parent527456a57ae1051848c02e8e4f9d20c3266203bc (diff)
downloadpoky-5fb336e9579420a90561f57908a2300d1c4abd64.tar.gz
runqemu: Remove disabling of high resolution timer
The option 'highres=off' sneaked itself into the runqemu script for all configurations, where the root filesystem type is not 'cpio' or 'cpio.gz'. See: https://bugzilla.yoctoproject.org/show_bug.cgi?id=13590 (From OE-Core rev: f71b1a96529d658d1c6c7dc04dca1957ea647e4e) Signed-off-by: Joerg Vehlow <joerg.vehlow@aox-tech.de> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> Signed-off-by: Armin Kuster <akuster808@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'scripts/runqemu')
-rwxr-xr-xscripts/runqemu4
1 files changed, 2 insertions, 2 deletions
diff --git a/scripts/runqemu b/scripts/runqemu
index 46087b8d6a..a05facd0db 100755
--- a/scripts/runqemu
+++ b/scripts/runqemu
@@ -1198,12 +1198,12 @@ class BaseConfig(object):
1198 1198
1199 # All branches above set vm_drive. 1199 # All branches above set vm_drive.
1200 self.rootfs_options = '%s -no-reboot' % vm_drive 1200 self.rootfs_options = '%s -no-reboot' % vm_drive
1201 self.kernel_cmdline = 'root=%s rw highres=off' % (self.get('QB_KERNEL_ROOT')) 1201 self.kernel_cmdline = 'root=%s rw' % (self.get('QB_KERNEL_ROOT'))
1202 1202
1203 if self.fstype == 'nfs': 1203 if self.fstype == 'nfs':
1204 self.rootfs_options = '' 1204 self.rootfs_options = ''
1205 k_root = '/dev/nfs nfsroot=%s:%s,%s' % (self.nfs_server, os.path.abspath(self.rootfs), self.unfs_opts) 1205 k_root = '/dev/nfs nfsroot=%s:%s,%s' % (self.nfs_server, os.path.abspath(self.rootfs), self.unfs_opts)
1206 self.kernel_cmdline = 'root=%s rw highres=off' % k_root 1206 self.kernel_cmdline = 'root=%s rw' % k_root
1207 1207
1208 if self.fstype == 'none': 1208 if self.fstype == 'none':
1209 self.rootfs_options = '' 1209 self.rootfs_options = ''