diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2015-12-15 17:53:37 +0100 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2015-12-15 17:53:50 +0100 |
| commit | 7af0d32ac43c84c6f01e8a215898ffba507596eb (patch) | |
| tree | e47043bae656f75b8f627e4274013ca508366168 /arch/arm | |
| parent | ARM: realview: add generic config options (diff) | |
| parent | arm: socfpga_defconfig: enable USB dual-role and cleanup (diff) | |
| download | linux-7af0d32ac43c84c6f01e8a215898ffba507596eb.tar.xz linux-7af0d32ac43c84c6f01e8a215898ffba507596eb.zip | |
Merge tag 'socfpga_defconfig_for_v4.5' of git://git.kernel.org/pub/scm/linux/kernel/git/dinguyen/linux into next/defconfig
Merge "SoCFPGA defconfig update for v4.5" from Dinh Nguyen:
-Enable USB OTG dual-role and some cleanup by make savedefconfig
* tag 'socfpga_defconfig_for_v4.5' of git://git.kernel.org/pub/scm/linux/kernel/git/dinguyen/linux:
arm: socfpga_defconfig: enable USB dual-role and cleanup
Diffstat (limited to 'arch/arm')
| -rw-r--r-- | arch/arm/configs/socfpga_defconfig | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/arch/arm/configs/socfpga_defconfig b/arch/arm/configs/socfpga_defconfig index 8128b93ed72c..f7f4e2e3cc33 100644 --- a/arch/arm/configs/socfpga_defconfig +++ b/arch/arm/configs/socfpga_defconfig @@ -36,7 +36,6 @@ CONFIG_IP_PNP=y CONFIG_IP_PNP_DHCP=y CONFIG_IP_PNP_BOOTP=y CONFIG_IP_PNP_RARP=y -CONFIG_IPV6=y CONFIG_NETWORK_PHY_TIMESTAMPING=y CONFIG_VLAN_8021Q=y CONFIG_VLAN_8021Q_GVRP=y @@ -57,7 +56,6 @@ CONFIG_BLK_DEV_SD=y # CONFIG_SCSI_LOWLEVEL is not set CONFIG_NETDEVICES=y CONFIG_STMMAC_ETH=y -CONFIG_DWMAC_SOCFPGA=y CONFIG_MICREL_PHY=y CONFIG_INPUT_EVDEV=y # CONFIG_SERIO_SERPORT is not set @@ -83,7 +81,8 @@ CONFIG_REGULATOR=y CONFIG_REGULATOR_FIXED_VOLTAGE=y CONFIG_USB=y CONFIG_USB_DWC2=y -CONFIG_USB_DWC2_HOST=y +CONFIG_NOP_USB_XCEIV=y +CONFIG_USB_GADGET=y CONFIG_MMC=y CONFIG_MMC_DW=y CONFIG_FPGA=y @@ -92,7 +91,6 @@ CONFIG_EXT2_FS=y CONFIG_EXT2_FS_XATTR=y CONFIG_EXT2_FS_POSIX_ACL=y CONFIG_EXT3_FS=y -CONFIG_EXT4_FS=y CONFIG_VFAT_FS=y CONFIG_NTFS_FS=y CONFIG_NTFS_RW=y |