diff options
author | Bruce Ashfield <bruce.ashfield@windriver.com> | 2012-05-04 10:40:34 -0400 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2012-05-08 16:06:42 +0100 |
commit | 6636f840d42bf36a7e8b02aa548622a868affb2b (patch) | |
tree | 8eaff218447817a42ae47efef0c8cdc132fffaa3 /meta/recipes-kernel/linux/linux-yocto_3.2.bb | |
parent | 38467c458fdca97a5b0f2aa91de96f81330dc8de (diff) | |
download | poky-6636f840d42bf36a7e8b02aa548622a868affb2b.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: 612047a20ca400b932ccc634ddb759460d69fdce)
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_3.2.bb')
-rw-r--r-- | meta/recipes-kernel/linux/linux-yocto_3.2.bb | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/meta/recipes-kernel/linux/linux-yocto_3.2.bb b/meta/recipes-kernel/linux/linux-yocto_3.2.bb index d81f6b5516..51119bb201 100644 --- a/meta/recipes-kernel/linux/linux-yocto_3.2.bb +++ b/meta/recipes-kernel/linux/linux-yocto_3.2.bb | |||
@@ -17,13 +17,13 @@ KBRANCH_qemuarm = "standard/default/arm-versatile-926ejs" | |||
17 | 17 | ||
18 | LINUX_VERSION ?= "3.2.11" | 18 | LINUX_VERSION ?= "3.2.11" |
19 | 19 | ||
20 | SRCREV_machine_qemuarm ?= "dfbba772cbee84125ac1558c904a7dc181445f5f" | 20 | SRCREV_machine_qemuarm ?= "ba47a1cc9bb6ad576b2ac7adb3036bcfa569fe2e" |
21 | SRCREV_machine_qemumips ?= "0e0c67635b74199d534f75500e5c1654a1219bc6" | 21 | SRCREV_machine_qemumips ?= "3b2fd654392a2f33aed12748548c04e9b169591b" |
22 | SRCREV_machine_qemuppc ?= "92de4e2f3c6b397c8b363e079cc4d5e9bcadf877" | 22 | SRCREV_machine_qemuppc ?= "cf3e188cf2a18c48a0e6f9ca54c36e6ac39512ec" |
23 | SRCREV_machine_qemux86 ?= "8ada1bb97415fe959a57a08504be4eb8a656ed30" | 23 | SRCREV_machine_qemux86 ?= "46f1007ad22b6790224c66a8dc4e80fdbd21eea1" |
24 | SRCREV_machine_qemux86-64 ?= "4ca7e2c5d42e755e1b4c3e1478128f047a8ed2a8" | 24 | SRCREV_machine_qemux86-64 ?= "00e5ec2393bada6723bd9a07ded3d001c02fa727" |
25 | SRCREV_machine ?= "01e948c2bdf7f5ad9f2b30047a8d3493a1a2880a" | 25 | SRCREV_machine ?= "f4f8ba730e7783e09413872414d0a17c142c816d" |
26 | SRCREV_meta ?= "b14a08f5c7b469a5077c10942f4e1aec171faa9d" | 26 | SRCREV_meta ?= "6b3d4e09aa2531e9649f3f03827b7efbccfcec03" |
27 | 27 | ||
28 | PR = "r1" | 28 | PR = "r1" |
29 | PV = "${LINUX_VERSION}+git${SRCPV}" | 29 | PV = "${LINUX_VERSION}+git${SRCPV}" |