summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--meta-openbmc-bsp/meta-aspeed/meta-ast2400/recipes-kernel/linux/linux-obmc/defconfig2
-rw-r--r--meta-openbmc-bsp/meta-aspeed/meta-ast2500/recipes-kernel/linux/linux-obmc/defconfig2
-rw-r--r--meta-phosphor/common/recipes-kernel/linux/linux-obmc_4.10.bb2
3 files changed, 5 insertions, 1 deletions
diff --git a/meta-openbmc-bsp/meta-aspeed/meta-ast2400/recipes-kernel/linux/linux-obmc/defconfig b/meta-openbmc-bsp/meta-aspeed/meta-ast2400/recipes-kernel/linux/linux-obmc/defconfig
index 2caeb0ca4..49e9370dd 100644
--- a/meta-openbmc-bsp/meta-aspeed/meta-ast2400/recipes-kernel/linux/linux-obmc/defconfig
+++ b/meta-openbmc-bsp/meta-aspeed/meta-ast2400/recipes-kernel/linux/linux-obmc/defconfig
@@ -61,6 +61,7 @@ CONFIG_INET_UDP_DIAG=y
CONFIG_NETFILTER=y
CONFIG_IP_NF_IPTABLES=y
CONFIG_IP_NF_FILTER=y
+CONFIG_VLAN_8021Q=y
CONFIG_NET_NCSI=y
# CONFIG_WIRELESS is not set
CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
@@ -150,6 +151,7 @@ CONFIG_PMBUS=y
CONFIG_SENSORS_ADM1275=y
CONFIG_SENSORS_LM25066=y
CONFIG_SENSORS_MAX31785=y
+CONFIG_SENSORS_IBM_CFFPS=y
CONFIG_SENSORS_UCD9000=y
CONFIG_SENSORS_TMP421=y
# CONFIG_HID is not set
diff --git a/meta-openbmc-bsp/meta-aspeed/meta-ast2500/recipes-kernel/linux/linux-obmc/defconfig b/meta-openbmc-bsp/meta-aspeed/meta-ast2500/recipes-kernel/linux/linux-obmc/defconfig
index 3008b6cac..10dc73146 100644
--- a/meta-openbmc-bsp/meta-aspeed/meta-ast2500/recipes-kernel/linux/linux-obmc/defconfig
+++ b/meta-openbmc-bsp/meta-aspeed/meta-ast2500/recipes-kernel/linux/linux-obmc/defconfig
@@ -53,6 +53,7 @@ CONFIG_SYN_COOKIES=y
# CONFIG_INET6_XFRM_MODE_TUNNEL is not set
# CONFIG_INET6_XFRM_MODE_BEET is not set
# CONFIG_IPV6_SIT is not set
+CONFIG_VLAN_8021Q=y
CONFIG_NET_NCSI=y
# CONFIG_WIRELESS is not set
CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
@@ -150,6 +151,7 @@ CONFIG_SENSORS_ADM1275=y
CONFIG_SENSORS_IR35221=y
CONFIG_SENSORS_LM25066=y
CONFIG_SENSORS_MAX31785=y
+CONFIG_SENSORS_IBM_CFFPS=y
CONFIG_SENSORS_UCD9000=y
CONFIG_SENSORS_UCD9200=y
CONFIG_SENSORS_TMP421=y
diff --git a/meta-phosphor/common/recipes-kernel/linux/linux-obmc_4.10.bb b/meta-phosphor/common/recipes-kernel/linux/linux-obmc_4.10.bb
index 4c042a757..9e3c04afb 100644
--- a/meta-phosphor/common/recipes-kernel/linux/linux-obmc_4.10.bb
+++ b/meta-phosphor/common/recipes-kernel/linux/linux-obmc_4.10.bb
@@ -1,6 +1,6 @@
KBRANCH ?= "dev-4.10"
LINUX_VERSION ?= "4.10.17"
-SRCREV="b8cd93f62581143a80ba5c0c61629031ce4a5240"
+SRCREV="1a4df30c39cf5ee0e3d2528c409787ccbb4a672a"
require linux-obmc.inc