diff options
author | Bruce Ashfield <bruce.ashfield@windriver.com> | 2017-02-01 10:30:33 -0500 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2017-02-05 09:22:17 +0000 |
commit | 1bb90f849e8ae6bad23c45faa40d0f6881e63872 (patch) | |
tree | e719e4d5fe414cc15b6bccf20f9fe26cb3ea3776 | |
parent | c435d12c00664848a236702e7407d0897cdbfd8f (diff) | |
download | poky-1bb90f849e8ae6bad23c45faa40d0f6881e63872.tar.gz |
kernel-yocto/meta: common-pc: add pci-siov to feature fragments
The common-pc ethernet selection has drivers that depend on pci_iov
being defined. As such, we should include that feature fragment
or we get build warnings:
---------- CONFIG_BNX2X_SRIOV -----------------
Config: CONFIG_BNX2X_SRIOV
From: work-shared/qemux86-64/kernel-source/.kernel-meta/configs/standard/bsp/common-pc/common-pc-eth.cfg
Requested value: CONFIG_BNX2X_SRIOV=y
Actual value:
Config 'BNX2X_SRIOV' has the following conditionals:
BNX2X && PCI_IOV (value: "n")
BNX2X && PCI_IOV (value: "n")
Dependency values are:
BNX2X [m] PCI_IOV [n] y [y]
---------- CONFIG_BNXT_SRIOV -----------------
Config: CONFIG_BNXT_SRIOV
From: work-shared/qemux86-64/kernel-source/.kernel-meta/configs/standard/bsp/common-pc/common-pc-eth.cfg
Requested value: CONFIG_BNXT_SRIOV=y
Actual value:
Config 'BNXT_SRIOV' has the following conditionals:
BNXT && PCI_IOV (value: "n")
BNXT && PCI_IOV (value: "n")
Dependency values are:
y [y] BNXT [m] PCI_IOV [n]
(From OE-Core rev: c08d3519c4408e8c51853ffb4b69f05fc55d2df8)
Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r-- | meta/recipes-kernel/linux/linux-yocto-rt_4.9.bb | 2 | ||||
-rw-r--r-- | meta/recipes-kernel/linux/linux-yocto-tiny_4.9.bb | 2 | ||||
-rw-r--r-- | meta/recipes-kernel/linux/linux-yocto_4.9.bb | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/meta/recipes-kernel/linux/linux-yocto-rt_4.9.bb b/meta/recipes-kernel/linux/linux-yocto-rt_4.9.bb index e85d7c7b18..155815e5df 100644 --- a/meta/recipes-kernel/linux/linux-yocto-rt_4.9.bb +++ b/meta/recipes-kernel/linux/linux-yocto-rt_4.9.bb | |||
@@ -12,7 +12,7 @@ python () { | |||
12 | } | 12 | } |
13 | 13 | ||
14 | SRCREV_machine ?= "1d5e0d6f25c65f2404c47de11bef86f3dbc7f29d" | 14 | SRCREV_machine ?= "1d5e0d6f25c65f2404c47de11bef86f3dbc7f29d" |
15 | SRCREV_meta ?= "0f58ab994909b0a15939f505458cec35a9663e5d" | 15 | SRCREV_meta ?= "20b8e96e097b796673bea982918868d47d51081b" |
16 | 16 | ||
17 | SRC_URI = "git://git.yoctoproject.org/linux-yocto-4.9.git;branch=${KBRANCH};name=machine \ | 17 | SRC_URI = "git://git.yoctoproject.org/linux-yocto-4.9.git;branch=${KBRANCH};name=machine \ |
18 | git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-4.9;destsuffix=${KMETA}" | 18 | git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-4.9;destsuffix=${KMETA}" |
diff --git a/meta/recipes-kernel/linux/linux-yocto-tiny_4.9.bb b/meta/recipes-kernel/linux/linux-yocto-tiny_4.9.bb index a052dad5d1..beb2d4de30 100644 --- a/meta/recipes-kernel/linux/linux-yocto-tiny_4.9.bb +++ b/meta/recipes-kernel/linux/linux-yocto-tiny_4.9.bb | |||
@@ -10,7 +10,7 @@ KMETA = "kernel-meta" | |||
10 | KCONF_BSP_AUDIT_LEVEL = "2" | 10 | KCONF_BSP_AUDIT_LEVEL = "2" |
11 | 11 | ||
12 | SRCREV_machine ?= "0b52a52fb892c0dd20823268830ab22a9e3a92b8" | 12 | SRCREV_machine ?= "0b52a52fb892c0dd20823268830ab22a9e3a92b8" |
13 | SRCREV_meta ?= "0f58ab994909b0a15939f505458cec35a9663e5d" | 13 | SRCREV_meta ?= "20b8e96e097b796673bea982918868d47d51081b" |
14 | 14 | ||
15 | PV = "${LINUX_VERSION}+git${SRCPV}" | 15 | PV = "${LINUX_VERSION}+git${SRCPV}" |
16 | 16 | ||
diff --git a/meta/recipes-kernel/linux/linux-yocto_4.9.bb b/meta/recipes-kernel/linux/linux-yocto_4.9.bb index a61bb137b9..241eb94f6a 100644 --- a/meta/recipes-kernel/linux/linux-yocto_4.9.bb +++ b/meta/recipes-kernel/linux/linux-yocto_4.9.bb | |||
@@ -19,7 +19,7 @@ SRCREV_machine_qemux86 ?= "0b52a52fb892c0dd20823268830ab22a9e3a92b8" | |||
19 | SRCREV_machine_qemux86-64 ?= "0b52a52fb892c0dd20823268830ab22a9e3a92b8" | 19 | SRCREV_machine_qemux86-64 ?= "0b52a52fb892c0dd20823268830ab22a9e3a92b8" |
20 | SRCREV_machine_qemumips64 ?= "06fff8284bbec52a36fb3d054354db2f593376ac" | 20 | SRCREV_machine_qemumips64 ?= "06fff8284bbec52a36fb3d054354db2f593376ac" |
21 | SRCREV_machine ?= "0b52a52fb892c0dd20823268830ab22a9e3a92b8" | 21 | SRCREV_machine ?= "0b52a52fb892c0dd20823268830ab22a9e3a92b8" |
22 | SRCREV_meta ?= "0f58ab994909b0a15939f505458cec35a9663e5d" | 22 | SRCREV_meta ?= "20b8e96e097b796673bea982918868d47d51081b" |
23 | 23 | ||
24 | SRC_URI = "git://git.yoctoproject.org/linux-yocto-4.9.git;name=machine;branch=${KBRANCH}; \ | 24 | SRC_URI = "git://git.yoctoproject.org/linux-yocto-4.9.git;name=machine;branch=${KBRANCH}; \ |
25 | git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-4.9;destsuffix=${KMETA}" | 25 | git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-4.9;destsuffix=${KMETA}" |