summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorBruce Ashfield <bruce.ashfield@windriver.com>2014-06-17 11:26:14 -0400
committerRichard Purdie <richard.purdie@linuxfoundation.org>2014-06-17 17:56:57 +0100
commit869e3d7052c19a39f5dc6b004e49f48fda89cbc1 (patch)
tree807285c040f017cb4b0db1e868435652182337f4 /meta
parent3b65c42bbb1c0d45d8acd4fdf13bc7771cc1c9c0 (diff)
downloadpoky-869e3d7052c19a39f5dc6b004e49f48fda89cbc1.tar.gz
linux-yocto/3.14: enable mpc8315e NAND and Yaffs2 gcc 4.9 fix
Updating the meta branch with configuration changes to enable NAND booting on the mpc8315e reference board. We also update the BSP SRCREVs to fix a compilation issue with date/time on Yaffs2 and gcc 4.9. (From OE-Core rev: d7f3b457de1a541a4ba986c7e6dcdf136a3b831c) Signed-off-by: Kevin Hao <kexin.hao@windriver.com> Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-kernel/linux/linux-yocto-rt_3.14.bb6
-rw-r--r--meta/recipes-kernel/linux/linux-yocto-tiny_3.14.bb4
-rw-r--r--meta/recipes-kernel/linux/linux-yocto_3.14.bb16
3 files changed, 13 insertions, 13 deletions
diff --git a/meta/recipes-kernel/linux/linux-yocto-rt_3.14.bb b/meta/recipes-kernel/linux/linux-yocto-rt_3.14.bb
index 29df6b722e..6d5096cd85 100644
--- a/meta/recipes-kernel/linux/linux-yocto-rt_3.14.bb
+++ b/meta/recipes-kernel/linux/linux-yocto-rt_3.14.bb
@@ -3,9 +3,9 @@ require recipes-kernel/linux/linux-yocto.inc
3KBRANCH = "standard/preempt-rt/base" 3KBRANCH = "standard/preempt-rt/base"
4KBRANCH_qemuppc = "standard/preempt-rt/qemuppc" 4KBRANCH_qemuppc = "standard/preempt-rt/qemuppc"
5 5
6SRCREV_machine ?= "ec7945d3abac66557de452e9c81f6f3692f187db" 6SRCREV_machine ?= "5c79217cdf1c16a3cacd28968e8c3e417e994c86"
7SRCREV_machine_qemuppc ?= "ec7945d3abac66557de452e9c81f6f3692f187db" 7SRCREV_machine_qemuppc ?= "1ad208565754a1122df5500246f3142e2a3eff39"
8SRCREV_meta ?= "135b9fb4b8d66b8df9abcd22f325e77614d35d2e" 8SRCREV_meta ?= "602be954ac45e8aea06cb93d6766bbf83c242090"
9 9
10SRC_URI = "git://git.yoctoproject.org/linux-yocto-3.14.git;bareclone=1;branch=${KBRANCH},meta;name=machine,meta" 10SRC_URI = "git://git.yoctoproject.org/linux-yocto-3.14.git;bareclone=1;branch=${KBRANCH},meta;name=machine,meta"
11 11
diff --git a/meta/recipes-kernel/linux/linux-yocto-tiny_3.14.bb b/meta/recipes-kernel/linux/linux-yocto-tiny_3.14.bb
index e619fded41..7eb90a6929 100644
--- a/meta/recipes-kernel/linux/linux-yocto-tiny_3.14.bb
+++ b/meta/recipes-kernel/linux/linux-yocto-tiny_3.14.bb
@@ -8,8 +8,8 @@ LINUX_VERSION ?= "3.14.5"
8 8
9KMETA = "meta" 9KMETA = "meta"
10 10
11SRCREV_machine ?= "8e552bfb9824bbfdda3b5353dab290519a7332c7" 11SRCREV_machine ?= "96930820e0cb6d4b31d5e0c8f3174805f4a868b3"
12SRCREV_meta ?= "135b9fb4b8d66b8df9abcd22f325e77614d35d2e" 12SRCREV_meta ?= "602be954ac45e8aea06cb93d6766bbf83c242090"
13 13
14PV = "${LINUX_VERSION}+git${SRCPV}" 14PV = "${LINUX_VERSION}+git${SRCPV}"
15 15
diff --git a/meta/recipes-kernel/linux/linux-yocto_3.14.bb b/meta/recipes-kernel/linux/linux-yocto_3.14.bb
index 6a500653bc..1bdf520a92 100644
--- a/meta/recipes-kernel/linux/linux-yocto_3.14.bb
+++ b/meta/recipes-kernel/linux/linux-yocto_3.14.bb
@@ -10,14 +10,14 @@ KBRANCH_qemux86 = "standard/common-pc/base"
10KBRANCH_qemux86-64 = "standard/common-pc-64/base" 10KBRANCH_qemux86-64 = "standard/common-pc-64/base"
11KBRANCH_qemumips64 = "standard/mti-malta64" 11KBRANCH_qemumips64 = "standard/mti-malta64"
12 12
13SRCREV_machine_qemuarm ?= "57c7d98c639aa69ed4640aaf0077dfc6f6213b62" 13SRCREV_machine_qemuarm ?= "2489f1f4d7aa27bf0808d7fa80a50399c643516d"
14SRCREV_machine_qemumips ?= "0c95bd5e4fd9834de451197edb2f0acb7d93d1e8" 14SRCREV_machine_qemumips ?= "63b4ca3223d9481baa77f527f50d906d15747141"
15SRCREV_machine_qemuppc ?= "9a15b569a7c7340e895327ba464e8cd852914c2b" 15SRCREV_machine_qemuppc ?= "e5dfe8f89b45effe445d04e0f9b391948eb108ae"
16SRCREV_machine_qemux86 ?= "4aa0cb556f1a3457d0cb3285d0ba2aa073b745eb" 16SRCREV_machine_qemux86 ?= "41d5fe27dc3d3e769cb6af01770cac3d75a91e1a"
17SRCREV_machine_qemux86-64 ?= "8e552bfb9824bbfdda3b5353dab290519a7332c7" 17SRCREV_machine_qemux86-64 ?= "96930820e0cb6d4b31d5e0c8f3174805f4a868b3"
18SRCREV_machine_qemumips64 ?= "42cb63ec0929a3e488b3c61cef31c6ee5b0e1005" 18SRCREV_machine_qemumips64 ?= "103df748c6e83d5874a8385592f758feeb818324"
19SRCREV_machine ?= "8e552bfb9824bbfdda3b5353dab290519a7332c7" 19SRCREV_machine ?= "96930820e0cb6d4b31d5e0c8f3174805f4a868b3"
20SRCREV_meta ?= "135b9fb4b8d66b8df9abcd22f325e77614d35d2e" 20SRCREV_meta ?= "602be954ac45e8aea06cb93d6766bbf83c242090"
21 21
22SRC_URI = "git://git.yoctoproject.org/linux-yocto-3.14.git;bareclone=1;branch=${KBRANCH},${KMETA};name=machine,meta" 22SRC_URI = "git://git.yoctoproject.org/linux-yocto-3.14.git;bareclone=1;branch=${KBRANCH},${KMETA};name=machine,meta"
23 23