diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2019-02-15 16:58:09 +0100 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2019-02-15 16:58:21 +0100 |
| commit | 5e26374161ac7bdd3c720f7475595f9fb36fb7d6 (patch) | |
| tree | 6a1f591ea1b514f4a5d49a2c04c75af669621037 /arch/arm/configs | |
| parent | f13c82e2e70e9883e1ff697cec0c9d815c9b887d (diff) | |
| parent | 6e2111e72e8279ebd6efcaf3e579a2afbd1dbf7a (diff) | |
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: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'arch/arm/configs')
| -rw-r--r-- | arch/arm/configs/bcm2835_defconfig | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/arch/arm/configs/bcm2835_defconfig b/arch/arm/configs/bcm2835_defconfig index bb6a35fb1dd7..bd55a2be51fc 100644 --- a/arch/arm/configs/bcm2835_defconfig +++ b/arch/arm/configs/bcm2835_defconfig @@ -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 |