diff options
| author | Olof Johansson <olof@lixom.net> | 2018-01-04 23:07:10 -0800 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2018-01-04 23:07:10 -0800 |
| commit | 34c1baec7d013e2a4166fc20a8a7d8ba260969fa (patch) | |
| tree | 917b6a3b4ed515182e3bd815c89cf0311913b1dd /arch/arm/configs/omap2plus_defconfig | |
| parent | dcd47b0d902f8cf0e6e1e68e6385455acdc0457e (diff) | |
| parent | d03366dcbffcc3754f9f8a1d8ae74f438312e07d (diff) | |
Merge tag 'omap-for-v4.16/defconfig-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into next/soc
Two defconfig updates for omaps
These are to configure dra7 PCIe for omap2plus_defconfig and
multi_v7_defconfig.
* tag 'omap-for-v4.16/defconfig-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap:
ARM: multi_v7_defconfig: Enable CONFIG_PCI_DRA7XX (Host & Device modes)
ARM: omap2plus_defconfig: Enable CONFIG_PCI_DRA7XX (Host & Device modes)
Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'arch/arm/configs/omap2plus_defconfig')
| -rw-r--r-- | arch/arm/configs/omap2plus_defconfig | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/arch/arm/configs/omap2plus_defconfig b/arch/arm/configs/omap2plus_defconfig index 20f3a6963fc7..2f145c4af93a 100644 --- a/arch/arm/configs/omap2plus_defconfig +++ b/arch/arm/configs/omap2plus_defconfig @@ -48,6 +48,13 @@ CONFIG_SOC_AM43XX=y CONFIG_SOC_DRA7XX=y CONFIG_ARM_THUMBEE=y CONFIG_ARM_ERRATA_411920=y +CONFIG_PCI=y +CONFIG_PCI_MSI=y +CONFIG_PCI_DRA7XX=y +CONFIG_PCI_DRA7XX_EP=y +CONFIG_PCI_ENDPOINT=y +CONFIG_PCI_ENDPOINT_CONFIGFS=y +CONFIG_PCI_EPF_TEST=m CONFIG_SMP=y CONFIG_NR_CPUS=2 CONFIG_CMA=y @@ -137,6 +144,7 @@ CONFIG_BLK_DEV_RAM=y CONFIG_BLK_DEV_RAM_SIZE=16384 CONFIG_SENSORS_TSL2550=m CONFIG_SRAM=y +CONFIG_PCI_ENDPOINT_TEST=m CONFIG_EEPROM_AT24=m CONFIG_BLK_DEV_SD=y CONFIG_SCSI_SCAN_ASYNC=y |