Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit cbf3bbeb authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'davinci-for-v4.7/defconfig' of... 

Merge tag 'davinci-for-v4.7/defconfig' of git://git.kernel.org/pub/scm/linux/kernel/git/nsekhar/linux-davinci into next/defconfig

Merge "DaVinci defconfig updates for v4.7" from Sekhar Nori:

Some defconfig updates to support systemd
based filesystems, SPI NOR and GPIO sysfs
entries.

* tag 'davinci-for-v4.7/defconfig' of git://git.kernel.org/pub/scm/linux/kernel/git/nsekhar/linux-davinci:
  ARM: davinci_all_defconfig: enable SPI and NOR as modules
  ARM: davinci_all_defconfig: support systemd
  ARM: davinci_all_defconfig: enable GPIO_SYSFS
parents a651b61b 8b182f39

arch/arm/configs/davinci_all_defconfig

+6 −1
Original line number Original line Diff line number Diff line
@@ -2,6 +2,7 @@ CONFIG_EXPERIMENTAL=y 
# CONFIG_SWAP is not set

# CONFIG_SWAP is not set

CONFIG_SYSVIPC=y

CONFIG_SYSVIPC=y

CONFIG_POSIX_MQUEUE=y

CONFIG_POSIX_MQUEUE=y

CONFIG_FHANDLE=y

CONFIG_IKCONFIG=y

CONFIG_IKCONFIG=y

CONFIG_IKCONFIG_PROC=y

CONFIG_IKCONFIG_PROC=y

CONFIG_LOG_BUF_SHIFT=14

CONFIG_LOG_BUF_SHIFT=14
@@ -70,8 +71,10 @@ CONFIG_MTD_CFI=m 
CONFIG_MTD_CFI_INTELEXT=m

CONFIG_MTD_CFI_INTELEXT=m

CONFIG_MTD_CFI_AMDSTD=m

CONFIG_MTD_CFI_AMDSTD=m

CONFIG_MTD_PHYSMAP=m

CONFIG_MTD_PHYSMAP=m

CONFIG_MTD_M25P80=m

CONFIG_MTD_NAND=m

CONFIG_MTD_NAND=m

CONFIG_MTD_NAND_DAVINCI=m

CONFIG_MTD_NAND_DAVINCI=m

CONFIG_MTD_SPI_NOR=m

CONFIG_PROC_DEVICETREE=y

CONFIG_PROC_DEVICETREE=y

CONFIG_BLK_DEV_LOOP=m

CONFIG_BLK_DEV_LOOP=m

CONFIG_BLK_DEV_RAM=y

CONFIG_BLK_DEV_RAM=y
@@ -117,7 +120,10 @@ CONFIG_SERIAL_OF_PLATFORM=y 
CONFIG_I2C=y

CONFIG_I2C=y

CONFIG_I2C_CHARDEV=y

CONFIG_I2C_CHARDEV=y

CONFIG_I2C_DAVINCI=y

CONFIG_I2C_DAVINCI=y

CONFIG_SPI=y

CONFIG_SPI_DAVINCI=m

CONFIG_PINCTRL_SINGLE=y

CONFIG_PINCTRL_SINGLE=y

CONFIG_GPIO_SYSFS=y

CONFIG_GPIO_PCF857X=y

CONFIG_GPIO_PCF857X=y

CONFIG_WATCHDOG=y

CONFIG_WATCHDOG=y

CONFIG_DAVINCI_WATCHDOG=m

CONFIG_DAVINCI_WATCHDOG=m
@@ -187,7 +193,6 @@ CONFIG_TI_EDMA=y 
CONFIG_EXT2_FS=y

CONFIG_EXT2_FS=y

CONFIG_EXT3_FS=y

CONFIG_EXT3_FS=y

CONFIG_XFS_FS=m

CONFIG_XFS_FS=m

CONFIG_INOTIFY=y

CONFIG_AUTOFS4_FS=m

CONFIG_AUTOFS4_FS=m

CONFIG_MSDOS_FS=y

CONFIG_MSDOS_FS=y

CONFIG_VFAT_FS=y

CONFIG_VFAT_FS=y