summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBruce Ashfield <bruce.ashfield@windriver.com>2015-05-08 14:07:19 -0400
committerRichard Purdie <richard.purdie@linuxfoundation.org>2015-05-24 07:19:17 +0100
commitada5e493bf893e01f6a311d55796bf0e53aefbbc (patch)
tree12d8058996445e336ca2ecc5b93078fba6140ff5
parent2f41470fd6927f75aab7741852bcaad2ae9cc9f2 (diff)
downloadpoky-ada5e493bf893e01f6a311d55796bf0e53aefbbc.tar.gz
linux-yocto/3.14: cavium and configuration changes
Updating the 3.14 SRCREVs to integrate the latest round of cavium support patches, as well as configuration backports from 3.19. (From OE-Core rev: df552f18cf9852e0f04780399b78605c8085d935) Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-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.bb18
3 files changed, 14 insertions, 14 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 86b31738b6..7da7f83b3a 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 @@ KBRANCH_qemuppc ?= "standard/preempt-rt/qemuppc"
3 3
4require recipes-kernel/linux/linux-yocto.inc 4require recipes-kernel/linux/linux-yocto.inc
5 5
6SRCREV_machine ?= "0c641a6c0e38137364535b99e43657a0cbc07cd4" 6SRCREV_machine ?= "3428de71031ede23682dd0842b9cfc23ae465f39"
7SRCREV_machine_qemuppc ?= "cfc4e296efcaa84358c9ab1cdeee6ce7c378436f" 7SRCREV_machine_qemuppc ?= "32c44a56a8218c3349f50d8151a10252d5e85dd1"
8SRCREV_meta ?= "46df2668fa657162d11f96a6f1af138c562a03aa" 8SRCREV_meta ?= "a996d95104b72c422a56e7d9bc8615ec4219ac74"
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 d0b71c4859..000f288fb3 100644
--- a/meta/recipes-kernel/linux/linux-yocto-tiny_3.14.bb
+++ b/meta/recipes-kernel/linux/linux-yocto-tiny_3.14.bb
@@ -9,8 +9,8 @@ LINUX_VERSION ?= "3.14.36"
9KMETA = "meta" 9KMETA = "meta"
10KCONF_BSP_AUDIT_LEVEL = "2" 10KCONF_BSP_AUDIT_LEVEL = "2"
11 11
12SRCREV_machine ?= "b991a586470900e3de824f5ea75653aa2150594d" 12SRCREV_machine ?= "bda175966009d5a94103559e6e6ae51279952f39"
13SRCREV_meta ?= "46df2668fa657162d11f96a6f1af138c562a03aa" 13SRCREV_meta ?= "a996d95104b72c422a56e7d9bc8615ec4219ac74"
14 14
15PV = "${LINUX_VERSION}+git${SRCPV}" 15PV = "${LINUX_VERSION}+git${SRCPV}"
16 16
diff --git a/meta/recipes-kernel/linux/linux-yocto_3.14.bb b/meta/recipes-kernel/linux/linux-yocto_3.14.bb
index d4ea55a239..c809d2e29f 100644
--- a/meta/recipes-kernel/linux/linux-yocto_3.14.bb
+++ b/meta/recipes-kernel/linux/linux-yocto_3.14.bb
@@ -11,15 +11,15 @@ KBRANCH_qemux86 ?= "standard/common-pc/base"
11KBRANCH_qemux86-64 ?= "standard/common-pc-64/base" 11KBRANCH_qemux86-64 ?= "standard/common-pc-64/base"
12KBRANCH_qemumips64 ?= "standard/mti-malta64" 12KBRANCH_qemumips64 ?= "standard/mti-malta64"
13 13
14SRCREV_machine_qemuarm ?= "e4f91293908648d495b4f9735768633569e39b9f" 14SRCREV_machine_qemuarm ?= "dbd8e70653ffb6b63a1b8b7134813d3a93975ff5"
15SRCREV_machine_qemuarm64 ?= "b991a586470900e3de824f5ea75653aa2150594d" 15SRCREV_machine_qemuarm64 ?= "bda175966009d5a94103559e6e6ae51279952f39"
16SRCREV_machine_qemumips ?= "6623389731309b0ac591736d5b438de833f195c7" 16SRCREV_machine_qemumips ?= "b985d5039e5b14f5acac135a84f2d6541b531552"
17SRCREV_machine_qemuppc ?= "3217fbcd002914fba4914d2e61dabb378081fd25" 17SRCREV_machine_qemuppc ?= "dbbdaf47fae37664ea30181b18a436b3d5401293"
18SRCREV_machine_qemux86 ?= "8794bd6a473199b2baa7a405d44cdbfa5351b60b" 18SRCREV_machine_qemux86 ?= "d3943ebf24457188669472c85d82ab32e2f95f6b"
19SRCREV_machine_qemux86-64 ?= "b991a586470900e3de824f5ea75653aa2150594d" 19SRCREV_machine_qemux86-64 ?= "bda175966009d5a94103559e6e6ae51279952f39"
20SRCREV_machine_qemumips64 ?= "6649ef219b3bf6da1678547b9da376367520e80a" 20SRCREV_machine_qemumips64 ?= "a594ff1fef248d72bf4ef929fa4497cf54a04500"
21SRCREV_machine ?= "b991a586470900e3de824f5ea75653aa2150594d" 21SRCREV_machine ?= "bda175966009d5a94103559e6e6ae51279952f39"
22SRCREV_meta ?= "46df2668fa657162d11f96a6f1af138c562a03aa" 22SRCREV_meta ?= "a996d95104b72c422a56e7d9bc8615ec4219ac74"
23 23
24SRC_URI = "git://git.yoctoproject.org/linux-yocto-3.14.git;bareclone=1;branch=${KBRANCH},${KMETA};name=machine,meta" 24SRC_URI = "git://git.yoctoproject.org/linux-yocto-3.14.git;bareclone=1;branch=${KBRANCH},${KMETA};name=machine,meta"
25 25