git.openwrt.org Git - openwrt/staging/981213.git/blob

   1 From 0e02c0b0f706a76e117298e7d4c6b730eeeed80c 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 693/703] Revert "configs: arm64/bcm2711: Remove
   5  CONFIG_VIDEO_BCM2835"
   6
   7 This reverts commit 9d1deec93fa8b1b4953ff5e9210349f3c85b9a8d.
   8
   9 The issues are resolved, so reenable.
  10
  11 Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.org>
  12 ---
  13  arch/arm/configs/bcm2709_defconfig   | 2 +-
  14  arch/arm64/configs/bcm2711_defconfig | 2 ++
  15  2 files changed, 3 insertions(+), 1 deletion(-)
  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,6 +1031,7 @@ 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,6 +1131,7 @@ 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