From: Chunrong Guo <chunrong....@nxp.com> *kernel configure option is missing if merge kernel config fragments with merge_config.sh so make config instead of merge_config.sh
Signed-off-by: Chunrong Guo <chunrong....@nxp.com> --- recipes-kernel/linux/linux-qoriq_4.4.bb | 25 ++++++++++++------------- 1 file changed, 12 insertions(+), 13 deletions(-) diff --git a/recipes-kernel/linux/linux-qoriq_4.4.bb b/recipes-kernel/linux/linux-qoriq_4.4.bb index 72177a3..abad2ee 100644 --- a/recipes-kernel/linux/linux-qoriq_4.4.bb +++ b/recipes-kernel/linux/linux-qoriq_4.4.bb @@ -37,12 +37,11 @@ do_merge_delta_config() { # add config fragments for deltacfg in ${DELTA_KERNEL_DEFCONFIG}; do if [ -f "${deltacfg}" ]; then - ${S}/scripts/kconfig/merge_config.sh -m .config ${deltacfg} + make ${deltacfg} elif [ -f "${WORKDIR}/${deltacfg}" ]; then - ${S}/scripts/kconfig/merge_config.sh -m .config ${WORKDIR}/${deltacfg} + make ${WORKDIR}/${deltacfg} elif [ -f "${S}/arch/${ARCH}/configs/${deltacfg}" ]; then - ${S}/scripts/kconfig/merge_config.sh -m .config \ - ${S}/arch/${ARCH}/configs/${deltacfg} + make ${S}/arch/${ARCH}/configs/${deltacfg} fi done cp .config ${WORKDIR}/defconfig @@ -58,16 +57,16 @@ do_install_prepend_fsl-lsch2-32b() { rm -f ${STAGING_KERNEL_DIR}/arch/arm/boot/dts/freescale } -do_install_append_qoriq-arm() { - install -m 0644 arch/${ARCH}/boot/zImage ${D}/boot/zImage-${KERNEL_VERSION} - ln -sf zImage-${KERNEL_VERSION} ${D}/boot/zImage -} +#do_install_append_qoriq-arm() { +# install -m 0644 arch/${ARCH}/boot/zImage ${D}/boot/zImage-${KERNEL_VERSION} +# ln -sf zImage-${KERNEL_VERSION} ${D}/boot/zImage +#} -do_deploy_append_qoriq-arm() { - install -m 0644 arch/${ARCH}/boot/zImage ${DEPLOYDIR}/${ZIMAGE_BASE_NAME}.bin - ln -sf ${ZIMAGE_BASE_NAME}.bin ${DEPLOYDIR}/zImage-${MACHINE}.bin - ln -sf ${ZIMAGE_BASE_NAME}.bin ${DEPLOYDIR}/zImage -} +#do_deploy_append_qoriq-arm() { +# install -m 0644 arch/${ARCH}/boot/zImage ${DEPLOYDIR}/${ZIMAGE_BASE_NAME}.bin +# ln -sf ${ZIMAGE_BASE_NAME}.bin ${DEPLOYDIR}/zImage-${MACHINE}.bin +# ln -sf ${ZIMAGE_BASE_NAME}.bin ${DEPLOYDIR}/zImage +#} FILES_kernel-image += "/boot/zImage*" COMPATIBLE_MACHINE = "(qoriq)" -- 1.9.0 -- _______________________________________________ meta-freescale mailing list meta-freescale@yoctoproject.org https://lists.yoctoproject.org/listinfo/meta-freescale