summaryrefslogtreecommitdiffstats
path: root/meta-phosphor
diff options
context:
space:
mode:
authorBrad Bishop <bradleyb@fuzziesquirrel.com>2017-06-30 14:19:45 -0400
committerPatrick Williams <patrick@stwcx.xyz>2017-07-07 19:24:31 +0000
commit383ce8ea035f7bfaaa4457c33cc7f4e56b44d652 (patch)
treeb262c45da41d1d1709928729cdf81fe6e83c71b2 /meta-phosphor
parent16dceb1bac6b86577291142ff796288453307dab (diff)
downloadtalos-openbmc-383ce8ea035f7bfaaa4457c33cc7f4e56b44d652.tar.gz
talos-openbmc-383ce8ea035f7bfaaa4457c33cc7f4e56b44d652.zip
kernel: Add vlan feature
Add a vlan feature for systems that want vlan support. Resolves openbmc/openbmc#1849. Change-Id: I492bf1c75932a8a596b3440e914058d324300149 Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com>
Diffstat (limited to 'meta-phosphor')
-rw-r--r--meta-phosphor/common/recipes-kernel/linux/linux-obmc.inc6
-rw-r--r--meta-phosphor/common/recipes-kernel/linux/linux-obmc/phosphor-vlan.cfg1
-rw-r--r--meta-phosphor/common/recipes-kernel/linux/linux-obmc/phosphor-vlan.scc2
3 files changed, 9 insertions, 0 deletions
diff --git a/meta-phosphor/common/recipes-kernel/linux/linux-obmc.inc b/meta-phosphor/common/recipes-kernel/linux/linux-obmc.inc
index 78da46967..72819bf4b 100644
--- a/meta-phosphor/common/recipes-kernel/linux/linux-obmc.inc
+++ b/meta-phosphor/common/recipes-kernel/linux/linux-obmc.inc
@@ -10,6 +10,9 @@ KSRC ?= "git://github.com/openbmc/linux;protocol=git;branch=${KBRANCH}"
SRC_URI = "${KSRC}"
SRC_URI += "file://phosphor-gpio-keys.scc"
SRC_URI += "file://phosphor-gpio-keys.cfg"
+SRC_URI += "file://phosphor-vlan.scc"
+SRC_URI += "file://phosphor-vlan.cfg"
+
LINUX_VERSION_EXTENSION ?= "-${SRCREV}"
@@ -29,3 +32,6 @@ do_patch_append() {
inherit kernel
require recipes-kernel/linux/linux-yocto.inc
+
+KERNEL_FEATURES_append = " phosphor-vlan"
+KERNEL_FEATURES_remove_qemuall = " phosphor-vlan"
diff --git a/meta-phosphor/common/recipes-kernel/linux/linux-obmc/phosphor-vlan.cfg b/meta-phosphor/common/recipes-kernel/linux/linux-obmc/phosphor-vlan.cfg
new file mode 100644
index 000000000..1ea3eed08
--- /dev/null
+++ b/meta-phosphor/common/recipes-kernel/linux/linux-obmc/phosphor-vlan.cfg
@@ -0,0 +1 @@
+CONFIG_VLAN_8021Q=y
diff --git a/meta-phosphor/common/recipes-kernel/linux/linux-obmc/phosphor-vlan.scc b/meta-phosphor/common/recipes-kernel/linux/linux-obmc/phosphor-vlan.scc
new file mode 100644
index 000000000..46d3bcec8
--- /dev/null
+++ b/meta-phosphor/common/recipes-kernel/linux/linux-obmc/phosphor-vlan.scc
@@ -0,0 +1,2 @@
+define KFEATURE_DESCRIPTION "Enable VLAN support"
+kconf non-hardware phosphor-vlan.cfg
OpenPOWER on IntegriCloud