diff options
author | Chunrong Guo <chunrong.guo@nxp.com> | 2017-11-09 12:11:16 +0800 |
---|---|---|
committer | Otavio Salvador <otavio@ossystems.com.br> | 2017-11-10 13:57:12 -0200 |
commit | ae8111e156a68cb71e047418cab2826f2542cc0c (patch) | |
tree | 3d27aa8cf0ebb313fa266f17fd006a1949c4a1ef /recipes-kernel | |
parent | 6ed3918ed0ba49f07cd7f14fc3e26bf9710a223c (diff) | |
download | meta-freescale-ae8111e156a68cb71e047418cab2826f2542cc0c.tar.gz |
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.bb | 17 |
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 " | |||
30 | DELTA_KERNEL_DEFCONFIG_prepend_fsl-lsch2-32b = "multi_v7_lpae.config lsdk.config multi_v8.config " | 30 | DELTA_KERNEL_DEFCONFIG_prepend_fsl-lsch2-32b = "multi_v7_lpae.config lsdk.config multi_v8.config " |
31 | DELTA_KERNEL_DEFCONFIG_prepend_ls102xa = "multi_v7_lpae.config lsdk.config " | 31 | DELTA_KERNEL_DEFCONFIG_prepend_ls102xa = "multi_v7_lpae.config lsdk.config " |
32 | 32 | ||
33 | do_merge_delta_config[dirs] = "${B}" | ||
34 | |||
33 | do_merge_delta_config() { | 35 | do_merge_delta_config() { |
34 | # copy desired defconfig so we pick it up for the real kernel_do_configure | 36 | # create .config with make config |
35 | cp ${KERNEL_DEFCONFIG} .config | 37 | oe_runmake -C ${S} O=${B} ${KERNEL_DEFCONFIG} |
36 | 38 | ||
37 | # add config fragments | 39 | # add config fragments |
38 | for deltacfg in ${DELTA_KERNEL_DEFCONFIG}; do | 40 | for deltacfg in ${DELTA_KERNEL_DEFCONFIG}; do |
39 | if [ -f "${deltacfg}" ]; then | 41 | if [ -f ${S}/arch/${ARCH}/configs/${deltacfg} ]; then |
40 | ${S}/scripts/kconfig/merge_config.sh -m .config ${deltacfg} | 42 | oe_runmake -C ${S} O=${B} ${deltacfg} |
41 | elif [ -f "${WORKDIR}/${deltacfg}" ]; then | 43 | elif [ -f "${WORKDIR}/${deltacfg}" ]; then |
42 | ${S}/scripts/kconfig/merge_config.sh -m .config ${WORKDIR}/${deltacfg} | 44 | ${S}/scripts/kconfig/merge_config.sh -m .config ${WORKDIR}/${deltacfg} |
43 | elif [ -f "${S}/arch/${ARCH}/configs/${deltacfg}" ]; then | 45 | elif [ -f "${deltacfg}" ]; then |
44 | ${S}/scripts/kconfig/merge_config.sh -m .config \ | 46 | ${S}/scripts/kconfig/merge_config.sh -m .config ${deltacfg} |
45 | ${S}/arch/${ARCH}/configs/${deltacfg} | ||
46 | fi | 47 | fi |
47 | done | 48 | done |
48 | cp .config ${WORKDIR}/defconfig | 49 | cp .config ${WORKDIR}/defconfig |