1 files changed, 10 insertions, 16 deletions

diff --git a/recipes-bsp/mc-utils/mc-utils_git.bb b/recipes-bsp/mc-utils/mc-utils_git.bb
index b725af7f0..97bbd7e73 100644
--- a/recipes-bsp/mc-utils/mc-utils_git.bb
+++ b/recipes-bsp/mc-utils/mc-utils_git.bb
@@ -1,16 +1,14 @@
 DESCRIPTION = "The Management Complex (MC) is a key component of DPAA"
 SECTION = "mc-utils"
 LICENSE = "BSD"
-
-LIC_FILES_CHKSUM = "file://LICENSE;md5=386a6287daa6504b7e7e5014ddfb3987 \
-"
+LIC_FILES_CHKSUM = "file://LICENSE;md5=386a6287daa6504b7e7e5014ddfb3987"
 
 DEPENDS += "dtc-native"
 
 inherit deploy
 
 SRC_URI = "git://source.codeaurora.org/external/qoriq/qoriq-components/mc-utils;nobranch=1"
-SRCREV = "8e0b863693fc2ccbc62a62c79b4e3db6da88c16e"
+SRCREV = "12ffee82d210cb6b5c8fa30fbc6f5d29e4be2e6f"
 
 S = "${WORKDIR}/git"
 
@@ -18,10 +16,10 @@ MC_CFG ?= ""
 MC_CFG:ls1088a = "ls1088a"
 MC_CFG:ls2088a = "ls2088a"
 MC_CFG:lx2160a = "lx2160a"
-MC_CFG:lx2162aqds = "lx2162aqds"
+MC_CFG:lx2162a = "lx2162a"
 
-MC_FLAVOUR ?= "RDB"
-MC_FLAVOUR:lx2162a = ""
+MC_FLAVOUR ?= "${@oe.utils.ifelse(d.getVar('MACHINE').endswith('qds'), 'QDS', 'RDB')}"
+MC_FOLDER ?= "${@d.getVar('MC_CFG').upper() + '-' + d.getVar('MC_FLAVOUR')}"
 
 do_compile () {
         oe_runmake -C config 
@@ -29,23 +27,19 @@ do_compile () {
 
 do_install () {
         install -d ${D}/boot/mc-utils
-        cp -r ${S}/config/${MC_CFG}/${MC_FLAVOUR}/*.dtb ${D}/boot/mc-utils
-        if [ -d ${S}/config/${MC_CFG}/${MC_FLAVOUR}/custom/ ]; then
-                install -d ${D}/boot/mc-utils/custom
-                cp -r ${S}/config/${MC_CFG}/${MC_FLAVOUR}/custom/*.dtb ${D}/boot/mc-utils/custom
+        if [ -e ${S}/config/${MC_CFG}/${MC_FOLDER} ]; then
+                cp -r ${S}/config/${MC_CFG}/${MC_FOLDER}/* ${D}/boot/mc-utils/
         fi
+        find ${D}/boot/mc-utils/ ! -name "*.dtb" ! -type d -exec rm {} \;
 }
 
 do_deploy () {
         install -d ${DEPLOYDIR}/mc-utils
-        cp -r ${S}/config/${MC_CFG}/${MC_FLAVOUR}/*.dtb ${DEPLOYDIR}/mc-utils
-        if [ -d ${S}/config/${MC_CFG}/${MC_FLAVOUR}/custom/ ]; then
-                install -d ${DEPLOYDIR}/mc-utils/custom
-                cp -r ${S}/config/${MC_CFG}/${MC_FLAVOUR}/custom/*.dtb ${DEPLOYDIR}/mc-utils/custom
-        fi
+        cp -r ${D}/boot/mc-utils/* ${DEPLOYDIR}/mc-utils/
 }
 addtask deploy after do_install
 
 PACKAGES += "${PN}-image"
 FILES:${PN}-image += "/boot"
+PACKAGE_ARCH = "${MACHINE_ARCH}"
 COMPATIBLE_MACHINE = "(qoriq-arm64)"