From: Zhenhua Luo <zhenhua.luo@freescale.com>
Date: Sat, 9 Jan 2016 06:43:02 +0000 (+0800)
Subject: linux-qoriq: support kernel delta defconfig managed in recipe folder
X-Git-Tag: 2.1~159
X-Git-Url: https://code.ossystems.io/gitweb?a=commitdiff_plain;h=b557990e6dc79351df483d4882b8dda488612afe;p=meta-freescale.git

linux-qoriq: support kernel delta defconfig managed in recipe folder

Signed-off-by: Zhenhua Luo <zhenhua.luo@freescale.com>
Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
---

diff --git a/recipes-kernel/linux/linux-qoriq.inc b/recipes-kernel/linux/linux-qoriq.inc
index 5992fbff..6436d9c3 100644
--- a/recipes-kernel/linux/linux-qoriq.inc
+++ b/recipes-kernel/linux/linux-qoriq.inc
@@ -29,6 +29,8 @@ do_configure_prepend() {
     for deltacfg in ${DELTA_KERNEL_DEFCONFIG}; do
         if [ -f "${deltacfg}" ]; then
             ${S}/scripts/kconfig/merge_config.sh -m .config ${deltacfg}
+        elif [ -f "${WORKDIR}/${deltacfg}" ]; then
+            ${S}/scripts/kconfig/merge_config.sh -m .config ${WORKDIR}/${deltacfg}
         elif [ -f "${S}/arch/${ARCH}/configs/${deltacfg}" ]; then
             ${S}/scripts/kconfig/merge_config.sh -m .config \
                 ${S}/arch/powerpc/configs/${deltacfg}