summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorRoss Burton <ross.burton@arm.com>2020-07-31 13:56:33 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2020-08-01 19:57:26 +0100
commit7dd4100bf00fca0b98b762bb3815b8055f1201f2 (patch)
tree6f4f000932f8d572df2ae7471d3213db5721b43f /meta
parentf2238b656e7f64c0f95556d2bf22420cef64d2a4 (diff)
downloadopenembedded-core-7dd4100bf00fca0b98b762bb3815b8055f1201f2.tar.gz
conf/machine: set UBOOT_MACHINE for qemuarm and qemuarm64
These machines support booting U-Boot, so set the machine appropriately. Signed-off-by: Ross Burton <ross.burton@arm.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/conf/machine/qemuarm.conf2
-rw-r--r--meta/conf/machine/qemuarm64.conf2
2 files changed, 4 insertions, 0 deletions
diff --git a/meta/conf/machine/qemuarm.conf b/meta/conf/machine/qemuarm.conf
index 44e73a3070..3364dcf042 100644
--- a/meta/conf/machine/qemuarm.conf
+++ b/meta/conf/machine/qemuarm.conf
@@ -7,6 +7,8 @@ require conf/machine/include/qemu.inc
KERNEL_IMAGETYPE = "zImage"
+UBOOT_MACHINE ?= "qemu_arm_defconfig"
+
SERIAL_CONSOLES ?= "115200;ttyAMA0 115200;hvc0"
SERIAL_CONSOLES_CHECK = "${SERIAL_CONSOLES}"
diff --git a/meta/conf/machine/qemuarm64.conf b/meta/conf/machine/qemuarm64.conf
index d0d6f38e42..fdd464d708 100644
--- a/meta/conf/machine/qemuarm64.conf
+++ b/meta/conf/machine/qemuarm64.conf
@@ -7,6 +7,8 @@ require conf/machine/include/qemu.inc
KERNEL_IMAGETYPE = "Image"
+UBOOT_MACHINE ?= "qemu_arm64_defconfig"
+
SERIAL_CONSOLES ?= "115200;ttyAMA0 115200;hvc0"
SERIAL_CONSOLES_CHECK = "${SERIAL_CONSOLES}"