From facb5f902fd828658b00aaf8bbe033243efcb999 Mon Sep 17 00:00:00 2001 From: Tom Zanussi Date: Thu, 27 Sep 2012 17:12:41 -0500 Subject: 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 Signed-off-by: Richard Purdie --- .../target/arch/mips/recipes-kernel/linux/files/{{=machine}}.scc | 4 +++- .../target/arch/powerpc/recipes-kernel/linux/files/{{=machine}}.scc | 4 ++++ 2 files changed, 7 insertions(+), 1 deletion(-) (limited to 'scripts') 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 7d295418fc..e3daafb692 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 8a04ddd1af..ec46ec18e3 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 -- cgit v1.2.3-54-g00ecf