Commit da4a95d2 authored by Arnd Bergmann's avatar Arnd Bergmann

Merge tag 'mvebu-defconfig64-4.7-1' of git://git.infradead.org/linux-mvebu into next/arm64

Merge "mvebu defconfig for arm64 for 4.7" from Gregory CLEMENT:

- update arm64 defconfig with options useful for Armada 7K/8K support

* tag 'mvebu-defconfig64-4.7-1' of git://git.infradead.org/linux-mvebu:
  arm64: configs: add options useful for Armada 7K/8K support
parents 6d5853ff e5d8b0ad
...@@ -96,6 +96,9 @@ CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" ...@@ -96,6 +96,9 @@ CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
CONFIG_DEVTMPFS=y CONFIG_DEVTMPFS=y
CONFIG_DEVTMPFS_MOUNT=y CONFIG_DEVTMPFS_MOUNT=y
CONFIG_DMA_CMA=y CONFIG_DMA_CMA=y
CONFIG_MTD=y
CONFIG_MTD_M25P80=y
CONFIG_MTD_SPI_NOR=y
CONFIG_BLK_DEV_LOOP=y CONFIG_BLK_DEV_LOOP=y
CONFIG_VIRTIO_BLK=y CONFIG_VIRTIO_BLK=y
# CONFIG_SCSI_PROC_FS is not set # CONFIG_SCSI_PROC_FS is not set
...@@ -176,6 +179,7 @@ CONFIG_I2C_TEGRA=y ...@@ -176,6 +179,7 @@ CONFIG_I2C_TEGRA=y
CONFIG_I2C_UNIPHIER_F=y CONFIG_I2C_UNIPHIER_F=y
CONFIG_I2C_RCAR=y CONFIG_I2C_RCAR=y
CONFIG_SPI=y CONFIG_SPI=y
CONFIG_SPI_ORION=y
CONFIG_SPI_PL022=y CONFIG_SPI_PL022=y
CONFIG_SPI_QUP=y CONFIG_SPI_QUP=y
CONFIG_SPI_SPIDEV=m CONFIG_SPI_SPIDEV=m
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment