commit f034379238f980a8c5ec4295288448eab2a3d015
author Andrew Geissler <geissonator@yahoo.com> Wed Nov 18 10:42:21 2020 -0600
committer Andrew Geissler <geissonator@yahoo.com> Fri Nov 20 07:38:24 2020 -0600
tree 1787275509bc13436dbec1a548169ef5f8ae0538
parent bc442de08ff2e45ae01cb74397ccf010ef9797af

Revert "Revert "poky: subtree update:b23aa6b753..ad30a6d470""

This reverts commit 4873add6e11c1bd421c83cd08df589f1184aa673.

A fix has been put up for openbmc/openbmc#3720 so we can bring
this back now

Signed-off-by: Andrew Geissler <geissonator@yahoo.com>
Change-Id: If59020a5b502f70aa7149fbef4ad2f50824d1ce6

poky/meta/conf/machine/include/arm/arch-arm64.inc

diff --git a/poky/meta/conf/machine/include/arm/arch-arm64.inc b/poky/meta/conf/machine/include/arm/arch-arm64.inc
index 8a7de8e..1423422 100644
--- a/poky/meta/conf/machine/include/arm/arch-arm64.inc
+++ b/poky/meta/conf/machine/include/arm/arch-arm64.inc
@@ -3,6 +3,7 @@
 require conf/machine/include/arm/arch-armv7ve.inc
 
 TUNEVALID[aarch64] = "Enable instructions for aarch64"
+TUNECONFLICTS[aarch64] = "armv4 armv5 armv6 armv7 armv7a"
 
 MACHINEOVERRIDES =. "${@bb.utils.contains('TUNE_FEATURES', 'aarch64', 'aarch64:', '', d)}"