diff options
author | John Toomey <john.toomey@xilinx.com> | 2022-03-30 11:37:51 +0100 |
---|---|---|
committer | Mark Hatle <mark.hatle@xilinx.com> | 2022-04-01 08:55:37 -0700 |
commit | 61811bf41286b72f4770551d16323042bdab375b (patch) | |
tree | 20aa9b5d7d8d07698209c3267bc3a2e4f8c8f255 /meta-xilinx-core/recipes-bsp/arm-trusted-firmware/arm-trusted-firmware.inc | |
parent | b19fdea92c4400a2eb03784c5b5fa345cc5a56d6 (diff) | |
download | meta-xilinx-61811bf41286b72f4770551d16323042bdab375b.tar.gz |
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>
Diffstat (limited to 'meta-xilinx-core/recipes-bsp/arm-trusted-firmware/arm-trusted-firmware.inc')
-rw-r--r-- | meta-xilinx-core/recipes-bsp/arm-trusted-firmware/arm-trusted-firmware.inc | 2 |
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 | |||
69 | EXTRA_OEMAKE:append:versal = "${@' VERSAL_ATF_MEM_SIZE=${ATF_MEM_SIZE}' if d.getVar('ATF_MEM_SIZE', True) != '' else ''}" | 69 | EXTRA_OEMAKE:append:versal = "${@' VERSAL_ATF_MEM_SIZE=${ATF_MEM_SIZE}' if d.getVar('ATF_MEM_SIZE', True) != '' else ''}" |
70 | 70 | ||
71 | ATF_PROVENCORE = "SPD=pncd ZYNQMP_BL32_MEM_BASE=0x70000000 ZYNQMP_BL32_MEM_SIZE=0x10000000 PRELOADED_BL33_BASE=0x80000000" | 71 | ATF_PROVENCORE = "SPD=pncd ZYNQMP_BL32_MEM_BASE=0x70000000 ZYNQMP_BL32_MEM_SIZE=0x10000000 PRELOADED_BL33_BASE=0x80000000" |
72 | EXTRA_OEMAKE:append = "${@bb.utils.contains('COMBINED_FEATURES', 'provencore', ' ${ATF_PROVENCORE}', '', d)}" | 72 | EXTRA_OEMAKE:append = "${@bb.utils.contains('MACHINE_FEATURES', 'provencore', ' ${ATF_PROVENCORE}', '', d)}" |
73 | 73 | ||
74 | do_configure() { | 74 | do_configure() { |
75 | oe_runmake clean -C ${S} BUILD_BASE=${B} PLAT=${PLATFORM} | 75 | oe_runmake clean -C ${S} BUILD_BASE=${B} PLAT=${PLATFORM} |