openamp-fw.inc: Update OPENAMP_FW_DEPLOY_DIR

Using TOPDIR will fail when TMPDIR redirected to different location than
the default one. Use TMPDIR instead of TOPDIR and add open-amp-xlnx
directory suffix as per the recent open-amp recipe changes.

Signed-off-by: Raju Kumar Pothuraju <rajukumar.pothuraju@amd.com>
Signed-off-by: Mark Hatle <mark.hatle@amd.com>

1 files changed, 2 insertions, 3 deletions

diff --git a/meta-xilinx-standalone-sdt/recipes-applications/openamp-fw/openamp-fw.inc b/meta-xilinx-standalone-sdt/recipes-applications/openamp-fw/openamp-fw.inc
index dd2835ab..f6c53414 100644
--- a/meta-xilinx-standalone-sdt/recipes-applications/openamp-fw/openamp-fw.inc
+++ b/meta-xilinx-standalone-sdt/recipes-applications/openamp-fw/openamp-fw.inc
@@ -17,13 +17,12 @@ FW_OS ?= "baremetal"
 
 FW_TARGET ?= "${MACHINE}-${FW_MACHINE}-${FW_OS}"
 
-OPENAMP_FW_DEPLOY_DIR ?= "tmp-${FW_TARGET}/deploy/images/${MACHINE}"
-#OPENAMP_FW_DEPLOY_DIR ?= "tmp-${FW_TARGET}/deploy/"
+OPENAMP_FW_DEPLOY_DIR ?= "-${FW_TARGET}/deploy/images/${MACHINE}/open-amp-xlnx"
 
 DEPENDS = " open-amp-xlnx "
 do_install[mcdepends] += "mc::${FW_TARGET}:open-amp-xlnx:do_deploy"
 do_install() {
-        src=${TOPDIR}/${OPENAMP_FW_DEPLOY_DIR}/${OPENAMP_FW_SRC_NAME}
+        src=${TMPDIR}${OPENAMP_FW_DEPLOY_DIR}/${OPENAMP_FW_SRC_NAME}
         dest=${D}${FW_LIB_DIR}/${OPENAMP_FW_NAME}
         if [ ! -e $src ]; then
                 bberror "Multiconfig firmware $src is not found.  Set OPENAMP_FW_DEPLOY_DIR:pn-${PN} if necessary."