aboutsummaryrefslogtreecommitdiffstats
path: root/recipes-kernel
diff options
context:
space:
mode:
authorChunrong Guo <chunrong.guo@nxp.com>2017-11-09 12:11:16 +0800
committerOtavio Salvador <otavio@ossystems.com.br>2017-11-10 13:57:12 -0200
commitae8111e156a68cb71e047418cab2826f2542cc0c (patch)
tree3d27aa8cf0ebb313fa266f17fd006a1949c4a1ef /recipes-kernel
parent6ed3918ed0ba49f07cd7f14fc3e26bf9710a223c (diff)
downloadmeta-freescale-ae8111e156a68cb71e047418cab2826f2542cc0c.tar.gz
meta-freescale-ae8111e156a68cb71e047418cab2826f2542cc0c.tar.bz2
meta-freescale-ae8111e156a68cb71e047418cab2826f2542cc0c.zip
linux-qoriq_4.9: merge config fragments support make config
*Sometimes kernel configure option is missing if merge kernel config with merge_config.sh so merge config fragments support make config Signed-off-by: Chunrong Guo <chunrong.guo@nxp.com> Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
Diffstat (limited to 'recipes-kernel')
-rw-r--r--recipes-kernel/linux/linux-qoriq_4.9.bb17
1 files changed, 9 insertions, 8 deletions
diff --git a/recipes-kernel/linux/linux-qoriq_4.9.bb b/recipes-kernel/linux/linux-qoriq_4.9.bb
index c237c87f..3ec4ecd4 100644
--- a/recipes-kernel/linux/linux-qoriq_4.9.bb
+++ b/recipes-kernel/linux/linux-qoriq_4.9.bb
@@ -30,19 +30,20 @@ DELTA_KERNEL_DEFCONFIG_prepend_qoriq-arm64 = "lsdk.config "
DELTA_KERNEL_DEFCONFIG_prepend_fsl-lsch2-32b = "multi_v7_lpae.config lsdk.config multi_v8.config "
DELTA_KERNEL_DEFCONFIG_prepend_ls102xa = "multi_v7_lpae.config lsdk.config "
+do_merge_delta_config[dirs] = "${B}"
+
do_merge_delta_config() {
- # copy desired defconfig so we pick it up for the real kernel_do_configure
- cp ${KERNEL_DEFCONFIG} .config
-
+ # create .config with make config
+ oe_runmake -C ${S} O=${B} ${KERNEL_DEFCONFIG}
+
# add config fragments
for deltacfg in ${DELTA_KERNEL_DEFCONFIG}; do
- if [ -f "${deltacfg}" ]; then
- ${S}/scripts/kconfig/merge_config.sh -m .config ${deltacfg}
+ if [ -f ${S}/arch/${ARCH}/configs/${deltacfg} ]; then
+ oe_runmake -C ${S} O=${B} ${deltacfg}
elif [ -f "${WORKDIR}/${deltacfg}" ]; then
${S}/scripts/kconfig/merge_config.sh -m .config ${WORKDIR}/${deltacfg}
- elif [ -f "${S}/arch/${ARCH}/configs/${deltacfg}" ]; then
- ${S}/scripts/kconfig/merge_config.sh -m .config \
- ${S}/arch/${ARCH}/configs/${deltacfg}
+ elif [ -f "${deltacfg}" ]; then
+ ${S}/scripts/kconfig/merge_config.sh -m .config ${deltacfg}
fi
done
cp .config ${WORKDIR}/defconfig