summaryrefslogtreecommitdiffstats
path: root/arch/arm
diff options
context:
space:
mode:
authorLinus Walleij <linus.walleij@linaro.org>2018-03-09 14:28:07 +0100
committerLinus Walleij <linus.walleij@linaro.org>2018-03-20 02:06:54 +0100
commitcf8518f27b6ce244dfd3f4d0f378041e0ecd516d (patch)
tree4c8d70092719d121563bf22706680a9a10d521b3 /arch/arm
parente2fc5248598747a5dd70faa07c375167828fc5d3 (diff)
downloadlinux-cf8518f27b6ce244dfd3f4d0f378041e0ecd516d.tar.bz2
ARM: defconfig: Update Versatile defconfig
This updates the Versatile defconfig to the latest savedefconfig results reflecting changes in Kconfig. We add in the Flash memory support that has been available upstream for a while now. Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
Diffstat (limited to 'arch/arm')
-rw-r--r--arch/arm/configs/versatile_defconfig5
1 files changed, 2 insertions, 3 deletions
diff --git a/arch/arm/configs/versatile_defconfig b/arch/arm/configs/versatile_defconfig
index 295408ea9dc7..6a3e5774247e 100644
--- a/arch/arm/configs/versatile_defconfig
+++ b/arch/arm/configs/versatile_defconfig
@@ -32,7 +32,9 @@ CONFIG_MTD_BLOCK=y
CONFIG_MTD_CFI=y
CONFIG_MTD_CFI_ADV_OPTIONS=y
CONFIG_MTD_CFI_INTELEXT=y
+CONFIG_MTD_CFI_AMDSTD=y
CONFIG_MTD_PHYSMAP=y
+CONFIG_MTD_PHYSMAP_OF=y
CONFIG_BLK_DEV_RAM=y
CONFIG_EEPROM_LEGACY=m
CONFIG_NETDEVICES=y
@@ -54,14 +56,11 @@ CONFIG_SPI=y
CONFIG_GPIOLIB=y
CONFIG_GPIO_PL061=y
# CONFIG_HWMON is not set
-CONFIG_MFD_SYSCON=y
CONFIG_FB=y
CONFIG_FB_ARMCLCD=y
CONFIG_FRAMEBUFFER_CONSOLE=y
CONFIG_SOUND=y
CONFIG_SND=m
-CONFIG_SND_MIXER_OSS=m
-CONFIG_SND_PCM_OSS=m
CONFIG_SND_ARMAACI=m
CONFIG_MMC=y
CONFIG_MMC_ARMMMCI=y