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 <joel@jms.id.au>
Signed-off-by: Andrew Geissler <geissonator@yahoo.com>
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 a7d1d7d..e963f30 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_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_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