summaryrefslogtreecommitdiffstats
path: root/scripts
diff options
context:
space:
mode:
authorTom Zanussi <tom.zanussi@intel.com>2012-09-27 17:12:41 -0500
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-09-28 15:19:43 +0100
commitfacb5f902fd828658b00aaf8bbe033243efcb999 (patch)
treed63a6d9750d881c218bb4bcf293e128dc2332944 /scripts
parent1ed2073a01d9d649bd61ed30f2991bb5f351aa20 (diff)
downloadpoky-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}}.scc4
-rw-r--r--scripts/lib/bsp/substrate/target/arch/powerpc/recipes-kernel/linux/files/{{=machine}}.scc4
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 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 @@
1kconf hardware {{=machine}}.cfg 1kconf hardware {{=machine}}.cfg
2 2
3include cfg/usb-mass-storage.scc 3include cfg/usb-mass-storage.scc
4{{ if kernel_choice == "linux-yocto_3.2": }}
4include cfg/vfat.scc 5include cfg/vfat.scc
6{{ if kernel_choice == "linux-yocto_3.4": }}
7include cfg/fs/vfat.scc
5 8
6kconf hardware user-config.cfg 9kconf hardware user-config.cfg
7include user-patches.scc 10include user-patches.scc
8
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 @@
1kconf hardware {{=machine}}.cfg 1kconf hardware {{=machine}}.cfg
2 2
3include cfg/usb-mass-storage.scc 3include cfg/usb-mass-storage.scc
4{{ if kernel_choice == "linux-yocto_3.2": }}
4include cfg/vfat.scc 5include cfg/vfat.scc
6{{ if kernel_choice == "linux-yocto_3.4": }}
7include cfg/fs/vfat.scc
8
5include cfg/dmaengine/dmaengine.scc 9include cfg/dmaengine/dmaengine.scc
6 10
7kconf hardware user-config.cfg 11kconf hardware user-config.cfg