From: Ting Liu <ting.liu@nxp.com>
Date: Fri, 15 Jul 2016 17:42:34 +0000 (+0800)
Subject: linux-qoriq: add merge_delta_config task
X-Git-Tag: 2.2~335
X-Git-Url: https://code.ossystems.io/gitweb?a=commitdiff_plain;h=3b078cb194577d3f1fb88be4638191a3bd7e5403;p=meta-freescale.git

linux-qoriq: add merge_delta_config task

fsl-kernel-localversion added a separate task in which defconfig
is needed. But qoriq boards don't have a unified defconfig, different
KERNEL_DEFCONFIG should be copied as ${WORKDIR}/defconfig.

add a merge_delta_config task to merge kernel delta configs.
for ls1043ardb and ls2080ardb, freescale.config should be appended first.

Signed-off-by: Ting Liu <ting.liu@nxp.com>
---

diff --git a/recipes-kernel/linux/linux-qoriq_4.1.bb b/recipes-kernel/linux/linux-qoriq_4.1.bb
index d2c821f2..97611feb 100644
--- a/recipes-kernel/linux/linux-qoriq_4.1.bb
+++ b/recipes-kernel/linux/linux-qoriq_4.1.bb
@@ -31,8 +31,10 @@ ZIMAGE_BASE_NAME[vardepsexclude] = "DATETIME"
 SCMVERSION ?= "y"
 LOCALVERSION = ""
 DELTA_KERNEL_DEFCONFIG ?= ""
+DELTA_KERNEL_DEFCONFIG_prepend_ls1043ardb = "freescale.config "
+DELTA_KERNEL_DEFCONFIG_prepend_ls2080ardb = "freescale.config "
 
-do_configure_prepend() {
+do_merge_delta_config() {
     # copy desired defconfig so we pick it up for the real kernel_do_configure
     cp ${KERNEL_DEFCONFIG} .config
     
@@ -44,11 +46,12 @@ do_configure_prepend() {
             ${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}
+                ${S}/arch/${ARCH}/configs/${deltacfg}
         fi
     done
     cp .config ${WORKDIR}/defconfig
 }
+addtask merge_delta_config before do_preconfigure after do_patch
 
 do_install_append_qoriq-arm() {
     install -m 0644 arch/${ARCH}/boot/zImage ${D}/boot/zImage-${KERNEL_VERSION}