From 0c14814f230e90dcb8323b5168ec881a284082d9 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Tue, 6 Nov 2018 23:22:28 -0800 Subject: machines: Drop VC4_CMA_SIZE setting cma is not required with latest vc4 driver Signed-off-by: Khem Raj --- conf/machine/raspberrypi.conf | 1 - conf/machine/raspberrypi0-wifi.conf | 1 - conf/machine/raspberrypi0.conf | 1 - conf/machine/raspberrypi2.conf | 1 - conf/machine/raspberrypi3-64.conf | 1 - conf/machine/raspberrypi3.conf | 1 - 6 files changed, 6 deletions(-) (limited to 'conf/machine') diff --git a/conf/machine/raspberrypi.conf b/conf/machine/raspberrypi.conf index 9a9133c..e94ad86 100644 --- a/conf/machine/raspberrypi.conf +++ b/conf/machine/raspberrypi.conf @@ -10,4 +10,3 @@ include conf/machine/include/rpi-base.inc SERIAL_CONSOLES ?= "115200;ttyAMA0" UBOOT_MACHINE = "rpi_config" -VC4_CMA_SIZE_raspberrypi ?= "cma-64" diff --git a/conf/machine/raspberrypi0-wifi.conf b/conf/machine/raspberrypi0-wifi.conf index 594538f..7d7f1da 100644 --- a/conf/machine/raspberrypi0-wifi.conf +++ b/conf/machine/raspberrypi0-wifi.conf @@ -14,4 +14,3 @@ MACHINE_EXTRA_RRECOMMENDS += "\ SDIMG_KERNELIMAGE ?= "kernel.img" UBOOT_MACHINE ?= "rpi_0_w_defconfig" SERIAL_CONSOLES ?= "115200;ttyS0" -VC4_CMA_SIZE ?= "cma-128" diff --git a/conf/machine/raspberrypi0.conf b/conf/machine/raspberrypi0.conf index b75fc58..80297b5 100644 --- a/conf/machine/raspberrypi0.conf +++ b/conf/machine/raspberrypi0.conf @@ -6,4 +6,3 @@ MACHINEOVERRIDES = "raspberrypi:${MACHINE}" include conf/machine/raspberrypi.conf SERIAL_CONSOLES ?= "115200;ttyAMA0" -VC4_CMA_SIZE ?= "cma-128" diff --git a/conf/machine/raspberrypi2.conf b/conf/machine/raspberrypi2.conf index a353702..bd191c3 100644 --- a/conf/machine/raspberrypi2.conf +++ b/conf/machine/raspberrypi2.conf @@ -10,4 +10,3 @@ include conf/machine/include/rpi-base.inc SERIAL_CONSOLES ?= "115200;ttyAMA0" UBOOT_MACHINE = "rpi_2_config" -VC4_CMA_SIZE ?= "cma-256" diff --git a/conf/machine/raspberrypi3-64.conf b/conf/machine/raspberrypi3-64.conf index c03f775..456373d 100644 --- a/conf/machine/raspberrypi3-64.conf +++ b/conf/machine/raspberrypi3-64.conf @@ -21,7 +21,6 @@ RPI_KERNEL_DEVICETREE = " \ " SERIAL_CONSOLES ?= "115200;ttyS0" -VC4_CMA_SIZE ?= "cma-256" UBOOT_MACHINE = "rpi_3_config" MACHINE_FEATURES_append = " vc4graphics" diff --git a/conf/machine/raspberrypi3.conf b/conf/machine/raspberrypi3.conf index e5df51a..4fcff18 100644 --- a/conf/machine/raspberrypi3.conf +++ b/conf/machine/raspberrypi3.conf @@ -16,4 +16,3 @@ MACHINE_EXTRA_RRECOMMENDS += "\ SDIMG_KERNELIMAGE ?= "kernel7.img" UBOOT_MACHINE = "rpi_3_32b_config" SERIAL_CONSOLES ?= "115200;ttyS0" -VC4_CMA_SIZE ?= "cma-256" -- cgit v1.2.3-54-g00ecf