summaryrefslogtreecommitdiffstats
path: root/meta/recipes-kernel
diff options
context:
space:
mode:
authorBruce Ashfield <bruce.ashfield@windriver.com>2012-05-04 14:40:34 (GMT)
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-06-21 10:59:33 (GMT)
commit495ea21c8ba1bec8b3a2b5db8331aa0aa479df7d (patch)
tree477b4abab92744e2984832286483c18bddb0f00c /meta/recipes-kernel
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')
-rw-r--r--meta/recipes-kernel/linux/linux-yocto-rt_3.2.bb6
-rw-r--r--meta/recipes-kernel/linux/linux-yocto-tiny_3.2.bb4
-rw-r--r--meta/recipes-kernel/linux/linux-yocto_3.2.bb14
3 files changed, 12 insertions, 12 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 05674ef..7e01efb 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}"
diff --git a/meta/recipes-kernel/linux/linux-yocto-tiny_3.2.bb b/meta/recipes-kernel/linux/linux-yocto-tiny_3.2.bb
index 4957e33..27de229 100644
--- a/meta/recipes-kernel/linux/linux-yocto-tiny_3.2.bb
+++ b/meta/recipes-kernel/linux/linux-yocto-tiny_3.2.bb
@@ -11,8 +11,8 @@ KCONFIG_MODE = "--allnoconfig"
11 11
12LINUX_VERSION ?= "3.2.11" 12LINUX_VERSION ?= "3.2.11"
13 13
14SRCREV_machine ?= "ec236058dc254183dbfb3744bf21f110c37af30b" 14SRCREV_machine ?= "61960ba8e910d54b5525d5e9b6a7469bc399c246"
15SRCREV_meta ?= "b14a08f5c7b469a5077c10942f4e1aec171faa9d" 15SRCREV_meta ?= "6b3d4e09aa2531e9649f3f03827b7efbccfcec03"
16 16
17PR = "r0" 17PR = "r0"
18PV = "${LINUX_VERSION}+git${SRCPV}" 18PV = "${LINUX_VERSION}+git${SRCPV}"
diff --git a/meta/recipes-kernel/linux/linux-yocto_3.2.bb b/meta/recipes-kernel/linux/linux-yocto_3.2.bb
index d81f6b5..51119bb 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
18LINUX_VERSION ?= "3.2.11" 18LINUX_VERSION ?= "3.2.11"
19 19
20SRCREV_machine_qemuarm ?= "dfbba772cbee84125ac1558c904a7dc181445f5f" 20SRCREV_machine_qemuarm ?= "ba47a1cc9bb6ad576b2ac7adb3036bcfa569fe2e"
21SRCREV_machine_qemumips ?= "0e0c67635b74199d534f75500e5c1654a1219bc6" 21SRCREV_machine_qemumips ?= "3b2fd654392a2f33aed12748548c04e9b169591b"
22SRCREV_machine_qemuppc ?= "92de4e2f3c6b397c8b363e079cc4d5e9bcadf877" 22SRCREV_machine_qemuppc ?= "cf3e188cf2a18c48a0e6f9ca54c36e6ac39512ec"
23SRCREV_machine_qemux86 ?= "8ada1bb97415fe959a57a08504be4eb8a656ed30" 23SRCREV_machine_qemux86 ?= "46f1007ad22b6790224c66a8dc4e80fdbd21eea1"
24SRCREV_machine_qemux86-64 ?= "4ca7e2c5d42e755e1b4c3e1478128f047a8ed2a8" 24SRCREV_machine_qemux86-64 ?= "00e5ec2393bada6723bd9a07ded3d001c02fa727"
25SRCREV_machine ?= "01e948c2bdf7f5ad9f2b30047a8d3493a1a2880a" 25SRCREV_machine ?= "f4f8ba730e7783e09413872414d0a17c142c816d"
26SRCREV_meta ?= "b14a08f5c7b469a5077c10942f4e1aec171faa9d" 26SRCREV_meta ?= "6b3d4e09aa2531e9649f3f03827b7efbccfcec03"
27 27
28PR = "r1" 28PR = "r1"
29PV = "${LINUX_VERSION}+git${SRCPV}" 29PV = "${LINUX_VERSION}+git${SRCPV}"