summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rwxr-xr-xmeta-openbmc-bsp/meta-aspeed/meta-ast2500/recipes-kernel/linux/linux-obmc/defconfig3
-rw-r--r--meta-phosphor/common/recipes-kernel/linux/linux-obmc_4.13.bb2
2 files changed, 3 insertions, 2 deletions
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 c6b68ce6b..8b7c57c18 100755
--- 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
@@ -133,7 +133,6 @@ CONFIG_SERIAL_8250_SHARE_IRQ=y
CONFIG_SERIAL_OF_PLATFORM=y
CONFIG_ASPEED_BT_IPMI_BMC=y
CONFIG_HW_RANDOM_TIMERIOMEM=y
-CONFIG_I2C=y
# CONFIG_I2C_COMPAT is not set
CONFIG_I2C_CHARDEV=y
CONFIG_I2C_MUX=y
@@ -163,6 +162,8 @@ CONFIG_SENSORS_MAX31785=y
CONFIG_SENSORS_UCD9000=y
CONFIG_SENSORS_UCD9200=y
CONFIG_SENSORS_TMP421=y
+CONFIG_DRM=y
+CONFIG_DRM_ASPEED_GFX=y
CONFIG_USB=y
CONFIG_USB_ANNOUNCE_NEW_DEVICES=y
CONFIG_USB_DYNAMIC_MINORS=y
diff --git a/meta-phosphor/common/recipes-kernel/linux/linux-obmc_4.13.bb b/meta-phosphor/common/recipes-kernel/linux/linux-obmc_4.13.bb
index 58f248569..2d35c4a58 100644
--- a/meta-phosphor/common/recipes-kernel/linux/linux-obmc_4.13.bb
+++ b/meta-phosphor/common/recipes-kernel/linux/linux-obmc_4.13.bb
@@ -1,6 +1,6 @@
KBRANCH ?= "dev-4.13"
LINUX_VERSION ?= "4.13.16"
-SRCREV="e8b7a01a0b0f611d48cdba2471ae6fbddeed17f5"
+SRCREV="5b5a9c2d51eda4279915d72cda387dd6edfd00df"
require linux-obmc.inc
OpenPOWER on IntegriCloud