Merge tag 'aspeed-5.4-defconfig' of git://git.kernel.org/pub/scm/linux/kernel/git...

ASPEED defconfig updates for 5.4

 - Enable the new AST2600 in multi_v7 and the aspeed_g5 configs.

 - Regenerate defconfigs to drop old options

 - Clean up network options

* tag 'aspeed-5.4-defconfig' of git://git.kernel.org/pub/scm/linux/kernel/git/joel/aspeed:
  ARM: configs: aspeed_g5: Enable AST2600
  ARM: configs: multi_v7: Add ASPEED G6
  ARM: configs: aspeed: Refresh defconfigs
  ARM: configs: aspeed: Enable commonly used network functionality

Link: https://lore.kernel.org/r/CACPK8XdyWzghA0QPDzA_MK5FYwhT5afqDJHNdhc8mfD2uk8MfQ@mail.gmail.com
Signed-off-by: Arnd Bergmann <[email protected]>

diff --cc arch/arm/configs/multi_v7_defconfig
index c5d37dfafe9844710c9b9494e4b1588c69ecce68,a731cd103abd8c0c6cf169bf5f6a475af1ec0777..69d1e5c7ed51d58eb669da47309e0aee0abc7b27
--- 1/arch/arm/configs/multi_v7_defconfig
--- 2/arch/arm/configs/multi_v7_defconfig
+++ b/arch/arm/configs/multi_v7_defconfig
@@@ -197,8 -199,8 +199,9 @@@ CONFIG_MTD_NAND_GPMI_NAND=
  CONFIG_MTD_NAND_BRCMNAND=y
  CONFIG_MTD_NAND_VF610_NFC=y
  CONFIG_MTD_NAND_DAVINCI=y
 +CONFIG_MTD_NAND_STM32_FMC2=y
  CONFIG_MTD_SPI_NOR=y
+ CONFIG_SPI_ASPEED_SMC=m
  CONFIG_MTD_UBI=y
  CONFIG_BLK_DEV_LOOP=y
  CONFIG_BLK_DEV_RAM=y