p71924506
/
linux_old1
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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
 -----BEGIN PGP SIGNATURE-----
 
 iQIcBAABCAAGBQJZQELuAAoJEIfQlpxEBwcEEW8QANbI7WER6VDeurH4kPXFOwOg
 qHyPHgFF/bvtz8lqlTXSGBVoRLjKeAT8YD2zNJiznJQyuiWntP+o6ODzYQshZwHI
 LruN60SsVgAUaZ991UXHiflfW0Ffubfxd+fAL3NjCUSgKOTj720cLu454KNJhiSH
 A1v0J8JDf46+ZS4cPzco8PdwahDozWjyiWxvgIm+CUCqJGm4p2SVdrwrXRVKUPLl
 pA4tFdc7pfy1OiHJSK/EL3PxL+xLROPtyRMLT5T0ecIzWVa8+SRA9URMAOuFxnPX
 8n1uTdw3ySh9KusUxJjTvzjkRgTJY999Ba5KB9uedngjKwJdzx3KCCasPyIm4wqa
 ihYMhh1CaDp02Ky2iH/uVh0GmkA2gABT00kGRxzCXlzn8CffYGfyE9dfY+ljh26v
 Lgu+Fw9yrQOr51J2ONkVCshql1e1uBm+MKc7kIBy6Br2BJfr2z5h1+rAbZiW5RT7
 Nb96rXj7rNdKO6rWH5++BJGQMwOcYEuOZ2cogBv1eyjPcN+4z8pCHbTaWfsFqS8R
 +5pZHchX8o/LTGWGAJfHteXSTZZdfI4iAF0LCUcn+IAS8VgVw0q+zH7hXsjZh4ih
 B301blw/7XjeyaF12dmEu2KTgVKz2DOC5MBasrN2RfKrV+ddd9gBGwAfT0T64qKF
 QzR0M4dZVg/4OGum5By2
 =7EnZ
 -----END PGP SIGNATURE-----

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>
This commit is contained in:
Olof Johansson 2017-06-18 20:29:37 -07:00
parent 35a0a5545d e4269eb4be
commit 29b5f29894
1 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
arch/arm/configs/bcm2835_defconfig
View File

@ -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