brcm2708: bcm2711: remove custom config file
[openwrt/openwrt.git] / target / linux / brcm2708 / patches-4.19 / 950-0678-configs-arm64-bcm2711-Remove-CONFIG_VIDEO_BCM2835.patch
1 From ebc5880578193fa828a26beaa91ffd9a90d69cd2 Mon Sep 17 00:00:00 2001
2 From: Phil Elwell <phil@raspberrypi.org>
3 Date: Fri, 28 Jun 2019 22:44:09 +0100
4 Subject: [PATCH 678/773] configs: arm64/bcm2711: Remove CONFIG_VIDEO_BCM2835
5
6 Undefine CONFIG_VIDEO_BCM2835 until it builds for arm64.
7
8 See: https://github.com/raspberrypi/linux/issues/3024
9 See: https://github.com/raspberrypi/linux/pull/3030
10
11 Signed-off-by: Phil Elwell <phil@raspberrypi.org>
12 ---
13 arch/arm/configs/bcm2709_defconfig | 2 +-
14 arch/arm64/configs/bcm2711_defconfig | 2 --
15 2 files changed, 1 insertion(+), 3 deletions(-)
16
17 --- a/arch/arm/configs/bcm2709_defconfig
18 +++ b/arch/arm/configs/bcm2709_defconfig
19 @@ -16,11 +16,11 @@ CONFIG_IKCONFIG=m
20 CONFIG_IKCONFIG_PROC=y
21 CONFIG_MEMCG=y
22 CONFIG_BLK_CGROUP=y
23 +CONFIG_CGROUP_PIDS=y
24 CONFIG_CGROUP_FREEZER=y
25 CONFIG_CPUSETS=y
26 CONFIG_CGROUP_DEVICE=y
27 CONFIG_CGROUP_CPUACCT=y
28 -CONFIG_CGROUP_PIDS=y
29 CONFIG_NAMESPACES=y
30 CONFIG_USER_NS=y
31 CONFIG_SCHED_AUTOGROUP=y
32 --- a/arch/arm64/configs/bcm2711_defconfig
33 +++ b/arch/arm64/configs/bcm2711_defconfig
34 @@ -1031,7 +1031,6 @@ CONFIG_USB_G_HID=m
35 CONFIG_USB_G_WEBCAM=m
36 CONFIG_MMC=y
37 CONFIG_MMC_BLOCK_MINORS=32
38 -CONFIG_MMC_SDHCI_BCM2711=y
39 CONFIG_MMC_BCM2835_MMC=y
40 CONFIG_MMC_BCM2835_DMA=y
41 CONFIG_MMC_BCM2835_SDHOST=y
42 @@ -1130,7 +1129,6 @@ CONFIG_FB_TFT_WATTEROTT=m
43 CONFIG_FB_FLEX=m
44 CONFIG_FB_TFT_FBTFT_DEVICE=m
45 CONFIG_SND_BCM2835=m
46 -CONFIG_VIDEO_BCM2835=m
47 CONFIG_MAILBOX=y
48 CONFIG_BCM2835_MBOX=y
49 # CONFIG_IOMMU_SUPPORT is not set