From 5cc11d35b1ef646d6ac4cda60ea679cc92febc84 Mon Sep 17 00:00:00 2001
From: Mark Hatle <mark.hatle@xilinx.com>
Date: Wed, 25 Mar 2020 08:12:51 -0700
Subject: Rename plm_git.bb to plm-standalong_git.bb

Issue: CR-1058773

There is already a plm_git contained within the meta-xilinx-tools
repository.  We need to disambiguate the standalone (buildable)
version while both will still exist.

Signed-off-by: Mark Hatle <mark.hatle@xilinx.com>
---
 .../recipes-standalone/plm/plm-standalone_git.bb   | 32 ++++++++++++++++++++++
 .../recipes-standalone/plm/plm_git.bb              | 32 ----------------------
 2 files changed, 32 insertions(+), 32 deletions(-)
 create mode 100644 meta-xilinx-standalone/recipes-standalone/plm/plm-standalone_git.bb
 delete mode 100644 meta-xilinx-standalone/recipes-standalone/plm/plm_git.bb

diff --git a/meta-xilinx-standalone/recipes-standalone/plm/plm-standalone_git.bb b/meta-xilinx-standalone/recipes-standalone/plm/plm-standalone_git.bb
new file mode 100644
index 00000000..25988eb9
--- /dev/null
+++ b/meta-xilinx-standalone/recipes-standalone/plm/plm-standalone_git.bb
@@ -0,0 +1,32 @@
+inherit esw deploy
+
+ESW_COMPONENT_SRC = "/lib/sw_apps/versal_plm/src/"
+
+DEPENDS += "xilstandalone xiltimer xilffs xilpdi xilplmi xilloader xilpm xilsecure xilsem"
+
+do_install() {
+    install -d ${D}/${base_libdir}/firmware
+    # Note that we have to make the ELF executable for it to be stripped
+    install -m 0755  ${B}/versal_plm* ${D}/${base_libdir}/firmware
+}
+
+PLM_FIRMWARE_BASE_NAME ?= "${BPN}-${PKGE}-${PKGV}-${PKGR}-${MACHINE}-${DATETIME}"
+PLM_FIRMWARE_BASE_NAME[vardepsexclude] = "DATETIME"
+
+do_deploy() {
+
+    # Not a huge fan of deploying from package but we want the stripped elf to be deployed.
+    # We could, technically create another task that runs after do_install that strips it but it
+    # seems unnecessarily convoluted, unless there's an objection on performing do_install we
+    # should do it this way since it easier to keep up with changes in oe-core.
+
+    install -Dm 0644 ${WORKDIR}/package/${base_libdir}/firmware/versal_plm.elf ${DEPLOYDIR}/${PLM_FIRMWARE_BASE_NAME}.elf
+    ln -sf ${PLM_FIRMWARE_BASE_NAME}.elf ${DEPLOYDIR}/${BPN}-${MACHINE}.elf
+    ${OBJCOPY} -O binary ${WORKDIR}/package/${base_libdir}/firmware/versal_plm.elf ${WORKDIR}/package/${base_libdir}/firmware/versal_plm.bin
+    install -m 0644 ${WORKDIR}/package/${base_libdir}/firmware/versal_plm.bin ${DEPLOYDIR}/${PLM_FIRMWARE_BASE_NAME}.bin
+    ln -sf ${PLM_FIRMWARE_BASE_NAME}.bin ${DEPLOYDIR}/${BPN}-${MACHINE}.bin
+}
+
+addtask deploy before do_build after do_package
+
+FILES_${PN} = "${base_libdir}/firmware/plm*"
diff --git a/meta-xilinx-standalone/recipes-standalone/plm/plm_git.bb b/meta-xilinx-standalone/recipes-standalone/plm/plm_git.bb
deleted file mode 100644
index 25988eb9..00000000
--- a/meta-xilinx-standalone/recipes-standalone/plm/plm_git.bb
+++ /dev/null
@@ -1,32 +0,0 @@
-inherit esw deploy
-
-ESW_COMPONENT_SRC = "/lib/sw_apps/versal_plm/src/"
-
-DEPENDS += "xilstandalone xiltimer xilffs xilpdi xilplmi xilloader xilpm xilsecure xilsem"
-
-do_install() {
-    install -d ${D}/${base_libdir}/firmware
-    # Note that we have to make the ELF executable for it to be stripped
-    install -m 0755  ${B}/versal_plm* ${D}/${base_libdir}/firmware
-}
-
-PLM_FIRMWARE_BASE_NAME ?= "${BPN}-${PKGE}-${PKGV}-${PKGR}-${MACHINE}-${DATETIME}"
-PLM_FIRMWARE_BASE_NAME[vardepsexclude] = "DATETIME"
-
-do_deploy() {
-
-    # Not a huge fan of deploying from package but we want the stripped elf to be deployed.
-    # We could, technically create another task that runs after do_install that strips it but it
-    # seems unnecessarily convoluted, unless there's an objection on performing do_install we
-    # should do it this way since it easier to keep up with changes in oe-core.
-
-    install -Dm 0644 ${WORKDIR}/package/${base_libdir}/firmware/versal_plm.elf ${DEPLOYDIR}/${PLM_FIRMWARE_BASE_NAME}.elf
-    ln -sf ${PLM_FIRMWARE_BASE_NAME}.elf ${DEPLOYDIR}/${BPN}-${MACHINE}.elf
-    ${OBJCOPY} -O binary ${WORKDIR}/package/${base_libdir}/firmware/versal_plm.elf ${WORKDIR}/package/${base_libdir}/firmware/versal_plm.bin
-    install -m 0644 ${WORKDIR}/package/${base_libdir}/firmware/versal_plm.bin ${DEPLOYDIR}/${PLM_FIRMWARE_BASE_NAME}.bin
-    ln -sf ${PLM_FIRMWARE_BASE_NAME}.bin ${DEPLOYDIR}/${BPN}-${MACHINE}.bin
-}
-
-addtask deploy before do_build after do_package
-
-FILES_${PN} = "${base_libdir}/firmware/plm*"
-- 
cgit v1.2.3-54-g00ecf