diff options
| author | Olof Johansson <olof@lixom.net> | 2017-06-19 05:29:37 +0200 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2017-06-19 05:29:37 +0200 |
| commit | 29b5f29894ac75570ae30cd9e0604d350fcc3412 (patch) | |
| tree | 5527a1d98aa440071ec1a5479f18331a8b88d21b /arch/arm | |
| parent | Merge tag 'stm32-defconfig-for-v4.13-1' of git://git.kernel.org/pub/scm/linux... (diff) | |
| parent | Merge tag 'bcm2835-defconfig-next-2017-06-12' into defconfig/next (diff) | |
| download | linux-29b5f29894ac75570ae30cd9e0604d350fcc3412.tar.xz linux-29b5f29894ac75570ae30cd9e0604d350fcc3412.zip | |
Merge tag 'arm-soc/for-4.13/defconfig' of http://github.com/Broadcom/stblinux into next/defconfig
This pull request contains Broadcom ARM-based SoCs defconfig updates for 4.13,
please pull the following:
- Stefan updates the bcm2835_defconfig to include serial, Ethernet and USB
gadget support which is needed for the Raspberry Pi Zero OTG changes
* tag 'arm-soc/for-4.13/defconfig' of http://github.com/Broadcom/stblinux:
ARM: bcm2835_defconfig: Enable serial & ethernet USB gadget support
Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'arch/arm')
| -rw-r--r-- | arch/arm/configs/bcm2835_defconfig | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/arch/arm/configs/bcm2835_defconfig b/arch/arm/configs/bcm2835_defconfig index 3ba8cd3211f8..3ee9d78c412a 100644 --- a/arch/arm/configs/bcm2835_defconfig +++ b/arch/arm/configs/bcm2835_defconfig @@ -24,6 +24,8 @@ CONFIG_PROFILING=y CONFIG_OPROFILE=y CONFIG_JUMP_LABEL=y CONFIG_CC_STACKPROTECTOR_REGULAR=y +CONFIG_MODULES=y +CONFIG_MODULE_UNLOAD=y CONFIG_ARCH_MULTI_V6=y CONFIG_ARCH_BCM=y CONFIG_ARCH_BCM2835=y @@ -86,8 +88,14 @@ CONFIG_SND=y CONFIG_SND_SOC=y CONFIG_SND_BCM2835_SOC_I2S=y CONFIG_USB=y +CONFIG_USB_OTG=y CONFIG_USB_STORAGE=y CONFIG_USB_DWC2=y +CONFIG_NOP_USB_XCEIV=y +CONFIG_USB_GADGET=y +CONFIG_USB_ETH=m +CONFIG_USB_ETH_EEM=y +CONFIG_USB_G_SERIAL=m CONFIG_MMC=y CONFIG_MMC_SDHCI=y CONFIG_MMC_SDHCI_PLTFM=y |