From 14dc19f86893e18d6473d21a8d878c565811517d Mon Sep 17 00:00:00 2001 From: Serhey Popovych Date: Fri, 14 Dec 2018 19:54:32 +0200 Subject: tune-power[5-7].inc: Disable QEMU usermode usage The QEMU usermode fails with invalid instruction error when used with those tunes. (From OE-Core rev: c1c881ef7f4faf94f385ae742030382122ee5816) Signed-off-by: Serhey Popovych Signed-off-by: Richard Purdie --- meta/conf/machine/include/tune-power5.inc | 3 +++ meta/conf/machine/include/tune-power6.inc | 3 +++ meta/conf/machine/include/tune-power7.inc | 3 +++ 3 files changed, 9 insertions(+) (limited to 'meta') diff --git a/meta/conf/machine/include/tune-power5.inc b/meta/conf/machine/include/tune-power5.inc index ab7aa6fa01..39501bd8c5 100644 --- a/meta/conf/machine/include/tune-power5.inc +++ b/meta/conf/machine/include/tune-power5.inc @@ -19,3 +19,6 @@ PACKAGE_EXTRA_ARCHS_tune-ppc64p5 = "${PACKAGE_EXTRA_ARCHS_tune-powerpc64} ppc64p # glibc configure options to get power5 specific library GLIBC_EXTRA_OECONF_powerpc64 += "${@bb.utils.contains('TUNE_FEATURES', 'power5', '--with-cpu=power5', '', d)}" GLIBC_EXTRA_OECONF_powerpc += "${@bb.utils.contains('TUNE_FEATURES', 'power5', '--with-cpu=power5', '', d)}" + +# QEMU usermode fails with invalid instruction error +MACHINE_FEATURES_BACKFILL_CONSIDERED_append = "${@bb.utils.contains('TUNE_FEATURES', 'power5', ' qemu-usermode', '', d)}" diff --git a/meta/conf/machine/include/tune-power6.inc b/meta/conf/machine/include/tune-power6.inc index 7075157e7e..1d5e8ecc26 100644 --- a/meta/conf/machine/include/tune-power6.inc +++ b/meta/conf/machine/include/tune-power6.inc @@ -19,3 +19,6 @@ PACKAGE_EXTRA_ARCHS_tune-ppc64p6 = "${PACKAGE_EXTRA_ARCHS_tune-powerpc64} ppc64p # glibc configure options to get power6 specific library GLIBC_EXTRA_OECONF_powerpc64 += "${@bb.utils.contains('TUNE_FEATURES', 'power6', '--with-cpu=power6', '', d)}" GLIBC_EXTRA_OECONF_powerpc += "${@bb.utils.contains('TUNE_FEATURES', 'power6', '--with-cpu=power6', '', d)}" + +# QEMU usermode fails with invalid instruction error +MACHINE_FEATURES_BACKFILL_CONSIDERED_append = "${@bb.utils.contains('TUNE_FEATURES', 'power6', ' qemu-usermode', '', d)}" diff --git a/meta/conf/machine/include/tune-power7.inc b/meta/conf/machine/include/tune-power7.inc index 818931760f..8f3f037ebb 100644 --- a/meta/conf/machine/include/tune-power7.inc +++ b/meta/conf/machine/include/tune-power7.inc @@ -19,3 +19,6 @@ PACKAGE_EXTRA_ARCHS_tune-ppc64p7 = "${PACKAGE_EXTRA_ARCHS_tune-powerpc64} ppc64p # glibc configure options to get power7 specific library GLIBC_EXTRA_OECONF_powerpc64 += "${@bb.utils.contains('TUNE_FEATURES', 'power7', '--with-cpu=power7', '', d)}" GLIBC_EXTRA_OECONF_powerpc += "${@bb.utils.contains('TUNE_FEATURES', 'power7', '--with-cpu=power7', '', d)}" + +# QEMU usermode fails with invalid instruction error +MACHINE_FEATURES_BACKFILL_CONSIDERED_append = "${@bb.utils.contains('TUNE_FEATURES', 'power7', ' qemu-usermode', '', d)}" -- cgit v1.2.3-54-g00ecf