From 4e7557640c2b3e0c11f2482c0a878021a8ff48ff Mon Sep 17 00:00:00 2001 From: Changqing Li Date: Tue, 20 Aug 2019 10:45:44 +0800 Subject: 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 Signed-off-by: Ross Burton Signed-off-by: Richard Purdie --- meta/conf/machine/include/qemuboot-mips.inc | 1 - meta/conf/machine/qemumips.conf | 2 ++ meta/conf/machine/qemumips64.conf | 2 ++ 3 files changed, 4 insertions(+), 1 deletion(-) 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" QB_OPT_APPEND = "-vga cirrus -show-cursor -usb -device usb-tablet" # Add the 'virtio-rng-pci' device otherwise the guest may run out of entropy QB_OPT_APPEND += "-object rng-random,filename=/dev/urandom,id=rng0 -device virtio-rng-pci,rng=rng0" -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" KERNEL_ALT_IMAGETYPE = "vmlinux.bin" SERIAL_CONSOLES ?= "115200;ttyS0 115200;ttyS1" + +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" KERNEL_ALT_IMAGETYPE = "vmlinux.bin" SERIAL_CONSOLES ?= "115200;ttyS0 115200;ttyS1" + +QB_SYSTEM_NAME = "qemu-system-mips64" -- cgit v1.2.3-54-g00ecf