From 2bc60d2ea19ac70bfc41c45ae431ee944188f0ca Mon Sep 17 00:00:00 2001 From: Appana Durga Kedareswara rao Date: Wed, 11 Mar 2020 20:13:33 +0530 Subject: meta-xilinx-standalone: recipes-libraries: Fix workarounds There is an issue of circular dependency in xilpm and xilplmi libraries which got fixed now in the esw repo. Since the circular dependency issue got resolved, This patch removes the workarounds from the xilpm and xilplmi recipes. Signed-off-by: Appana Durga Kedareswara rao Signed-off-by: Mark Hatle --- meta-xilinx-standalone/recipes-libraries/xilplmi_git.bb | 9 +-------- meta-xilinx-standalone/recipes-libraries/xilpm_git.bb | 3 ++- 2 files changed, 3 insertions(+), 9 deletions(-) diff --git a/meta-xilinx-standalone/recipes-libraries/xilplmi_git.bb b/meta-xilinx-standalone/recipes-libraries/xilplmi_git.bb index 35e04e4e..e866e98f 100644 --- a/meta-xilinx-standalone/recipes-libraries/xilplmi_git.bb +++ b/meta-xilinx-standalone/recipes-libraries/xilplmi_git.bb @@ -3,11 +3,4 @@ inherit esw ESW_COMPONENT_SRC = "/lib/sw_services/xilplmi/src/" ESW_COMPONENT_NAME = "libxilplmi.a" -DEPENDS += "xilstandalone libxil xilpm" - -# Workaround for CR-1045055 -do_install() { - install -d ${D}${libdir} - install -d ${D}${includedir} - install -m 0755 ${B}/${ESW_COMPONENT_NAME} ${D}${libdir} -} +DEPENDS += "xilstandalone libxil" diff --git a/meta-xilinx-standalone/recipes-libraries/xilpm_git.bb b/meta-xilinx-standalone/recipes-libraries/xilpm_git.bb index a7c2234e..80132c90 100644 --- a/meta-xilinx-standalone/recipes-libraries/xilpm_git.bb +++ b/meta-xilinx-standalone/recipes-libraries/xilpm_git.bb @@ -3,4 +3,5 @@ inherit esw ESW_COMPONENT_SRC = "/lib/sw_services/xilpm/src/" ESW_COMPONENT_NAME = "libxilpm.a" -DEPENDS += "libxil" +DEPENDS = "libxil" +DEPENDS_microblaze-plm_append = "xilplmi" -- cgit v1.2.3-54-g00ecf