summaryrefslogtreecommitdiffstats
path: root/meta/recipes-kernel/linux/linux-yocto-rt_3.2.bb
diff options
context:
space:
mode:
authorBruce Ashfield <bruce.ashfield@windriver.com>2012-05-04 10:40:34 -0400
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-06-21 11:59:33 +0100
commit495ea21c8ba1bec8b3a2b5db8331aa0aa479df7d (patch)
tree477b4abab92744e2984832286483c18bddb0f00c /meta/recipes-kernel/linux/linux-yocto-rt_3.2.bb
parent94e3e894d0f535f010ae332ca7f68f86b0475516 (diff)
downloadpoky-495ea21c8ba1bec8b3a2b5db8331aa0aa479df7d.tar.gz
linux-yocto/3.2: configuration and pch merge
Updating the 3.2 SRCREVs to import the following meta/config changes: 6b3d4e0 meta: add mei feature 519abac meta: add usb/uhci-hcd feature a67c5a3 meta/crownbay: use usb features 0855066 meta: add usb/ohci-hcd feature 15f1a99 meta: add usb/ehci-hcd feature 8fa6408 meta: add usb/xhci-hcd feature c724a55 meta: add usb/base feature b55b3a1 sys940x: Cleanup sys940x.scc 93f2e97 sys940x: Use PHYSICAL_START of 0x200000 to boot aaa034b sys940x: Add common standard and preempt-rt features e2b1286 sys940x: Add efi-ext to standard and preempt-rt configs d188c21 sys940x: Move emgd-1.10 data to the standard scc file 72d9369 fri2: Cleanup fri2-$KTYPE.scc files re efi-ext.scc dbcb120 fri2: Use emgd-1.10 feature and branch And the following driver fix: f39a0a9 pch_gbe: Do not abort probe on bad MAC (From OE-Core rev: 0609299880ad0aca121e7192d84f85d913c40c62) Signed-off-by: Darren Hart <dvhart@linux.intel.com> Signed-off-by: Tom Zanussi <tom.zanussi@intel.com> Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-kernel/linux/linux-yocto-rt_3.2.bb')
-rw-r--r--meta/recipes-kernel/linux/linux-yocto-rt_3.2.bb6
1 files changed, 3 insertions, 3 deletions
diff --git a/meta/recipes-kernel/linux/linux-yocto-rt_3.2.bb b/meta/recipes-kernel/linux/linux-yocto-rt_3.2.bb
index 05674ef988..7e01efbc98 100644
--- a/meta/recipes-kernel/linux/linux-yocto-rt_3.2.bb
+++ b/meta/recipes-kernel/linux/linux-yocto-rt_3.2.bb
@@ -14,9 +14,9 @@ KBRANCH_qemuppc = "standard/preempt-rt/qemu-ppc32"
14LINUX_VERSION ?= "3.2.11" 14LINUX_VERSION ?= "3.2.11"
15LINUX_KERNEL_TYPE = "preempt-rt" 15LINUX_KERNEL_TYPE = "preempt-rt"
16 16
17SRCREV_machine ?= "32ecb53e9ff759bbd297a10712b62a6575daaf86" 17SRCREV_machine ?= "3ebf4d172cf4a41d2abf09e4036f0850e08064e7"
18SRCREV_machine_qemuppc ?= "0d5625bb868cc2471d5dd49eb7abe7eb5fe1044b" 18SRCREV_machine_qemuppc ?= "7cebfe717987f4ffa9ae90558c28f45049847c1c"
19SRCREV_meta ?= "b14a08f5c7b469a5077c10942f4e1aec171faa9d" 19SRCREV_meta ?= "6b3d4e09aa2531e9649f3f03827b7efbccfcec03"
20 20
21PR = "r1" 21PR = "r1"
22PV = "${LINUX_VERSION}+git${SRCPV}" 22PV = "${LINUX_VERSION}+git${SRCPV}"