From 411adbe48c6d567395ce8f824af1b5a9246e5d42 Mon Sep 17 00:00:00 2001 From: Denys Dmytriyenko Date: Thu, 10 Sep 2015 01:53:51 +0000 Subject: boot-monitor: adjust resulting skern name to be SOC specific, not machine specific Signed-off-by: Denys Dmytriyenko --- recipes-bsp/boot-monitor/boot-monitor_git.bb | 9 ++++----- 1 file 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 d64cba71..57801954 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 -- cgit v1.2.3-54-g00ecf