[meta-freescale] [PATCH 7/8] linux-qoriq_4.9: merge config fragments with make config

[Chunrong Guo]

From: Chunrong Guo <chunrong.guo at nxp.com>

*kernel configure option is missing if merge kernel config fragments with merge_config.sh
so make config instead of merge_config.sh

Signed-off-by: Chunrong Guo <chunrong.guo at nxp.com>
---
 recipes-kernel/linux/linux-qoriq_4.9.bb | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/recipes-kernel/linux/linux-qoriq_4.9.bb b/recipes-kernel/linux/linux-qoriq_4.9.bb
index c237c87..d5be20f 100644
--- a/recipes-kernel/linux/linux-qoriq_4.9.bb
+++ b/recipes-kernel/linux/linux-qoriq_4.9.bb
@@ -37,12 +37,11 @@ do_merge_delta_config() {
     # add config fragments
     for deltacfg in ${DELTA_KERNEL_DEFCONFIG}; do
         if [ -f "${deltacfg}" ]; then
-            ${S}/scripts/kconfig/merge_config.sh -m .config ${deltacfg}
+            make ${deltacfg}
         elif [ -f "${WORKDIR}/${deltacfg}" ]; then
-            ${S}/scripts/kconfig/merge_config.sh -m .config ${WORKDIR}/${deltacfg}
+            make ${WORKDIR}/${deltacfg}
         elif [ -f "${S}/arch/${ARCH}/configs/${deltacfg}" ]; then
-            ${S}/scripts/kconfig/merge_config.sh -m .config \
-                ${S}/arch/${ARCH}/configs/${deltacfg}
+            make ${S}/arch/${ARCH}/configs/${deltacfg}
         fi
     done
     cp .config ${WORKDIR}/defconfig
-- 
1.9.0