summaryrefslogtreecommitdiff
path: root/meta-aspeed/recipes-kernel/linux
diff options
context:
space:
mode:
Diffstat (limited to 'meta-aspeed/recipes-kernel/linux')
-rw-r--r--meta-aspeed/recipes-kernel/linux/linux-aspeed/aspeed-g5/defconfig1
-rw-r--r--meta-aspeed/recipes-kernel/linux/linux-aspeed_git.bb6
2 files changed, 4 insertions, 3 deletions
diff --git a/meta-aspeed/recipes-kernel/linux/linux-aspeed/aspeed-g5/defconfig b/meta-aspeed/recipes-kernel/linux/linux-aspeed/aspeed-g5/defconfig
index e7867a34e..e194892f3 100644
--- a/meta-aspeed/recipes-kernel/linux/linux-aspeed/aspeed-g5/defconfig
+++ b/meta-aspeed/recipes-kernel/linux/linux-aspeed/aspeed-g5/defconfig
@@ -187,6 +187,7 @@ CONFIG_V4L_PLATFORM_DRIVERS=y
CONFIG_VIDEO_ASPEED=y
CONFIG_DRM=y
CONFIG_DRM_ASPEED_GFX=y
+CONFIG_FB=y
CONFIG_USB_GADGET=y
CONFIG_USB_ASPEED_VHUB=y
CONFIG_USB_CONFIGFS=y
diff --git a/meta-aspeed/recipes-kernel/linux/linux-aspeed_git.bb b/meta-aspeed/recipes-kernel/linux/linux-aspeed_git.bb
index b7d3c4587..8b25d74d7 100644
--- a/meta-aspeed/recipes-kernel/linux/linux-aspeed_git.bb
+++ b/meta-aspeed/recipes-kernel/linux/linux-aspeed_git.bb
@@ -1,6 +1,6 @@
-KBRANCH ?= "dev-5.10"
-LINUX_VERSION ?= "5.10.60"
+KBRANCH ?= "dev-5.14"
+LINUX_VERSION ?= "5.14.6"
-SRCREV="09869b9b34417297808d8a57b2e9f8f61218354b"
+SRCREV="41a83df4a3b9bd62bc508fd528c6f5a01014aede"
require linux-aspeed.inc