diff options
author | Florian Fainelli <f.fainelli@gmail.com> | 2017-06-13 21:36:49 +0200 |
---|---|---|
committer | Florian Fainelli <f.fainelli@gmail.com> | 2017-06-13 21:36:49 +0200 |
commit | e4269eb4bebec3e42e386ceeadcb8a581936f18c (patch) | |
tree | 58edf27ff600491f8231c4b060fd01083b9bd1b9 /arch/arm | |
parent | Linux 4.12-rc1 (diff) | |
parent | ARM: bcm2835_defconfig: Enable serial & ethernet USB gadget support (diff) | |
download | linux-e4269eb4bebec3e42e386ceeadcb8a581936f18c.tar.xz linux-e4269eb4bebec3e42e386ceeadcb8a581936f18c.zip |
Merge tag 'bcm2835-defconfig-next-2017-06-12' into defconfig/next
This pull request enables USB OTG mode in the Pi 0/1 defconfig.
Signed-off-by: Florian Fainelli <f.fainelli@gmail.com>
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 |