diff options
author | Changqing Li <changqing.li@windriver.com> | 2019-08-20 10:45:44 +0800 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2019-08-22 22:48:26 +0100 |
commit | 4e7557640c2b3e0c11f2482c0a878021a8ff48ff (patch) | |
tree | 5ea5e56c65656bf35f7d553a125e953d4af198f0 /meta/conf/machine | |
parent | edc6e1458c1e229aaad7c9f92c4806a7cd1678c6 (diff) | |
download | poky-4e7557640c2b3e0c11f2482c0a878021a8ff48ff.tar.gz |
qemumips/qemumips64: move QB_SYSTEM_NAME to corresponding conf
Configuration:
MACHINE = qemumips64
bitbake lib32-core-image-minimal
runqemu slirp nographic qemumips64 ext4
Error:
ERROR - Failed to run qemu: qemu-system-mips: unable to find CPU model 'MIPS64R2-generic'
Fixed by moving QB_SYSTEM_NAME to Respective configuration file
(From OE-Core rev: e724e8836ed614ff8eaa0d0d9c51d22ee62576b3)
Signed-off-by: Changqing Li <changqing.li@windriver.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/conf/machine')
-rw-r--r-- | meta/conf/machine/include/qemuboot-mips.inc | 1 | ||||
-rw-r--r-- | meta/conf/machine/qemumips.conf | 2 | ||||
-rw-r--r-- | meta/conf/machine/qemumips64.conf | 2 |
3 files changed, 4 insertions, 1 deletions
diff --git a/meta/conf/machine/include/qemuboot-mips.inc b/meta/conf/machine/include/qemuboot-mips.inc index 75bb98861f..a5f9ed821f 100644 --- a/meta/conf/machine/include/qemuboot-mips.inc +++ b/meta/conf/machine/include/qemuboot-mips.inc | |||
@@ -6,4 +6,3 @@ QB_KERNEL_CMDLINE_APPEND = "console=ttyS0 console=tty" | |||
6 | QB_OPT_APPEND = "-vga cirrus -show-cursor -usb -device usb-tablet" | 6 | QB_OPT_APPEND = "-vga cirrus -show-cursor -usb -device usb-tablet" |
7 | # Add the 'virtio-rng-pci' device otherwise the guest may run out of entropy | 7 | # Add the 'virtio-rng-pci' device otherwise the guest may run out of entropy |
8 | QB_OPT_APPEND += "-object rng-random,filename=/dev/urandom,id=rng0 -device virtio-rng-pci,rng=rng0" | 8 | QB_OPT_APPEND += "-object rng-random,filename=/dev/urandom,id=rng0 -device virtio-rng-pci,rng=rng0" |
9 | QB_SYSTEM_NAME = "qemu-system-${TUNE_ARCH}" | ||
diff --git a/meta/conf/machine/qemumips.conf b/meta/conf/machine/qemumips.conf index 48d9f41d9d..31ad754483 100644 --- a/meta/conf/machine/qemumips.conf +++ b/meta/conf/machine/qemumips.conf | |||
@@ -10,3 +10,5 @@ KERNEL_IMAGETYPE = "vmlinux" | |||
10 | KERNEL_ALT_IMAGETYPE = "vmlinux.bin" | 10 | KERNEL_ALT_IMAGETYPE = "vmlinux.bin" |
11 | 11 | ||
12 | SERIAL_CONSOLES ?= "115200;ttyS0 115200;ttyS1" | 12 | SERIAL_CONSOLES ?= "115200;ttyS0 115200;ttyS1" |
13 | |||
14 | QB_SYSTEM_NAME = "qemu-system-mips" | ||
diff --git a/meta/conf/machine/qemumips64.conf b/meta/conf/machine/qemumips64.conf index 1872e7b62d..6d5174665f 100644 --- a/meta/conf/machine/qemumips64.conf +++ b/meta/conf/machine/qemumips64.conf | |||
@@ -12,3 +12,5 @@ KERNEL_IMAGETYPE = "vmlinux" | |||
12 | KERNEL_ALT_IMAGETYPE = "vmlinux.bin" | 12 | KERNEL_ALT_IMAGETYPE = "vmlinux.bin" |
13 | 13 | ||
14 | SERIAL_CONSOLES ?= "115200;ttyS0 115200;ttyS1" | 14 | SERIAL_CONSOLES ?= "115200;ttyS0 115200;ttyS1" |
15 | |||
16 | QB_SYSTEM_NAME = "qemu-system-mips64" | ||