Commit b017e4f9 authored by Dave Stevenson's avatar Dave Stevenson Committed by Phil Elwell
Browse files

vc-cma: Remove the driver as non-functional on Pi 



vc-cma was pulled in from previous platforms. It
supposedly allowed the VPU relocatable heap to be
released to the kernel as CMA, but it was always
a little fragile.

Remove it to avoid complications.

Signed-off-by: default avatarDave Stevenson <dave.stevenson@raspberrypi.org>
parent aedca583

arch/arm/configs/bcm2709_defconfig

+0 −1
Original line number Diff line number Diff line
@@ -595,7 +595,6 @@ CONFIG_GAMEPORT=m 
CONFIG_GAMEPORT_NS558=m

CONFIG_GAMEPORT_L4=m

CONFIG_BRCM_CHAR_DRIVERS=y

CONFIG_BCM_VC_CMA=y

CONFIG_BCM_VCIO=y

CONFIG_BCM_VC_SM=y

# CONFIG_LEGACY_PTYS is not set

arch/arm/configs/bcmrpi_defconfig

+0 −1
Original line number Diff line number Diff line
@@ -591,7 +591,6 @@ CONFIG_GAMEPORT=m 
CONFIG_GAMEPORT_NS558=m

CONFIG_GAMEPORT_L4=m

CONFIG_BRCM_CHAR_DRIVERS=y

CONFIG_BCM_VC_CMA=y

CONFIG_BCM_VCIO=y

CONFIG_BCM_VC_SM=y

# CONFIG_LEGACY_PTYS is not set

drivers/char/broadcom/Kconfig

+0 −7
Original line number Diff line number Diff line
@@ -9,13 +9,6 @@ menuconfig BRCM_CHAR_DRIVERS 


if BRCM_CHAR_DRIVERS



config BCM_VC_CMA

	bool "Videocore CMA"

	depends on CMA && BCM2708_VCHIQ

	default n

        help

          Helper for videocore CMA access.



config BCM2708_VCMEM

	bool "Videocore Memory"

        default y

drivers/char/broadcom/Makefile

+0 −1
Original line number Diff line number Diff line 
obj-$(CONFIG_BCM_VC_CMA)	+= vc_cma/

obj-$(CONFIG_BCM2708_VCMEM)	+= vc_mem.o

obj-$(CONFIG_BCM_VCIO)		+= vcio.o

obj-$(CONFIG_BCM_VC_SM)         += vc_sm/

drivers/char/broadcom/vc_cma/Makefile

deleted100644 → 0
+0 −7
Original line number Diff line number Diff line 
ccflags-$(CONFIG_BCM_VC_CMA)  += -Wall -Wstrict-prototypes -Wno-trigraphs -Werror

ccflags-$(CONFIG_BCM_VC_CMA)  += -Iinclude/linux/broadcom -Idrivers/staging/vc04_services -Idrivers/staging/vc04_services/interface/vchi -Idrivers/staging/vc04_services/interface/vchiq_arm

ccflags-$(CONFIG_BCM_VC_CMA)  += -D__KERNEL__ -D__linux__



obj-$(CONFIG_BCM_VC_CMA) += vc-cma.o



vc-cma-objs := vc_cma.o