summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBruce Ashfield <bruce.ashfield@windriver.com>2012-10-19 14:54:30 -0400
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-11-20 15:31:50 +0000
commitcd838e8e8ac7e368e00a4f754f23eee1293241cf (patch)
treea261552d0772da298d12124ca57e73f943b9dfa3
parentc6c0809aa658bb1c68863a720dd119fa959c2afa (diff)
downloadpoky-cd838e8e8ac7e368e00a4f754f23eee1293241cf.tar.gz
linux-yocto/3.4: nfsd, pci, fishriver and rangely config changes
Updating the 3.4 meta branch with the following configuration changes and additions: 0541ba5 meta: Rangeley Machine Created 9e3bdb7 meta: Add nfsd kernel features da9b37d CrystalForest: Enable PCI extended config space for CrystalForest Machine. 628cbe9 meta: Add a new feature for PCI devices. 9c3a2b3 meta: fishriver: remove meta-data (From OE-Core rev: c11bf4359697f654ff38a32bda5eae71b097d3b8) Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-kernel/linux/linux-yocto-rt_3.4.bb2
-rw-r--r--meta/recipes-kernel/linux/linux-yocto-tiny_3.4.bb2
-rw-r--r--meta/recipes-kernel/linux/linux-yocto_3.4.bb2
3 files changed, 3 insertions, 3 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 91dc54fa02..bbac3221fb 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 ?= "5705c8037d2c47938034ead87c70ae3ebef552f7" 11SRCREV_machine ?= "5705c8037d2c47938034ead87c70ae3ebef552f7"
12SRCREV_machine_qemuppc ?= "c8b651aab5d2d5c0839cdedc0c0ec5dc09cf47c0" 12SRCREV_machine_qemuppc ?= "c8b651aab5d2d5c0839cdedc0c0ec5dc09cf47c0"
13SRCREV_meta ?= "a201268353c030d9fafe00f2041976f7437d9386" 13SRCREV_meta ?= "0541ba5f98f31419e9bdfec895c18029bf424e7c"
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-tiny_3.4.bb b/meta/recipes-kernel/linux/linux-yocto-tiny_3.4.bb
index 60b877f7ea..e1d349d6ff 100644
--- a/meta/recipes-kernel/linux/linux-yocto-tiny_3.4.bb
+++ b/meta/recipes-kernel/linux/linux-yocto-tiny_3.4.bb
@@ -13,7 +13,7 @@ LINUX_VERSION ?= "3.4.11"
13KMETA = "meta" 13KMETA = "meta"
14 14
15SRCREV_machine ?= "449f7f520350700858f21a5554b81cc8ad23267d" 15SRCREV_machine ?= "449f7f520350700858f21a5554b81cc8ad23267d"
16SRCREV_meta ?= "a201268353c030d9fafe00f2041976f7437d9386" 16SRCREV_meta ?= "0541ba5f98f31419e9bdfec895c18029bf424e7c"
17 17
18 18
19PR = "${INC_PR}.0" 19PR = "${INC_PR}.0"
diff --git a/meta/recipes-kernel/linux/linux-yocto_3.4.bb b/meta/recipes-kernel/linux/linux-yocto_3.4.bb
index 3383147a9d..904e79e0b1 100644
--- a/meta/recipes-kernel/linux/linux-yocto_3.4.bb
+++ b/meta/recipes-kernel/linux/linux-yocto_3.4.bb
@@ -9,7 +9,7 @@ SRCREV_machine_qemuppc ?= "7833f1549c3d44cce8aea38b65cd501229aad492"
9SRCREV_machine_qemux86 ?= "449f7f520350700858f21a5554b81cc8ad23267d" 9SRCREV_machine_qemux86 ?= "449f7f520350700858f21a5554b81cc8ad23267d"
10SRCREV_machine_qemux86-64 ?= "449f7f520350700858f21a5554b81cc8ad23267d" 10SRCREV_machine_qemux86-64 ?= "449f7f520350700858f21a5554b81cc8ad23267d"
11SRCREV_machine ?= "449f7f520350700858f21a5554b81cc8ad23267d" 11SRCREV_machine ?= "449f7f520350700858f21a5554b81cc8ad23267d"
12SRCREV_meta ?= "a201268353c030d9fafe00f2041976f7437d9386" 12SRCREV_meta ?= "0541ba5f98f31419e9bdfec895c18029bf424e7c"
13 13
14SRC_URI = "git://git.yoctoproject.org/linux-yocto-3.4.git;protocol=git;nocheckout=1;branch=${KBRANCH},meta;name=machine,meta" 14SRC_URI = "git://git.yoctoproject.org/linux-yocto-3.4.git;protocol=git;nocheckout=1;branch=${KBRANCH},meta;name=machine,meta"
15 15