Patchwork [meta-fsl-ppc] linux-qoriq-sdk : add asf config fragments

login
register
mail settings
Submitter chunrong guo
Date Oct. 16, 2013, 3:49 a.m.
Message ID <1381895371-16500-1-git-send-email-b40290@freescale.com>
Download mbox | patch
Permalink /patch/59975/
State Superseded
Headers show

Comments

chunrong guo - Oct. 16, 2013, 3:49 a.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, 6 insertions(+), 0 deletions(-)
Zhenhua Luo - Oct. 16, 2013, 4 a.m.
Hi Chunrong, 

> -----Original Message-----
> From: Guo Chunrong-B40290
> Sent: Wednesday, October 16, 2013 11:50 AM
> 
> +DEPENDS += "kern-tools-native"
>  DEPENDS_append = " libgcc"
[Luo Zhenhua-B19537] Please merge above two lines. 

>  do_configure_prepend() {
>  	# copy desired defconfig so we pick it up for the real
> kernel_do_configure
>  	cp ${KERNEL_DEFCONFIG} ${B}/.config
> +
> +    	# add asf config fragments
> +    	if [ -a "${ASF_DELTA_CONFIG}" ]; then	
[Luo Zhenhua-B19537] ASF_DELTA_CONFIG is somewhat specific, DELTA_KERNEL_DEFCONFIG is more generic. 

> +		merge_config.sh -m .config ${ASF_DELTA_CONFIG}
> +    	fi


Best Regards,

Zhenhua

Patch

diff --git a/recipes-kernel/linux/linux-qoriq-sdk.bb b/recipes-kernel/linux/linux-qoriq-sdk.bb
index 7dd7059..87df7af 100644
--- a/recipes-kernel/linux/linux-qoriq-sdk.bb
+++ b/recipes-kernel/linux/linux-qoriq-sdk.bb
@@ -11,6 +11,7 @@  SRC_URI += "file://libtraceevent-Remove-hard-coded-include-to-usr-local-include-
 
 PR = "${INC_PR}.1"
 
+DEPENDS += "kern-tools-native"
 DEPENDS_append = " libgcc"
 KERNEL_CC_append = " ${TOOLCHAIN_OPTIONS}"
 KERNEL_LD_append = " ${TOOLCHAIN_OPTIONS}"
@@ -18,6 +19,11 @@  KERNEL_LD_append = " ${TOOLCHAIN_OPTIONS}"
 do_configure_prepend() {
 	# copy desired defconfig so we pick it up for the real kernel_do_configure
 	cp ${KERNEL_DEFCONFIG} ${B}/.config
+    
+    	# add asf config fragments    
+    	if [ -a "${ASF_DELTA_CONFIG}" ]; then
+		merge_config.sh -m .config ${ASF_DELTA_CONFIG}
+    	fi
 
 	# append sdk version in kernel version if SDK_VERSION is defined
 	if [ -n "${SDK_VERSION}" ]; then