diff options
| author | Olof Johansson <olof@lixom.net> | 2013-06-15 04:28:25 +0400 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2013-06-15 04:28:25 +0400 |
| commit | 878384285ce3cdddf12ba3cf69966697c4ff3c7c (patch) | |
| tree | 7f668af0d4dcd52abf829089ad5f370ff1a72007 | |
| parent | 54e706ec62b7b555514d1a9c9f7df5224a26feaa (diff) | |
| parent | d69626d8913ceeacaa2cd369a2487c85f818fef1 (diff) | |
| download | linux-878384285ce3cdddf12ba3cf69966697c4ff3c7c.tar.xz | |
Merge tag 'renesas-defconfig2-for-v3.11' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas into next/boards
From Simon Horman:
Second Round of Renesas ARM based SoC defconfig updates for v3.11
* Changes by Morimoto-san to enable MMCIF, M25P80 and RTC RX8581 for the
bockw board
* tag 'renesas-defconfig2-for-v3.11' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas:
ARM: shmobile: bockw defconfig: add MMCIF support
ARM: shmobile: bockw defconfig: add M25P80 support
ARM: shmobile: bockw defconfig: add RTC RX8581 support
Signed-off-by: Olof Johansson <olof@lixom.net>
| -rw-r--r-- | arch/arm/configs/bockw_defconfig | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/arch/arm/configs/bockw_defconfig b/arch/arm/configs/bockw_defconfig index d662608693f2..845f5cdf62b5 100644 --- a/arch/arm/configs/bockw_defconfig +++ b/arch/arm/configs/bockw_defconfig @@ -49,6 +49,12 @@ CONFIG_DEVTMPFS_MOUNT=y # CONFIG_STANDALONE is not set # CONFIG_PREVENT_FIRMWARE_BUILD is not set # CONFIG_FW_LOADER is not set +CONFIG_MTD=y +CONFIG_MTD_CHAR=y +CONFIG_MTD_BLOCK=y +CONFIG_MTD_CFI=y +CONFIG_MTD_CFI_AMDSTD=y +CONFIG_MTD_M25P80=y CONFIG_SCSI=y CONFIG_BLK_DEV_SD=y CONFIG_NETDEVICES=y @@ -76,6 +82,8 @@ CONFIG_SERIAL_SH_SCI_CONSOLE=y # CONFIG_HWMON is not set CONFIG_I2C=y CONFIG_I2C_RCAR=y +CONFIG_SPI=y +CONFIG_SPI_SH_HSPI=y CONFIG_USB=y CONFIG_USB_ANNOUNCE_NEW_DEVICES=y CONFIG_USB_EHCI_HCD=y @@ -86,6 +94,9 @@ CONFIG_USB_STORAGE=y CONFIG_USB_RCAR_PHY=y CONFIG_MMC=y CONFIG_MMC_SDHI=y +CONFIG_MMC_SH_MMCIF=y +CONFIG_RTC_CLASS=y +CONFIG_RTC_DRV_RX8581=y CONFIG_UIO=y CONFIG_UIO_PDRV_GENIRQ=y # CONFIG_IOMMU_SUPPORT is not set |