summaryrefslogtreecommitdiffstats
path: root/meta/recipes-kernel
diff options
context:
space:
mode:
authorBruce Ashfield <bruce.ashfield@windriver.com>2015-03-02 16:36:38 -0500
committerRichard Purdie <richard.purdie@linuxfoundation.org>2015-03-02 22:05:34 +0000
commitdd1d4e55c6198586eb83f7850f597fbdf69edbaf (patch)
tree2acc12e0f7dc08c575c28555aa53837901eec955 /meta/recipes-kernel
parentbf1a68e97f2069a4f66664c351d4bafd416358eb (diff)
downloadpoky-dd1d4e55c6198586eb83f7850f597fbdf69edbaf.tar.gz
linux-yocto: fix qemux86-64 config warning
During the 3.19 update a 32 bit option in the 64 bit config was missed, which results in the option being dropped (and reported as a warning): Value requested for CONFIG_PCI_GOANY not in final ".config" Requested value: "CONFIG_PCI_GOANY=y" Actual value set: "" So we split the 32bit only drivers out of the common driver include and the problem goes away. [YOCTO: 7354] (From OE-Core rev: 4dc9bde20602c7565979c7ebdea1a36c7ab3f458) 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-tiny_3.19.bb2
-rw-r--r--meta/recipes-kernel/linux/linux-yocto_3.19.bb2
2 files changed, 2 insertions, 2 deletions
diff --git a/meta/recipes-kernel/linux/linux-yocto-tiny_3.19.bb b/meta/recipes-kernel/linux/linux-yocto-tiny_3.19.bb
index dba163e006..1997e30a25 100644
--- a/meta/recipes-kernel/linux/linux-yocto-tiny_3.19.bb
+++ b/meta/recipes-kernel/linux/linux-yocto-tiny_3.19.bb
@@ -9,7 +9,7 @@ LINUX_VERSION ?= "3.19"
9KMETA = "meta" 9KMETA = "meta"
10 10
11SRCREV_machine ?= "43b9eced9ba8a57add36af07736344dcc383f711" 11SRCREV_machine ?= "43b9eced9ba8a57add36af07736344dcc383f711"
12SRCREV_meta ?= "8897ef68b30e7426bc1d39895e71fb155d694974" 12SRCREV_meta ?= "f7a81274b461d0c748964d75c24bea8574d350fb"
13 13
14PV = "${LINUX_VERSION}+git${SRCPV}" 14PV = "${LINUX_VERSION}+git${SRCPV}"
15 15
diff --git a/meta/recipes-kernel/linux/linux-yocto_3.19.bb b/meta/recipes-kernel/linux/linux-yocto_3.19.bb
index 044ee7f524..f856d19f93 100644
--- a/meta/recipes-kernel/linux/linux-yocto_3.19.bb
+++ b/meta/recipes-kernel/linux/linux-yocto_3.19.bb
@@ -19,7 +19,7 @@ SRCREV_machine_qemux86 ?= "43b9eced9ba8a57add36af07736344dcc383f711"
19SRCREV_machine_qemux86-64 ?= "43b9eced9ba8a57add36af07736344dcc383f711" 19SRCREV_machine_qemux86-64 ?= "43b9eced9ba8a57add36af07736344dcc383f711"
20SRCREV_machine_qemumips64 ?= "b7ab9d4bac55415f125c81f529dbbefb07de98ad" 20SRCREV_machine_qemumips64 ?= "b7ab9d4bac55415f125c81f529dbbefb07de98ad"
21SRCREV_machine ?= "43b9eced9ba8a57add36af07736344dcc383f711" 21SRCREV_machine ?= "43b9eced9ba8a57add36af07736344dcc383f711"
22SRCREV_meta ?= "8897ef68b30e7426bc1d39895e71fb155d694974" 22SRCREV_meta ?= "f7a81274b461d0c748964d75c24bea8574d350fb"
23 23
24SRC_URI = "git://git.yoctoproject.org/linux-yocto-3.19.git;bareclone=1;branch=${KBRANCH},${KMETA};name=machine,meta" 24SRC_URI = "git://git.yoctoproject.org/linux-yocto-3.19.git;bareclone=1;branch=${KBRANCH},${KMETA};name=machine,meta"
25 25