diff options
| author | Ross Burton <ross.burton@arm.com> | 2020-07-31 13:56:33 +0100 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2020-08-01 19:57:49 +0100 |
| commit | c25bdec52468bdddb97dcfba017b3f19ec42a488 (patch) | |
| tree | bd916f8e4d62cfc26e3d34d6ccf60e4625c4adea /meta/conf/machine | |
| parent | f5f14239ccb6660c14cdde42e0044f2ff6498857 (diff) | |
| download | poky-c25bdec52468bdddb97dcfba017b3f19ec42a488.tar.gz | |
conf/machine: set UBOOT_MACHINE for qemuarm and qemuarm64
These machines support booting U-Boot, so set the machine appropriately.
(From OE-Core rev: 7dd4100bf00fca0b98b762bb3815b8055f1201f2)
Signed-off-by: Ross Burton <ross.burton@arm.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/conf/machine')
| -rw-r--r-- | meta/conf/machine/qemuarm.conf | 2 | ||||
| -rw-r--r-- | meta/conf/machine/qemuarm64.conf | 2 |
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 | |||
| 7 | 7 | ||
| 8 | KERNEL_IMAGETYPE = "zImage" | 8 | KERNEL_IMAGETYPE = "zImage" |
| 9 | 9 | ||
| 10 | UBOOT_MACHINE ?= "qemu_arm_defconfig" | ||
| 11 | |||
| 10 | SERIAL_CONSOLES ?= "115200;ttyAMA0 115200;hvc0" | 12 | SERIAL_CONSOLES ?= "115200;ttyAMA0 115200;hvc0" |
| 11 | SERIAL_CONSOLES_CHECK = "${SERIAL_CONSOLES}" | 13 | SERIAL_CONSOLES_CHECK = "${SERIAL_CONSOLES}" |
| 12 | 14 | ||
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 | |||
| 7 | 7 | ||
| 8 | KERNEL_IMAGETYPE = "Image" | 8 | KERNEL_IMAGETYPE = "Image" |
| 9 | 9 | ||
| 10 | UBOOT_MACHINE ?= "qemu_arm64_defconfig" | ||
| 11 | |||
| 10 | SERIAL_CONSOLES ?= "115200;ttyAMA0 115200;hvc0" | 12 | SERIAL_CONSOLES ?= "115200;ttyAMA0 115200;hvc0" |
| 11 | SERIAL_CONSOLES_CHECK = "${SERIAL_CONSOLES}" | 13 | SERIAL_CONSOLES_CHECK = "${SERIAL_CONSOLES}" |
| 12 | 14 | ||
