[meta-ti] Denys Dmytriyenko : boot-monitor: adjust resulting skern name to be SOC specific, not machine specific

[Arago Project git]

Module: meta-ti
Branch: master
Commit: 6e8a0b2b3c68f73bd1c81a6e02121ce57ad890e7
URL:    http://arago-project.org/git/meta-ti.git?a=commit;h=6e8a0b2b3c68f73bd1c81a6e02121ce57ad890e7

Author: Denys Dmytriyenko <denys at ti.com>
Date:   Thu Sep 10 01:53:51 2015 +0000

boot-monitor: adjust resulting skern name to be SOC specific, not machine specific

Signed-off-by: Denys Dmytriyenko <denys at ti.com>

---

 recipes-bsp/boot-monitor/boot-monitor_git.bb |    9 ++++-----
 1 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/recipes-bsp/boot-monitor/boot-monitor_git.bb b/recipes-bsp/boot-monitor/boot-monitor_git.bb
index d64cba7..5780195 100644
--- a/recipes-bsp/boot-monitor/boot-monitor_git.bb
+++ b/recipes-bsp/boot-monitor/boot-monitor_git.bb
@@ -8,7 +8,7 @@ PACKAGE_ARCH = "${MACHINE_ARCH}"
 SRC_URI = "git://git.ti.com/keystone-linux/boot-monitor.git;protocol=git;branch=${BRANCH}"
 
 PV = "2.0+git${SRCPV}"
-PR = "r5"
+PR = "r6"
 
 BRANCH = "master"
 
@@ -17,8 +17,7 @@ S = "${WORKDIR}/git"
 #Tag "K2_BM_15.07"
 SRCREV = "62d198687a34a9df375c1686d75ad4f85515dcf9"
 
-BOOT_MONITOR_BINARY ?= "skern.bin"
-BOOT_MONITOR_IMAGE  ?= "skern-${MACHINE}.bin"
+BOOT_MONITOR_IMAGE  ?= "skern-${BOOT_MONITOR_MAKE_TARGET}.bin"
 
 FLOATABI = "${@base_contains("TUNE_FEATURES", "vfp", base_contains("TUNE_FEATURES", "callconvention-hard", " -mfloat-abi=hard", " -mfloat-abi=softfp", d), "" ,d)}"
 
@@ -37,12 +36,12 @@ do_compile () {
 
 do_install () {
 	install -d ${D}/boot
-	install -m 0644 ${S}/${BOOT_MONITOR_BINARY} ${D}/boot/${BOOT_MONITOR_IMAGE}
+	install -m 0644 ${S}/${BOOT_MONITOR_IMAGE} ${D}/boot/
 }
 
 do_deploy () {
 	install -d ${DEPLOYDIR}
-	install -m 0644 ${S}/${BOOT_MONITOR_BINARY} ${DEPLOYDIR}/${BOOT_MONITOR_IMAGE}
+	install -m 0644 ${S}/${BOOT_MONITOR_IMAGE} ${DEPLOYDIR}/
 }
 
 addtask deploy before do_build after do_compile