summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMing Liu <liu.ming50@gmail.com>2020-08-17 11:32:54 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2020-09-02 16:04:37 +0100
commitde3927782491c3dbbb865339fd3216b2f67503fa (patch)
treec96ee166b183b4f209712db4977877cafd2b95aa
parentbc5c367f09a29c8b735b4fd0057cb37f55015808 (diff)
downloadpoky-de3927782491c3dbbb865339fd3216b2f67503fa.tar.gz
conf/machine: set UBOOT_MACHINE for qemumips and qemumips64
These machines support booting U-Boot, so set the machine appropriately. (From OE-Core rev: 259653b67810da4085fa78e8e6538651dc19ff3b) Signed-off-by: Ming Liu <liu.ming50@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> (cherry picked from commit b812fad85aed6cb9e433c689f3b14425488dfc68) Signed-off-by: Steve Sakoman <steve@sakoman.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/conf/machine/qemumips.conf2
-rw-r--r--meta/conf/machine/qemumips64.conf2
2 files changed, 4 insertions, 0 deletions
diff --git a/meta/conf/machine/qemumips.conf b/meta/conf/machine/qemumips.conf
index 4617c3c7b6..1373e4cba0 100644
--- a/meta/conf/machine/qemumips.conf
+++ b/meta/conf/machine/qemumips.conf
@@ -9,6 +9,8 @@ require conf/machine/include/qemuboot-mips.inc
9KERNEL_IMAGETYPE = "vmlinux" 9KERNEL_IMAGETYPE = "vmlinux"
10KERNEL_ALT_IMAGETYPE = "vmlinux.bin" 10KERNEL_ALT_IMAGETYPE = "vmlinux.bin"
11 11
12UBOOT_MACHINE ?= "qemu_mips_defconfig"
13
12SERIAL_CONSOLES ?= "115200;ttyS0 115200;ttyS1" 14SERIAL_CONSOLES ?= "115200;ttyS0 115200;ttyS1"
13 15
14QB_SYSTEM_NAME = "qemu-system-mips" 16QB_SYSTEM_NAME = "qemu-system-mips"
diff --git a/meta/conf/machine/qemumips64.conf b/meta/conf/machine/qemumips64.conf
index 6d5174665f..1e77486491 100644
--- a/meta/conf/machine/qemumips64.conf
+++ b/meta/conf/machine/qemumips64.conf
@@ -11,6 +11,8 @@ QB_CPU = "-cpu MIPS64R2-generic"
11KERNEL_IMAGETYPE = "vmlinux" 11KERNEL_IMAGETYPE = "vmlinux"
12KERNEL_ALT_IMAGETYPE = "vmlinux.bin" 12KERNEL_ALT_IMAGETYPE = "vmlinux.bin"
13 13
14UBOOT_MACHINE ?= "qemu_mips64_defconfig"
15
14SERIAL_CONSOLES ?= "115200;ttyS0 115200;ttyS1" 16SERIAL_CONSOLES ?= "115200;ttyS0 115200;ttyS1"
15 17
16QB_SYSTEM_NAME = "qemu-system-mips64" 18QB_SYSTEM_NAME = "qemu-system-mips64"