From: Arnd Bergmann Date: Tue, 3 Sep 2019 16:58:40 +0000 (+0200) Subject: Merge tag 'aspeed-5.4-defconfig' of git://git.kernel.org/pub/scm/linux/kernel/git... X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=597b97903543028cf6b708460b634f43762b3432;p=linux.git Merge tag 'aspeed-5.4-defconfig' of git://git./linux/kernel/git/joel/aspeed into arm/defconfig 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 --- 597b97903543028cf6b708460b634f43762b3432 diff --cc arch/arm/configs/multi_v7_defconfig index c5d37dfafe984,a731cd103abd8..69d1e5c7ed51d --- a/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