diff options
author | Joerg Vehlow <joerg.vehlow@aox-tech.de> | 2019-10-11 08:03:57 +0200 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2019-10-15 14:16:11 +0100 |
commit | 7ed5aa23c796b8593a4bf66f1b36ffbc69a27496 (patch) | |
tree | d1962fa32d4e14c443701bea1481cd3f4792b123 /scripts/runqemu | |
parent | 4ee045ce0b436bb4465a72f3d89ceb8959c2cb6b (diff) | |
download | poky-7ed5aa23c796b8593a4bf66f1b36ffbc69a27496.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: 3ecb6744402332f1ad143eb1eb6a94143e1700c8)
Signed-off-by: Joerg Vehlow <joerg.vehlow@aox-tech.de>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'scripts/runqemu')
-rwxr-xr-x | scripts/runqemu | 4 |
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 = '' |