summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBruce Ashfield <bruce.ashfield@windriver.com>2012-09-23 23:06:58 -0400
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-09-24 11:30:32 +0100
commitae18a5996a13a0068c7ff3494d125ceb8f23bb02 (patch)
treeb121349510c830fcf1f23679834b339ae2cf65ef
parent8e3c10f2379fb5d22a7a8c9bb0a31e9752d87f0f (diff)
downloadpoky-ae18a5996a13a0068c7ff3494d125ceb8f23bb02.tar.gz
linux-yocto/3.4: Update fri2 and sys940x to emgd-1.14
Bumping the meta SRCREV to pickup a newer emgd for the fri2 and sys940x. (From OE-Core rev: abb23d987184f76fb922af15508f2e251399e3ed) Signed-off-by: Darren Hart <dvhart@linux.intel.com> 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.4.bb3
-rw-r--r--meta/recipes-kernel/linux/linux-yocto_3.4.bb2
2 files changed, 3 insertions, 2 deletions
diff --git a/meta/recipes-kernel/linux/linux-yocto-rt_3.4.bb b/meta/recipes-kernel/linux/linux-yocto-rt_3.4.bb
index 62858fc093..5a26055e1d 100644
--- a/meta/recipes-kernel/linux/linux-yocto-rt_3.4.bb
+++ b/meta/recipes-kernel/linux/linux-yocto-rt_3.4.bb
@@ -10,7 +10,8 @@ KMETA = "meta"
10 10
11SRCREV_machine ?= "dcecefa43e05f5450886648a93e2fda2ec35e2dc" 11SRCREV_machine ?= "dcecefa43e05f5450886648a93e2fda2ec35e2dc"
12SRCREV_machine_qemuppc ?= "5e8709c4777f07a12b0a05a22f0864f552ef9449" 12SRCREV_machine_qemuppc ?= "5e8709c4777f07a12b0a05a22f0864f552ef9449"
13SRCREV_meta ?= "594994cb4c19bb4f2e8100ffe0599aef8b2e8b4c" 13SRCREV_meta ?= "c5bddf8ea379406ffec550528e17b777a0eba24b"
14
14 15
15PR = "${INC_PR}.0" 16PR = "${INC_PR}.0"
16PV = "${LINUX_VERSION}+git${SRCPV}" 17PV = "${LINUX_VERSION}+git${SRCPV}"
diff --git a/meta/recipes-kernel/linux/linux-yocto_3.4.bb b/meta/recipes-kernel/linux/linux-yocto_3.4.bb
index 8cda0c3e6b..364b702c93 100644
--- a/meta/recipes-kernel/linux/linux-yocto_3.4.bb
+++ b/meta/recipes-kernel/linux/linux-yocto_3.4.bb
@@ -9,7 +9,7 @@ SRCREV_machine_qemuppc ?= "cf4bad14983753ad4b592c40fb36466b202b24a4"
9SRCREV_machine_qemux86 ?= "59c3ff750831338d05ab67d5efd7fc101c451aff" 9SRCREV_machine_qemux86 ?= "59c3ff750831338d05ab67d5efd7fc101c451aff"
10SRCREV_machine_qemux86-64 ?= "59c3ff750831338d05ab67d5efd7fc101c451aff" 10SRCREV_machine_qemux86-64 ?= "59c3ff750831338d05ab67d5efd7fc101c451aff"
11SRCREV_machine ?= "59c3ff750831338d05ab67d5efd7fc101c451aff" 11SRCREV_machine ?= "59c3ff750831338d05ab67d5efd7fc101c451aff"
12SRCREV_meta ?= "594994cb4c19bb4f2e8100ffe0599aef8b2e8b4c" 12SRCREV_meta ?= "c5bddf8ea379406ffec550528e17b777a0eba24b"
13 13
14SRC_URI = "git://git.yoctoproject.org/linux-yocto-3.4.git;protocol=git;nocheckout=1;branch=${KBRANCH},meta;name=machine,meta" 14SRC_URI = "git://git.yoctoproject.org/linux-yocto-3.4.git;protocol=git;nocheckout=1;branch=${KBRANCH},meta;name=machine,meta"
15 15