diff options
| author | Florian Fainelli <f.fainelli@gmail.com> | 2019-01-31 21:04:22 -0800 |
|---|---|---|
| committer | Florian Fainelli <f.fainelli@gmail.com> | 2019-01-31 21:04:22 -0800 |
| commit | 6e2111e72e8279ebd6efcaf3e579a2afbd1dbf7a (patch) | |
| tree | f021de5228e3e514c14f0e5ea963af01089d7b55 /arch/arm/configs | |
| parent | bfeffd155283772bbe78c6a05dec7c0128ee500c (diff) | |
| parent | 24632d6b78a1929b14f32cab762a0859db7086f2 (diff) | |
| download | linux-6e2111e72e8279ebd6efcaf3e579a2afbd1dbf7a.tar.bz2 | |
Merge tag 'tags/bcm2835-defconfig-next-2018-11-27' into defconfig/next
This pull request enables the V4L2 camera driver on the Pi1 defconfig.
Signed-off-by: Florian Fainelli <f.fainelli@gmail.com>
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 |