diff options
| author | Chunrong Guo <B40290@freescale.com> | 2013-10-18 06:23:44 +0000 |
|---|---|---|
| committer | Zhenhua Luo <zhenhua.luo@freescale.com> | 2014-01-13 12:11:25 +0800 |
| commit | e83c3a623adb4ec69ae12527cf6a1c225e20ee21 (patch) | |
| tree | 7d3321784ffb4fcff646096829b3fcc035445722 /recipes-kernel | |
| parent | 32f5579715b3fce722bb044f22cb4ffa3425fbd6 (diff) | |
| download | meta-fsl-ppc-e83c3a623adb4ec69ae12527cf6a1c225e20ee21.tar.gz | |
linux-qoriq-sdk : add config fragments with merge_config.sh from kernel tree
Signed-off-by: Chunrong Guo <B40290@freescale.com>
Diffstat (limited to 'recipes-kernel')
| -rw-r--r-- | recipes-kernel/linux/linux-qoriq-sdk.bb | 6 |
1 files changed, 3 insertions, 3 deletions
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 | |||
| 9 | 9 | ||
| 10 | PR = "${INC_PR}.1" | 10 | PR = "${INC_PR}.1" |
| 11 | 11 | ||
| 12 | DEPENDS_append = " libgcc kern-tools-native" | 12 | DEPENDS_append = " libgcc" |
| 13 | KERNEL_CC_append = " ${TOOLCHAIN_OPTIONS}" | 13 | KERNEL_CC_append = " ${TOOLCHAIN_OPTIONS}" |
| 14 | KERNEL_LD_append = " ${TOOLCHAIN_OPTIONS}" | 14 | KERNEL_LD_append = " ${TOOLCHAIN_OPTIONS}" |
| 15 | 15 | ||
| @@ -18,8 +18,8 @@ do_configure_prepend() { | |||
| 18 | cp ${KERNEL_DEFCONFIG} ${B}/.config | 18 | cp ${KERNEL_DEFCONFIG} ${B}/.config |
| 19 | 19 | ||
| 20 | # add config fragments | 20 | # add config fragments |
| 21 | if [ -a "${DELTA_KERNEL_DEFCONFIG}" ]; then | 21 | if [ -f "${DELTA_KERNEL_DEFCONFIG}" ]; then |
| 22 | merge_config.sh -m .config ${DELTA_KERNEL_DEFCONFIG} | 22 | ${S}/scripts/kconfig/merge_config.sh -m .config ${DELTA_KERNEL_DEFCONFIG} |
| 23 | fi | 23 | fi |
| 24 | 24 | ||
| 25 | # append sdk version in kernel version if SDK_VERSION is defined | 25 | # append sdk version in kernel version if SDK_VERSION is defined |
