[meta-freescale] [PATCH 09/60] linux-qoriq: support kernel delta defconfig managed in recipe folder

ting.liu at nxp.com ting.liu at nxp.com
Fri Jan 8 22:43:02 PST 2016


From: Zhenhua Luo <zhenhua.luo at freescale.com>

Signed-off-by: Zhenhua Luo <zhenhua.luo at freescale.com>
---
 recipes-kernel/linux/linux-qoriq.inc | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/recipes-kernel/linux/linux-qoriq.inc b/recipes-kernel/linux/linux-qoriq.inc
index 5992fbf..6436d9c 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}
-- 
1.9.2



More information about the meta-freescale mailing list