From cb40f722f253ee1c95b3bd0963c286971ae7ee22 Mon Sep 17 00:00:00 2001 From: Joel Stanley Date: Fri, 1 May 2020 09:50:17 +0930 Subject: linux-aspeed: perf build fix, FSI attached SPI Changbin Du (1): perf: Make perf able to build with latest libbfd Eddie James (2): dt-bindings: fsi: Add FSI2SPI bindings spi: Add FSI-attached SPI controller driver Joel Stanley (1): ARM: confisgs: aspeed_g5: Sync with OpenBMC (From meta-aspeed rev: 29b354d091e668d00598d0ef05f070f73c91c0df) Change-Id: I6fe69e32f460d0aeb41fe14b4e87ef95f6cb436e Signed-off-by: Joel Stanley Signed-off-by: Andrew Geissler --- meta-aspeed/recipes-kernel/linux/linux-aspeed/aspeed-g6/defconfig | 2 ++ meta-aspeed/recipes-kernel/linux/linux-aspeed_git.bb | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) (limited to 'meta-aspeed/recipes-kernel') 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 1ecf63142..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="45dd61ebfcd1ad09f4fcad355d50e8993092e3c1" +SRCREV="7dc9442bbe7d0d1512c64a97b7cc58fed2b38ba4" require linux-aspeed.inc -- cgit v1.2.3