summaryrefslogtreecommitdiffstats
path: root/meta/conf/machine
diff options
context:
space:
mode:
authorAndre McCurdy <armccurdy@gmail.com>2016-03-17 10:19:26 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-03-20 23:12:28 +0000
commitae63b8843eff399bfba3272b8612c972b6d12b7e (patch)
tree38d24568023c731cfaf71af14656c6eb94214a07 /meta/conf/machine
parentcad415dc2f0929de2f6f62fd04b56853c844c2a7 (diff)
downloadpoky-ae63b8843eff399bfba3272b8612c972b6d12b7e.tar.gz
qemuarm64.conf: don't clear MACHINE_FEATURES
Accept the default MACHINE_FEATURES from qemu.inc (qemuarm64 shouldn't need to be a special case). (From OE-Core rev: e26718f8c048315e2ab819bc60566061f6ced420) Signed-off-by: Andre McCurdy <armccurdy@gmail.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/conf/machine')
-rw-r--r--meta/conf/machine/qemuarm64.conf2
1 files changed, 0 insertions, 2 deletions
diff --git a/meta/conf/machine/qemuarm64.conf b/meta/conf/machine/qemuarm64.conf
index 8459d0f3cd..f59fb15c5f 100644
--- a/meta/conf/machine/qemuarm64.conf
+++ b/meta/conf/machine/qemuarm64.conf
@@ -5,8 +5,6 @@
5require conf/machine/include/arm/arch-armv8.inc 5require conf/machine/include/arm/arch-armv8.inc
6require conf/machine/include/qemu.inc 6require conf/machine/include/qemu.inc
7 7
8MACHINE_FEATURES = ""
9
10KERNEL_IMAGETYPE = "Image" 8KERNEL_IMAGETYPE = "Image"
11 9
12SERIAL_CONSOLES = "38400;ttyAMA0 38400;hvc0" 10SERIAL_CONSOLES = "38400;ttyAMA0 38400;hvc0"