2019-09-19 14:43:19 +00:00
|
|
|
From bc411a220205eeb29ed8130451c67927e88a30b9 Mon Sep 17 00:00:00 2001
|
2019-07-09 18:32:28 +00:00
|
|
|
From: Phil Elwell <phil@raspberrypi.org>
|
|
|
|
|
Date: Fri, 28 Jun 2019 22:44:09 +0100
|
2019-09-19 14:43:19 +00:00
|
|
|
Subject: [PATCH 677/806] configs: arm64/bcm2711: Remove CONFIG_VIDEO_BCM2835
|
2019-07-09 18:32:28 +00:00
|
|
|
|
|
|
|
|
Undefine CONFIG_VIDEO_BCM2835 until it builds for arm64.
|
|
|
|
|
|
|
|
|
|
See: https://github.com/raspberrypi/linux/issues/3024
|
|
|
|
|
See: https://github.com/raspberrypi/linux/pull/3030
|
|
|
|
|
|
|
|
|
|
Signed-off-by: Phil Elwell <phil@raspberrypi.org>
|
|
|
|
|
---
|
|
|
|
|
arch/arm/configs/bcm2709_defconfig | 2 +-
|
|
|
|
|
arch/arm64/configs/bcm2711_defconfig | 2 --
|
|
|
|
|
2 files changed, 1 insertion(+), 3 deletions(-)
|
|
|
|
|
|
|
|
|
|
--- a/arch/arm/configs/bcm2709_defconfig
|
|
|
|
|
+++ b/arch/arm/configs/bcm2709_defconfig
|
|
|
|
|
@@ -16,11 +16,11 @@ CONFIG_IKCONFIG=m
|
|
|
|
|
CONFIG_IKCONFIG_PROC=y
|
|
|
|
|
CONFIG_MEMCG=y
|
|
|
|
|
CONFIG_BLK_CGROUP=y
|
|
|
|
|
+CONFIG_CGROUP_PIDS=y
|
|
|
|
|
CONFIG_CGROUP_FREEZER=y
|
|
|
|
|
CONFIG_CPUSETS=y
|
|
|
|
|
CONFIG_CGROUP_DEVICE=y
|
|
|
|
|
CONFIG_CGROUP_CPUACCT=y
|
|
|
|
|
-CONFIG_CGROUP_PIDS=y
|
|
|
|
|
CONFIG_NAMESPACES=y
|
|
|
|
|
CONFIG_USER_NS=y
|
|
|
|
|
CONFIG_SCHED_AUTOGROUP=y
|
|
|
|
|
--- a/arch/arm64/configs/bcm2711_defconfig
|
|
|
|
|
+++ b/arch/arm64/configs/bcm2711_defconfig
|
|
|
|
|
@@ -1031,7 +1031,6 @@ CONFIG_USB_G_HID=m
|
|
|
|
|
CONFIG_USB_G_WEBCAM=m
|
|
|
|
|
CONFIG_MMC=y
|
|
|
|
|
CONFIG_MMC_BLOCK_MINORS=32
|
|
|
|
|
-CONFIG_MMC_SDHCI_BCM2711=y
|
|
|
|
|
CONFIG_MMC_BCM2835_MMC=y
|
|
|
|
|
CONFIG_MMC_BCM2835_DMA=y
|
|
|
|
|
CONFIG_MMC_BCM2835_SDHOST=y
|
|
|
|
|
@@ -1130,7 +1129,6 @@ CONFIG_FB_TFT_WATTEROTT=m
|
|
|
|
|
CONFIG_FB_FLEX=m
|
|
|
|
|
CONFIG_FB_TFT_FBTFT_DEVICE=m
|
|
|
|
|
CONFIG_SND_BCM2835=m
|
|
|
|
|
-CONFIG_VIDEO_BCM2835=m
|
|
|
|
|
CONFIG_MAILBOX=y
|
|
|
|
|
CONFIG_BCM2835_MBOX=y
|
|
|
|
|
# CONFIG_IOMMU_SUPPORT is not set
|
