diff options
| author | Jason M. Bills <jason.m.bills@linux.intel.com> | 2020-05-26 22:34:40 +0300 |
|---|---|---|
| committer | Jason M. Bills <jason.m.bills@linux.intel.com> | 2020-05-26 22:34:40 +0300 |
| commit | 028c1a3663f63db3fdf4b92e6f091506c1c784f9 (patch) | |
| tree | 0b28e401de9ee2da03fde96c81a3838fbd3521a7 /meta-aspeed/recipes-kernel/linux | |
| parent | b83c9dda9eabe4c0124decec25bce46e0ae11160 (diff) | |
| parent | 83ecb75644b3d677c274188f9ac0b2374d6f6925 (diff) | |
| download | openbmc-028c1a3663f63db3fdf4b92e6f091506c1c784f9.tar.xz | |
Merge tag 'wht-0.56' of ssh://git-amr-1.devtools.intel.com:29418/openbmc-openbmc into update
Diffstat (limited to 'meta-aspeed/recipes-kernel/linux')
| -rw-r--r-- | meta-aspeed/recipes-kernel/linux/linux-aspeed/aspeed-g6/defconfig | 2 | ||||
| -rw-r--r-- | meta-aspeed/recipes-kernel/linux/linux-aspeed_git.bb | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/meta-aspeed/recipes-kernel/linux/linux-aspeed/aspeed-g6/defconfig b/meta-aspeed/recipes-kernel/linux/linux-aspeed/aspeed-g6/defconfig index a7d1d7d44..e963f3096 100644 --- a/meta-aspeed/recipes-kernel/linux/linux-aspeed/aspeed-g6/defconfig +++ b/meta-aspeed/recipes-kernel/linux/linux-aspeed/aspeed-g6/defconfig @@ -87,6 +87,7 @@ CONFIG_MTD_UBI_FASTMAP=y CONFIG_MTD_UBI_BLOCK=y CONFIG_BLK_DEV_LOOP=y CONFIG_BLK_DEV_NBD=y +CONFIG_MCTP_LPC=y CONFIG_EEPROM_AT24=y CONFIG_MD=y CONFIG_BLK_DEV_DM=y @@ -233,6 +234,7 @@ CONFIG_RTC_DRV_ASPEED=y CONFIG_ASPEED_LPC_CTRL=y CONFIG_ASPEED_LPC_SNOOP=y CONFIG_ASPEED_P2A_CTRL=y +CONFIG_SPI_FSI=y CONFIG_IIO=y CONFIG_ASPEED_ADC=y CONFIG_MAX1363=y diff --git a/meta-aspeed/recipes-kernel/linux/linux-aspeed_git.bb b/meta-aspeed/recipes-kernel/linux/linux-aspeed_git.bb index 28d939903..6b83cd241 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.4" LINUX_VERSION ?= "5.4.32" -SRCREV="2cf49560af20199920858cb91e3b7b138e54f597" +SRCREV="7dc9442bbe7d0d1512c64a97b7cc58fed2b38ba4" require linux-aspeed.inc |