Patchwork [meta-fsl-ppc,dylan,12/12] linux-qoriq-sdk : add config fragments with merge_config.sh from kernel tree

login
register
mail settings
Submitter Ting Liu
Date Jan. 7, 2014, 1:07 p.m.
Message ID <1389100023-19005-13-git-send-email-b28495@freescale.com>
Download mbox | patch
Permalink /patch/64237/
State Accepted
Headers show

Comments

Ting Liu - Jan. 7, 2014, 1:07 p.m.
From: Chunrong Guo <B40290@freescale.com>

Signed-off-by: Chunrong Guo <B40290@freescale.com>
---
 recipes-kernel/linux/linux-qoriq-sdk.bb |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

Patch

diff --git a/recipes-kernel/linux/linux-qoriq-sdk.bb b/recipes-kernel/linux/linux-qoriq-sdk.bb
index 5f6812f..0ff68ce 100644
--- a/recipes-kernel/linux/linux-qoriq-sdk.bb
+++ b/recipes-kernel/linux/linux-qoriq-sdk.bb
@@ -9,7 +9,7 @@  require recipes-kernel/linux/linux-qoriq-sdk.inc
 
 PR = "${INC_PR}.1"
 
-DEPENDS_append = " libgcc kern-tools-native"
+DEPENDS_append = " libgcc"
 KERNEL_CC_append = " ${TOOLCHAIN_OPTIONS}"
 KERNEL_LD_append = " ${TOOLCHAIN_OPTIONS}"
 
@@ -18,8 +18,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