1 From c113d9a69caa55d8b0d5bd4bfbb7fdf502565edb Mon Sep 17 00:00:00 2001
2 From: Dave Stevenson <dave.stevenson@raspberrypi.org>
3 Date: Mon, 1 Jul 2019 12:06:54 +0100
4 Subject: [PATCH 689/725] Revert "configs: arm64/bcm2711: Remove
7 This reverts commit 9d1deec93fa8b1b4953ff5e9210349f3c85b9a8d.
9 The issues are resolved, so reenable.
11 Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.org>
13 arch/arm/configs/bcm2709_defconfig | 2 +-
14 arch/arm64/configs/bcm2711_defconfig | 2 ++
15 2 files changed, 3 insertions(+), 1 deletion(-)
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
24 CONFIG_CGROUP_FREEZER=y
26 CONFIG_CGROUP_DEVICE=y
27 CONFIG_CGROUP_CPUACCT=y
31 CONFIG_SCHED_AUTOGROUP=y
32 --- a/arch/arm64/configs/bcm2711_defconfig
33 +++ b/arch/arm64/configs/bcm2711_defconfig
34 @@ -1031,6 +1031,7 @@ CONFIG_USB_G_HID=m
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,6 +1131,7 @@ CONFIG_FB_TFT_WATTEROTT=m
44 CONFIG_FB_TFT_FBTFT_DEVICE=m
46 +CONFIG_VIDEO_BCM2835=m
49 # CONFIG_IOMMU_SUPPORT is not set