machines: Drop VC4_CMA_SIZE

setting cma is not required with latest vc4 driver

Signed-off-by: Khem Raj <raj.khem@gmail.com>

7 files changed, 1 insertions, 7 deletions

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"
diff --git a/recipes-bsp/bootfiles/rpi-config_git.bb b/recipes-bsp/bootfiles/rpi-config_git.bb
index 27a3b85..d92b8e4 100644
--- a/recipes-bsp/bootfiles/rpi-config_git.bb
+++ b/recipes-bsp/bootfiles/rpi-config_git.bb
@@ -158,7 +158,7 @@ do_deploy() {
     # VC4 Graphics support
     if [ "${VC4GRAPHICS}" = "1" ]; then
         echo "# Enable VC4 Graphics" >> ${DEPLOYDIR}/bcm2835-bootfiles/config.txt
-        echo "dtoverlay=${VC4DTBO},${VC4_CMA_SIZE}" >> ${DEPLOYDIR}/bcm2835-bootfiles/config.txt
+        echo "dtoverlay=${VC4DTBO}" >> ${DEPLOYDIR}/bcm2835-bootfiles/config.txt
     fi
 
     # Waveshare "C" 1024x600 7" Rev2.1 IPS capacitive touch (http://www.waveshare.com/7inch-HDMI-LCD-C.htm)