From: Chunrong Guo <B40290@freescale.com>
Date: Fri, 18 Oct 2013 06:23:44 +0000 (+0000)
Subject: linux-qoriq-sdk : add config fragments with merge_config.sh from kernel tree
X-Git-Tag: 2.1~534^2~222
X-Git-Url: https://code.ossystems.io/gitweb?a=commitdiff_plain;h=88af4f36b2e7567610a0bbfa9cec3128e6bc8165;p=meta-freescale.git

linux-qoriq-sdk : add config fragments with merge_config.sh from kernel tree

Signed-off-by: Chunrong Guo <B40290@freescale.com>
---

diff --git a/meta-fsl-ppc/recipes-kernel/linux/linux-qoriq-sdk.bb b/meta-fsl-ppc/recipes-kernel/linux/linux-qoriq-sdk.bb
index b7ca7210..df18cfe1 100644
--- a/meta-fsl-ppc/recipes-kernel/linux/linux-qoriq-sdk.bb
+++ b/meta-fsl-ppc/recipes-kernel/linux/linux-qoriq-sdk.bb
@@ -11,7 +11,7 @@ SRC_URI += "file://libtraceevent-Remove-hard-coded-include-to-usr-local-include-
 
 PR = "${INC_PR}.1"
 
-DEPENDS_append = " libgcc kern-tools-native"
+DEPENDS_append = " libgcc"
 KERNEL_CC_append = " ${TOOLCHAIN_OPTIONS}"
 KERNEL_LD_append = " ${TOOLCHAIN_OPTIONS}"
 
@@ -20,8 +20,8 @@ do_configure_prepend() {
 	cp ${KERNEL_DEFCONFIG} ${B}/.config
     
 	# add config fragments    
-    	if [ -a "${DELTA_KERNEL_DEFCONFIG}" ]; then
-        	merge_config.sh -m .config ${DELTA_KERNEL_DEFCONFIG}
+    	if [ -f "${DELTA_KERNEL_DEFCONFIG}" ]; then
+        	${S}/scripts/kconfig/merge_config.sh -m .config ${DELTA_KERNEL_DEFCONFIG}
     	fi
 
 	# append sdk version in kernel version if SDK_VERSION is defined