summaryrefslogtreecommitdiffstats
path: root/meta/recipes-kernel
diff options
context:
space:
mode:
authorBruce Ashfield <bruce.ashfield@windriver.com>2012-07-20 11:19:25 -0400
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-07-22 11:42:23 +0100
commit89b1dcb0737cef460797abf878a31e32dac95ce5 (patch)
treee34b9223d369d74a80d05ef5f24859463648f3db /meta/recipes-kernel
parentbeef126fd2a5c897f4a18255098042f8df973c47 (diff)
downloadpoky-89b1dcb0737cef460797abf878a31e32dac95ce5.tar.gz
linux-yocto/3.4: emgd, mtd nand and kmemcheck fixes
Updating the 3.4 meta SRCREV for the following fixes: 949fddd meta: crownbay.scc change emgd branch name cd0721a yocto/emgd: emgd 1.14 driver c2b5ee3 meta: disable CONFIG_MTD_NAND_VERIFY_WRITE 004cadb meta: kmemcheck: 'other' configs turning on CONFIG_FUNCTION_TRACER (From OE-Core rev: c192b2da74b20f091b6191349ceb1cf195aae8c6) Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-kernel')
-rw-r--r--meta/recipes-kernel/linux/linux-yocto-rt_3.4.bb2
-rw-r--r--meta/recipes-kernel/linux/linux-yocto_3.4.bb2
2 files changed, 2 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 f30f6dd118..97a1a19530 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,7 @@ KMETA = "meta"
10 10
11SRCREV_machine ?= "b25f7c9730e3bd3be1bf7b7982251b7459ad6579" 11SRCREV_machine ?= "b25f7c9730e3bd3be1bf7b7982251b7459ad6579"
12SRCREV_machine_qemuppc ?= "2777125ab6f92b624ecaf11d6b1ab604e64497a8" 12SRCREV_machine_qemuppc ?= "2777125ab6f92b624ecaf11d6b1ab604e64497a8"
13SRCREV_meta ?= "a8cf77018b0faa0d29f1483ff4e5a2034dc8edd5" 13SRCREV_meta ?= "949fddda61053cc15e46c015e8f7db17e7b33360"
14 14
15PR = "${INC_PR}.0" 15PR = "${INC_PR}.0"
16PV = "${LINUX_VERSION}+git${SRCPV}" 16PV = "${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 39b5cdff28..f031e1b668 100644
--- a/meta/recipes-kernel/linux/linux-yocto_3.4.bb
+++ b/meta/recipes-kernel/linux/linux-yocto_3.4.bb
@@ -16,7 +16,7 @@ SRCREV_machine_qemuppc ?= "08732f25bc3cb404e29ae201074bcf5c1661ea83"
16SRCREV_machine_qemux86 ?= "6297e4c1d57e1063bfce297c2e12392348598559" 16SRCREV_machine_qemux86 ?= "6297e4c1d57e1063bfce297c2e12392348598559"
17SRCREV_machine_qemux86-64 ?= "6297e4c1d57e1063bfce297c2e12392348598559" 17SRCREV_machine_qemux86-64 ?= "6297e4c1d57e1063bfce297c2e12392348598559"
18SRCREV_machine ?= "6297e4c1d57e1063bfce297c2e12392348598559" 18SRCREV_machine ?= "6297e4c1d57e1063bfce297c2e12392348598559"
19SRCREV_meta ?= "a8cf77018b0faa0d29f1483ff4e5a2034dc8edd5" 19SRCREV_meta ?= "949fddda61053cc15e46c015e8f7db17e7b33360"
20 20
21SRC_URI = "git://git.yoctoproject.org/linux-yocto-3.4.git;protocol=git;nocheckout=1;branch=${KBRANCH},meta;name=machine,meta" 21SRC_URI = "git://git.yoctoproject.org/linux-yocto-3.4.git;protocol=git;nocheckout=1;branch=${KBRANCH},meta;name=machine,meta"
22 22