diff options
| author | Jason M. Bills <jason.m.bills@linux.intel.com> | 2021-11-04 00:19:32 +0300 |
|---|---|---|
| committer | Jason M. Bills <jason.m.bills@linux.intel.com> | 2021-11-04 00:19:32 +0300 |
| commit | 901ced0812b458fdc599fe40b0a4233d422d6df9 (patch) | |
| tree | b0918e0606da0b1925b5fc9aba5e065e0a5a2f0e /meta-aspeed | |
| parent | ffe6d597d9e3d4407cf8062b5d6505a80ce08f41 (diff) | |
| parent | 459d47e59bfb3f80542f17c7eb54ba1f6c1a44f3 (diff) | |
| download | openbmc-901ced0812b458fdc599fe40b0a4233d422d6df9.tar.xz | |
Merge tag '0.77' of ssh://git-amr-1.devtools.intel.com:29418/openbmc-openbmc into update
Diffstat (limited to 'meta-aspeed')
| -rw-r--r-- | meta-aspeed/recipes-kernel/linux/linux-aspeed/aspeed-g5/defconfig | 1 | ||||
| -rw-r--r-- | meta-aspeed/recipes-kernel/linux/linux-aspeed_git.bb | 6 |
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 |