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

Commit 5e263741 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'arm-soc/for-5.1/defconfig' of https://github.com/Broadcom/stblinux into arm/defconfig

This pull request contains Broadcom ARM-based SoCs defconfig file
updates for 5.1, please pull the following:

- Stefan enables the MMAL-based V4L2 camera driver for the Raspberry Pi
  devices

* tag 'arm-soc/for-5.1/defconfig' of https://github.com/Broadcom/stblinux

:
  ARM: bcm2835_defconfig: Enable BCM2835 MMAL-based V4L2 camera driver

Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents f13c82e2 6e2111e7
Loading
Loading
Loading
Loading
+3 −0
Original line number Diff line number Diff line
@@ -91,6 +91,8 @@ CONFIG_THERMAL=y
CONFIG_BCM2835_THERMAL=y
CONFIG_WATCHDOG=y
CONFIG_BCM2835_WDT=y
CONFIG_MEDIA_SUPPORT=y
CONFIG_MEDIA_CAMERA_SUPPORT=y
CONFIG_DRM=y
CONFIG_DRM_VC4=y
CONFIG_FB_SIMPLE=y
@@ -129,6 +131,7 @@ CONFIG_DMADEVICES=y
CONFIG_DMA_BCM2835=y
CONFIG_STAGING=y
CONFIG_SND_BCM2835=m
CONFIG_VIDEO_BCM2835=m
CONFIG_MAILBOX=y
CONFIG_BCM2835_MBOX=y
# CONFIG_IOMMU_SUPPORT is not set