diff options
author | Tom Zanussi <tom.zanussi@intel.com> | 2012-09-27 17:12:41 -0500 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2012-09-28 15:19:43 +0100 |
commit | facb5f902fd828658b00aaf8bbe033243efcb999 (patch) | |
tree | d63a6d9750d881c218bb4bcf293e128dc2332944 /scripts | |
parent | 1ed2073a01d9d649bd61ed30f2991bb5f351aa20 (diff) | |
download | ast2050-yocto-poky-facb5f902fd828658b00aaf8bbe033243efcb999.zip ast2050-yocto-poky-facb5f902fd828658b00aaf8bbe033243efcb999.tar.gz |
yocto-bsp: make vfat feature inclusion conditional on kernel version
The linux-yocto-3.2 cfg/vfat feature changed location to cfg/fs/vfat
in the 3.4 yocto kernel's meta branch. Add template code to include
the appropriate version depending on kernel version.
Fixes [YOCTO #3178].
(From meta-yocto rev: d574c56c51789ec56ff50518ac2057607740eaa8)
Signed-off-by: Tom Zanussi <tom.zanussi@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'scripts')
-rw-r--r-- | scripts/lib/bsp/substrate/target/arch/mips/recipes-kernel/linux/files/{{=machine}}.scc | 4 | ||||
-rw-r--r-- | scripts/lib/bsp/substrate/target/arch/powerpc/recipes-kernel/linux/files/{{=machine}}.scc | 4 |
2 files changed, 7 insertions, 1 deletions
diff --git a/scripts/lib/bsp/substrate/target/arch/mips/recipes-kernel/linux/files/{{=machine}}.scc b/scripts/lib/bsp/substrate/target/arch/mips/recipes-kernel/linux/files/{{=machine}}.scc index 7d29541..e3daafb 100644 --- a/scripts/lib/bsp/substrate/target/arch/mips/recipes-kernel/linux/files/{{=machine}}.scc +++ b/scripts/lib/bsp/substrate/target/arch/mips/recipes-kernel/linux/files/{{=machine}}.scc @@ -1,8 +1,10 @@ kconf hardware {{=machine}}.cfg include cfg/usb-mass-storage.scc +{{ if kernel_choice == "linux-yocto_3.2": }} include cfg/vfat.scc +{{ if kernel_choice == "linux-yocto_3.4": }} +include cfg/fs/vfat.scc kconf hardware user-config.cfg include user-patches.scc - diff --git a/scripts/lib/bsp/substrate/target/arch/powerpc/recipes-kernel/linux/files/{{=machine}}.scc b/scripts/lib/bsp/substrate/target/arch/powerpc/recipes-kernel/linux/files/{{=machine}}.scc index 8a04ddd..ec46ec1 100644 --- a/scripts/lib/bsp/substrate/target/arch/powerpc/recipes-kernel/linux/files/{{=machine}}.scc +++ b/scripts/lib/bsp/substrate/target/arch/powerpc/recipes-kernel/linux/files/{{=machine}}.scc @@ -1,7 +1,11 @@ kconf hardware {{=machine}}.cfg include cfg/usb-mass-storage.scc +{{ if kernel_choice == "linux-yocto_3.2": }} include cfg/vfat.scc +{{ if kernel_choice == "linux-yocto_3.4": }} +include cfg/fs/vfat.scc + include cfg/dmaengine/dmaengine.scc kconf hardware user-config.cfg |