diff options
author | Robert Yang <liezhi.yang@windriver.com> | 2019-02-15 16:14:52 +0800 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2019-02-25 22:27:40 +0000 |
commit | a0f99f3bcfb317b687389b4d39c49ad6ccd4e723 (patch) | |
tree | db6cb29747d56281a0187194ddc6e57f31c7d0fc | |
parent | 18f000c708187a18945b18352d735243a392fb0c (diff) | |
download | poky-a0f99f3bcfb317b687389b4d39c49ad6ccd4e723.tar.gz |
runqemu: Make QB_MEM easier to set
It only could be set as the following in the past:
QB_MEM = "-m 256"
Now it also can be set as:
QB_MEM = "-m 256M (or m)"
QB_MEM = "256M (or m)"
[YOCTO #11522]
(From OE-Core rev: ad246f5ce0652bd917d85884176baa746e1379ff)
(From OE-Core rev: ed10ef4f8deaec739ce3713b6ce3b63e134a8c4a)
Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
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>
-rwxr-xr-x | scripts/runqemu | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/scripts/runqemu b/scripts/runqemu index 52505719c9..1c96b29a40 100755 --- a/scripts/runqemu +++ b/scripts/runqemu | |||
@@ -674,6 +674,17 @@ class BaseConfig(object): | |||
674 | logger.info('QB_MEM is not set, use 512M by default') | 674 | logger.info('QB_MEM is not set, use 512M by default') |
675 | self.set('QB_MEM', '-m 512') | 675 | self.set('QB_MEM', '-m 512') |
676 | 676 | ||
677 | # Check and remove M or m suffix | ||
678 | qb_mem = self.get('QB_MEM') | ||
679 | if qb_mem.endswith('M') or qb_mem.endswith('m'): | ||
680 | qb_mem = qb_mem[:-1] | ||
681 | |||
682 | # Add -m prefix it not present | ||
683 | if not qb_mem.startswith('-m'): | ||
684 | qb_mem = '-m %s' % qb_mem | ||
685 | |||
686 | self.set('QB_MEM', qb_mem) | ||
687 | |||
677 | mach = self.get('MACHINE') | 688 | mach = self.get('MACHINE') |
678 | if not mach.startswith('qemumips'): | 689 | if not mach.startswith('qemumips'): |
679 | self.kernel_cmdline_script += ' mem=%s' % self.get('QB_MEM').replace('-m','').strip() + 'M' | 690 | self.kernel_cmdline_script += ' mem=%s' % self.get('QB_MEM').replace('-m','').strip() + 'M' |