diff options
| author | Zhenhua Luo <zhenhua.luo@freescale.com> | 2016-01-09 14:43:02 +0800 |
|---|---|---|
| committer | Otavio Salvador <otavio@ossystems.com.br> | 2016-04-19 15:03:22 -0300 |
| commit | b557990e6dc79351df483d4882b8dda488612afe (patch) | |
| tree | 706b909c903fca7677edf77b7cf18a49ce074d9a /recipes-kernel | |
| parent | 07340b93ceb7521c133ee8eb13db341fc138878f (diff) | |
| download | meta-freescale-b557990e6dc79351df483d4882b8dda488612afe.tar.gz | |
linux-qoriq: support kernel delta defconfig managed in recipe folder
Signed-off-by: Zhenhua Luo <zhenhua.luo@freescale.com>
Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
Diffstat (limited to 'recipes-kernel')
| -rw-r--r-- | recipes-kernel/linux/linux-qoriq.inc | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/recipes-kernel/linux/linux-qoriq.inc b/recipes-kernel/linux/linux-qoriq.inc index 5992fbff..6436d9c3 100644 --- a/recipes-kernel/linux/linux-qoriq.inc +++ b/recipes-kernel/linux/linux-qoriq.inc | |||
| @@ -29,6 +29,8 @@ do_configure_prepend() { | |||
| 29 | for deltacfg in ${DELTA_KERNEL_DEFCONFIG}; do | 29 | for deltacfg in ${DELTA_KERNEL_DEFCONFIG}; do |
| 30 | if [ -f "${deltacfg}" ]; then | 30 | if [ -f "${deltacfg}" ]; then |
| 31 | ${S}/scripts/kconfig/merge_config.sh -m .config ${deltacfg} | 31 | ${S}/scripts/kconfig/merge_config.sh -m .config ${deltacfg} |
| 32 | elif [ -f "${WORKDIR}/${deltacfg}" ]; then | ||
| 33 | ${S}/scripts/kconfig/merge_config.sh -m .config ${WORKDIR}/${deltacfg} | ||
| 32 | elif [ -f "${S}/arch/${ARCH}/configs/${deltacfg}" ]; then | 34 | elif [ -f "${S}/arch/${ARCH}/configs/${deltacfg}" ]; then |
| 33 | ${S}/scripts/kconfig/merge_config.sh -m .config \ | 35 | ${S}/scripts/kconfig/merge_config.sh -m .config \ |
| 34 | ${S}/arch/powerpc/configs/${deltacfg} | 36 | ${S}/arch/powerpc/configs/${deltacfg} |