diff options
| author | Olof Johansson <olof@lixom.net> | 2016-07-05 07:49:15 +0300 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2016-07-05 07:49:15 +0300 |
| commit | 59f23b6e428bf0a17d55f96df32e71652b597131 (patch) | |
| tree | 97acb633932b2c6aa503fc5cb46875d56f738e15 | |
| parent | 208b3e2038c8eed1c0fe455a942c1a720441a241 (diff) | |
| parent | 2baf9e9ec0d2528c94f0af41ccc014f63bb3ca03 (diff) | |
| download | linux-59f23b6e428bf0a17d55f96df32e71652b597131.tar.xz | |
Merge tag 'socfpga_defconfig_updates_for_v4.8' of git://git.kernel.org/pub/scm/linux/kernel/git/dinguyen/linux into next/defconfig
SoCFPGA defconfig updates for v4.8
- enable PL330 DMA, PCIe, Touchscreen and USB Mass Storage
* tag 'socfpga_defconfig_updates_for_v4.8' of git://git.kernel.org/pub/scm/linux/kernel/git/dinguyen/linux:
ARM: socfpga: enable PL330 DMA in socfpga_defconfig
ARM: socfpga: add PCIe to socfpga_defconfig
ARM: socfpga: Update socfpga_defconfig
Signed-off-by: Olof Johansson <olof@lixom.net>
| -rw-r--r-- | arch/arm/configs/socfpga_defconfig | 16 |
1 files changed, 15 insertions, 1 deletions
diff --git a/arch/arm/configs/socfpga_defconfig b/arch/arm/configs/socfpga_defconfig index 753f1a5defc7..9f84be5b3ac5 100644 --- a/arch/arm/configs/socfpga_defconfig +++ b/arch/arm/configs/socfpga_defconfig @@ -1,5 +1,4 @@ CONFIG_SYSVIPC=y -CONFIG_FHANDLE=y CONFIG_HIGH_RES_TIMERS=y CONFIG_IKCONFIG=y CONFIG_IKCONFIG_PROC=y @@ -19,6 +18,10 @@ CONFIG_MODULE_UNLOAD=y # CONFIG_IOSCHED_CFQ is not set CONFIG_ARCH_SOCFPGA=y CONFIG_ARM_THUMBEE=y +CONFIG_PCI=y +CONFIG_PCI_MSI=y +CONFIG_PCIE_ALTERA=y +CONFIG_PCIE_ALTERA_MSI=y CONFIG_SMP=y CONFIG_NR_CPUS=2 CONFIG_AEABI=y @@ -50,15 +53,21 @@ CONFIG_DEVTMPFS_MOUNT=y CONFIG_BLK_DEV_RAM=y CONFIG_BLK_DEV_RAM_COUNT=2 CONFIG_BLK_DEV_RAM_SIZE=8192 +CONFIG_BLK_DEV_NVME=m CONFIG_SRAM=y CONFIG_SCSI=y # CONFIG_SCSI_PROC_FS is not set CONFIG_BLK_DEV_SD=y # CONFIG_SCSI_LOWLEVEL is not set CONFIG_NETDEVICES=y +CONFIG_E1000E=m +CONFIG_IGB=m +CONFIG_IXGBE=m CONFIG_STMMAC_ETH=y CONFIG_MICREL_PHY=y CONFIG_INPUT_EVDEV=y +CONFIG_INPUT_TOUCHSCREEN=y +CONFIG_TOUCHSCREEN_STMPE=y # CONFIG_SERIO_SERPORT is not set CONFIG_SERIO_AMBAKMI=y CONFIG_LEGACY_PTY_COUNT=16 @@ -78,14 +87,19 @@ CONFIG_SENSORS_LTC2978=y CONFIG_SENSORS_LTC2978_REGULATOR=y CONFIG_WATCHDOG=y CONFIG_DW_WATCHDOG=y +CONFIG_MFD_STMPE=y CONFIG_REGULATOR=y CONFIG_REGULATOR_FIXED_VOLTAGE=y CONFIG_USB=y +CONFIG_USB_STORAGE=y CONFIG_USB_DWC2=y CONFIG_NOP_USB_XCEIV=y CONFIG_USB_GADGET=y CONFIG_MMC=y CONFIG_MMC_DW=y +CONFIG_DMADEVICES=y +CONFIG_PL330_DMA=y +CONFIG_DMATEST=m CONFIG_FPGA=y CONFIG_FPGA_MGR_SOCFPGA=y CONFIG_EXT2_FS=y |