From de3927782491c3dbbb865339fd3216b2f67503fa Mon Sep 17 00:00:00 2001 From: Ming Liu Date: Mon, 17 Aug 2020 11:32:54 +0200 Subject: 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 Signed-off-by: Richard Purdie (cherry picked from commit b812fad85aed6cb9e433c689f3b14425488dfc68) Signed-off-by: Steve Sakoman Signed-off-by: Richard Purdie --- meta/conf/machine/qemumips.conf | 2 ++ meta/conf/machine/qemumips64.conf | 2 ++ 2 files changed, 4 insertions(+) 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 KERNEL_IMAGETYPE = "vmlinux" KERNEL_ALT_IMAGETYPE = "vmlinux.bin" +UBOOT_MACHINE ?= "qemu_mips_defconfig" + 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 6d5174665f..1e77486491 100644 --- a/meta/conf/machine/qemumips64.conf +++ b/meta/conf/machine/qemumips64.conf @@ -11,6 +11,8 @@ QB_CPU = "-cpu MIPS64R2-generic" KERNEL_IMAGETYPE = "vmlinux" KERNEL_ALT_IMAGETYPE = "vmlinux.bin" +UBOOT_MACHINE ?= "qemu_mips64_defconfig" + SERIAL_CONSOLES ?= "115200;ttyS0 115200;ttyS1" QB_SYSTEM_NAME = "qemu-system-mips64" -- cgit v1.2.3-54-g00ecf