diff options
author | Bruce Ashfield <bruce.ashfield@windriver.com> | 2012-10-25 10:20:07 -0400 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2012-11-20 15:31:50 +0000 |
commit | a7cd6e3578f5cbbc6a9ce6daf21ec1633164c905 (patch) | |
tree | 07e7ddce05885cdd46246a6c9f93333e4e310750 /meta/recipes-kernel | |
parent | cd838e8e8ac7e368e00a4f754f23eee1293241cf (diff) | |
download | poky-a7cd6e3578f5cbbc6a9ce6daf21ec1633164c905.tar.gz |
linux-yocto/3.4: efi/mmc fixes and fri2 updates
Updating the 3.4 SRCREVs to pick up the following two fixes:
218bd8d efi: Add patch to fix 32bit EFI service mapping (rhbz 726701)
b6d08f7 mmc: sdhci: Use DBG() instead of pr_warning() on large timeout
And the following meta branch config updates:
68a635b fri2: Disable GPIO_PCH for preempt-rt
2ec32d5 fri2: Add fri2-tiny support
a7b9607 fri2: Required boot config for fri2
bed2080 fri2: Remove graphics options from the core fri2 description
(From OE-Core rev: dbd49c9157f933fec9147280a48ce3cda7a697eb)
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.bb | 6 | ||||
-rw-r--r-- | meta/recipes-kernel/linux/linux-yocto-tiny_3.4.bb | 5 | ||||
-rw-r--r-- | meta/recipes-kernel/linux/linux-yocto_3.4.bb | 14 |
3 files changed, 12 insertions, 13 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 bbac3221fb..bdbecf4467 100644 --- a/meta/recipes-kernel/linux/linux-yocto-rt_3.4.bb +++ b/meta/recipes-kernel/linux/linux-yocto-rt_3.4.bb | |||
@@ -8,9 +8,9 @@ LINUX_KERNEL_TYPE = "preempt-rt" | |||
8 | 8 | ||
9 | KMETA = "meta" | 9 | KMETA = "meta" |
10 | 10 | ||
11 | SRCREV_machine ?= "5705c8037d2c47938034ead87c70ae3ebef552f7" | 11 | SRCREV_machine ?= "fb596148058bf5e7ef550a040d143bdfbf4146b0" |
12 | SRCREV_machine_qemuppc ?= "c8b651aab5d2d5c0839cdedc0c0ec5dc09cf47c0" | 12 | SRCREV_machine_qemuppc ?= "b24ede45575d58ace08633f0e8fd31b594c5c80e" |
13 | SRCREV_meta ?= "0541ba5f98f31419e9bdfec895c18029bf424e7c" | 13 | SRCREV_meta ?= "68a635bf8dfb64b02263c1ac80c948647cc76d5f" |
14 | 14 | ||
15 | PR = "${INC_PR}.0" | 15 | PR = "${INC_PR}.0" |
16 | PV = "${LINUX_VERSION}+git${SRCPV}" | 16 | PV = "${LINUX_VERSION}+git${SRCPV}" |
diff --git a/meta/recipes-kernel/linux/linux-yocto-tiny_3.4.bb b/meta/recipes-kernel/linux/linux-yocto-tiny_3.4.bb index e1d349d6ff..772cfef5a1 100644 --- a/meta/recipes-kernel/linux/linux-yocto-tiny_3.4.bb +++ b/meta/recipes-kernel/linux/linux-yocto-tiny_3.4.bb | |||
@@ -12,9 +12,8 @@ LINUX_VERSION ?= "3.4.11" | |||
12 | 12 | ||
13 | KMETA = "meta" | 13 | KMETA = "meta" |
14 | 14 | ||
15 | SRCREV_machine ?= "449f7f520350700858f21a5554b81cc8ad23267d" | 15 | SRCREV_machine ?= "218bd8d2022b9852c60d32f0d770931e3cf343e2" |
16 | SRCREV_meta ?= "0541ba5f98f31419e9bdfec895c18029bf424e7c" | 16 | SRCREV_meta ?= "68a635bf8dfb64b02263c1ac80c948647cc76d5f" |
17 | |||
18 | 17 | ||
19 | PR = "${INC_PR}.0" | 18 | PR = "${INC_PR}.0" |
20 | PV = "${LINUX_VERSION}+git${SRCPV}" | 19 | PV = "${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 904e79e0b1..22593c6408 100644 --- a/meta/recipes-kernel/linux/linux-yocto_3.4.bb +++ b/meta/recipes-kernel/linux/linux-yocto_3.4.bb | |||
@@ -3,13 +3,13 @@ require recipes-kernel/linux/linux-yocto.inc | |||
3 | KBRANCH_DEFAULT = "standard/base" | 3 | KBRANCH_DEFAULT = "standard/base" |
4 | KBRANCH = "${KBRANCH_DEFAULT}" | 4 | KBRANCH = "${KBRANCH_DEFAULT}" |
5 | 5 | ||
6 | SRCREV_machine_qemuarm ?= "8ee53c3b82ada3cdfd7d25f07d3975834ac9a9b2" | 6 | SRCREV_machine_qemuarm ?= "cec289be595a5889740ad4f0a58d12579f528d5e" |
7 | SRCREV_machine_qemumips ?= "caf99a20e3c3ba036ed1bb46875059a0d24e4fbd" | 7 | SRCREV_machine_qemumips ?= "01ab58eb9dc64ceccb2d7be80ef4a511479fc899" |
8 | SRCREV_machine_qemuppc ?= "7833f1549c3d44cce8aea38b65cd501229aad492" | 8 | SRCREV_machine_qemuppc ?= "c820da3c7fa5176507c116352ee3bd1e682f36bd" |
9 | SRCREV_machine_qemux86 ?= "449f7f520350700858f21a5554b81cc8ad23267d" | 9 | SRCREV_machine_qemux86 ?= "218bd8d2022b9852c60d32f0d770931e3cf343e2" |
10 | SRCREV_machine_qemux86-64 ?= "449f7f520350700858f21a5554b81cc8ad23267d" | 10 | SRCREV_machine_qemux86-64 ?= "218bd8d2022b9852c60d32f0d770931e3cf343e2" |
11 | SRCREV_machine ?= "449f7f520350700858f21a5554b81cc8ad23267d" | 11 | SRCREV_machine ?= "218bd8d2022b9852c60d32f0d770931e3cf343e2" |
12 | SRCREV_meta ?= "0541ba5f98f31419e9bdfec895c18029bf424e7c" | 12 | SRCREV_meta ?= "68a635bf8dfb64b02263c1ac80c948647cc76d5f" |
13 | 13 | ||
14 | SRC_URI = "git://git.yoctoproject.org/linux-yocto-3.4.git;protocol=git;nocheckout=1;branch=${KBRANCH},meta;name=machine,meta" | 14 | SRC_URI = "git://git.yoctoproject.org/linux-yocto-3.4.git;protocol=git;nocheckout=1;branch=${KBRANCH},meta;name=machine,meta" |
15 | 15 | ||