Fix ATF provencore enable not working

arm-trusted-firmware checks if "provencore" is in COMBINED_FEATURES but
this is not correct as COMBINED_FEATURES contains the intersection of
MACHINE_FEATURES and DISTRO_FEATURES rather than the union and the
required settings do not get applied.

This change checks for "provencore" in MACHINE_FEATURES.

Signed-off-by: John Toomey <jtoomey@xilinx.com>
Signed-off-by: Mark Hatle <mark.hatle@xilinx.com>
(cherry picked from commit 5cae9775ec4a1744a6bd43d8d0ad828e6ca256e0)
Signed-off-by: Mark Hatle <mark.hatle@xilinx.com>

1 files changed, 1 insertions, 1 deletions

diff --git a/meta-xilinx-core/recipes-bsp/arm-trusted-firmware/arm-trusted-firmware.inc b/meta-xilinx-core/recipes-bsp/arm-trusted-firmware/arm-trusted-firmware.inc
index 5b2a6498..5591fa63 100644
--- a/meta-xilinx-core/recipes-bsp/arm-trusted-firmware/arm-trusted-firmware.inc
+++ b/meta-xilinx-core/recipes-bsp/arm-trusted-firmware/arm-trusted-firmware.inc
@@ -69,7 +69,7 @@ EXTRA_OEMAKE:append:versal = "${@' VERSAL_ATF_MEM_BASE=${ATF_MEM_BASE}' if d.get
 EXTRA_OEMAKE:append:versal = "${@' VERSAL_ATF_MEM_SIZE=${ATF_MEM_SIZE}' if d.getVar('ATF_MEM_SIZE', True) != '' else ''}"
 
 ATF_PROVENCORE = "SPD=pncd ZYNQMP_BL32_MEM_BASE=0x70000000 ZYNQMP_BL32_MEM_SIZE=0x10000000 PRELOADED_BL33_BASE=0x80000000"
-EXTRA_OEMAKE:append = "${@bb.utils.contains('COMBINED_FEATURES', 'provencore', ' ${ATF_PROVENCORE}', '', d)}"
+EXTRA_OEMAKE:append = "${@bb.utils.contains('MACHINE_FEATURES', 'provencore', ' ${ATF_PROVENCORE}', '', d)}"
 
 do_configure() {
         oe_runmake clean -C ${S} BUILD_BASE=${B} PLAT=${PLATFORM}