Various systems require libmetal when compiled to target zynqmp-dr based systems. Instead of using 'zynqmp-dr', use the new 'rfsoc' machine feature.
Signed-off-by: Mark Hatle <[email protected]> --- classes-recipe/xsct_baremetal_app.bbclass | 2 +- classes-recipe/xsct_freertos_app.bbclass | 2 +- recipes-bsp/embeddedsw/fsbl-firmware_xsct.inc | 2 +- recipes-bsp/embeddedsw/pmu-firmware_xsct.inc | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/classes-recipe/xsct_baremetal_app.bbclass b/classes-recipe/xsct_baremetal_app.bbclass index b42e96c..5d6efc7 100644 --- a/classes-recipe/xsct_baremetal_app.bbclass +++ b/classes-recipe/xsct_baremetal_app.bbclass @@ -9,7 +9,7 @@ inherit xsctapp xsctyaml deploy # For ZynqMP DR device Baremetal app depends on libmetal. -DEPENDS:append:zynqmp-dr = " libmetal" +DEPENDS:append = "${@bb.utils.contains('MACHINE_FEATURES', 'rfsoc', ' libmetal', '', d)}" # recipes that inherit from this class need to use an appropriate machine # override for COMPATIBLE_MACHINE to build successfully; don't allow building diff --git a/classes-recipe/xsct_freertos_app.bbclass b/classes-recipe/xsct_freertos_app.bbclass index b03f277..173d8f8 100644 --- a/classes-recipe/xsct_freertos_app.bbclass +++ b/classes-recipe/xsct_freertos_app.bbclass @@ -9,7 +9,7 @@ inherit xsctapp xsctyaml deploy # For ZynqMP DR device FreeRTOS app depends on libmetal. -DEPENDS:append:zynqmp-dr = " libmetal" +DEPENDS:append = "${@bb.utils.contains('MACHINE_FEATURES', 'rfsoc', ' libmetal', '', d)}" # recipes that inherit from this class need to use an appropriate machine # override for COMPATIBLE_MACHINE to build successfully; don't allow building diff --git a/recipes-bsp/embeddedsw/fsbl-firmware_xsct.inc b/recipes-bsp/embeddedsw/fsbl-firmware_xsct.inc index 645effa..253baef 100644 --- a/recipes-bsp/embeddedsw/fsbl-firmware_xsct.inc +++ b/recipes-bsp/embeddedsw/fsbl-firmware_xsct.inc @@ -7,7 +7,7 @@ B = "${S}/${XSCTH_PROJ}" B:zynq = "${S}/${XSCTH_PROJ}" B:zynqmp = "${S}/${XSCTH_PROJ}" -XSCTH_MISC:append:zynqmp-dr = " -lib libmetal" +XSCTH_MISC:append = "${@bb.utils.contains('MACHINE_FEATURES', 'rfsoc', ' -lib libmetal', '', d)}" XSCTH_COMPILER_DEBUG_FLAGS = " -DFSBL_DEBUG_INFO" diff --git a/recipes-bsp/embeddedsw/pmu-firmware_xsct.inc b/recipes-bsp/embeddedsw/pmu-firmware_xsct.inc index 41aa157..c9aa565 100644 --- a/recipes-bsp/embeddedsw/pmu-firmware_xsct.inc +++ b/recipes-bsp/embeddedsw/pmu-firmware_xsct.inc @@ -5,7 +5,7 @@ PARALLEL_MAKE = "-j1" B = "${S}/${XSCTH_PROJ}" -XSCTH_MISC:append:zynqmp-dr = " -lib libmetal" +XSCTH_MISC:append = "${@bb.utils.contains('MACHINE_FEATURES', 'rfsoc', ' -lib libmetal', '', d)}" XSCTH_COMPILER_DEBUG_FLAGS = "-DDEBUG_MODE -DXPFW_DEBUG_DETAILED" XSCTH_PROC_IP = "psu_pmu" -- 2.34.1
-=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#5420): https://lists.yoctoproject.org/g/meta-xilinx/message/5420 Mute This Topic: https://lists.yoctoproject.org/mt/106610015/21656 Group Owner: [email protected] Unsubscribe: https://lists.yoctoproject.org/g/meta-xilinx/unsub [[email protected]] -=-=-=-=-=-=-=-=-=-=-=-
