Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Unverified Commit e4269eb4 authored by Florian Fainelli's avatar Florian Fainelli
Browse files

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: default avatarFlorian Fainelli <f.fainelli@gmail.com>
parents 2ea659a9 3e9aaaf1

arch/arm/configs/bcm2835_defconfig

+8 −0
Original line number Diff line number Diff line
@@ -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