From 383ce8ea035f7bfaaa4457c33cc7f4e56b44d652 Mon Sep 17 00:00:00 2001
From: Brad Bishop <bradleyb@fuzziesquirrel.com>
Date: Fri, 30 Jun 2017 14:19:45 -0400
Subject: 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>
---
 meta-phosphor/common/recipes-kernel/linux/linux-obmc.inc            | 6 ++++++
 .../common/recipes-kernel/linux/linux-obmc/phosphor-vlan.cfg        | 1 +
 .../common/recipes-kernel/linux/linux-obmc/phosphor-vlan.scc        | 2 ++
 3 files changed, 9 insertions(+)
 create mode 100644 meta-phosphor/common/recipes-kernel/linux/linux-obmc/phosphor-vlan.cfg
 create mode 100644 meta-phosphor/common/recipes-kernel/linux/linux-obmc/phosphor-vlan.scc

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
-- 
cgit v1.2.3