From c1d16a30258aca6eff7948fb54b05c184e8037a1 Mon Sep 17 00:00:00 2001 From: Andrei Gherzan Date: Fri, 13 Sep 2019 12:22:19 +0100 Subject: raspberrypi*.conf: Remove vc4 configuration as we already default to it As of late[1], we defaulted to enabling vc4graphics in MACHINE_FEATURES. Let's cleanup the machine configurations as per this change. [1] https://github.com/agherzan/meta-raspberrypi/pull/417 Signed-off-by: Andrei Gherzan --- conf/machine/raspberrypi3-64.conf | 1 - conf/machine/raspberrypi4-64.conf | 1 - conf/machine/raspberrypi4.conf | 1 - 3 files changed, 3 deletions(-) diff --git a/conf/machine/raspberrypi3-64.conf b/conf/machine/raspberrypi3-64.conf index 60fe8bd..23b59ed 100644 --- a/conf/machine/raspberrypi3-64.conf +++ b/conf/machine/raspberrypi3-64.conf @@ -23,7 +23,6 @@ RPI_KERNEL_DEVICETREE = " \ SERIAL_CONSOLES ?= "115200;ttyS0" UBOOT_MACHINE = "rpi_3_config" -MACHINE_FEATURES_append = " vc4graphics" # When u-boot is enabled we need to use the "Image" format and the "booti" # command to load the kernel diff --git a/conf/machine/raspberrypi4-64.conf b/conf/machine/raspberrypi4-64.conf index e308577..2bf62ef 100644 --- a/conf/machine/raspberrypi4-64.conf +++ b/conf/machine/raspberrypi4-64.conf @@ -20,7 +20,6 @@ SDIMG_KERNELIMAGE ?= "kernel8.img" SERIAL_CONSOLES ?= "115200;ttyS0" UBOOT_MACHINE = "rpi_4_config" -MACHINE_FEATURES_append = " vc4graphics" VC4DTBO ?= "vc4-fkms-v3d" diff --git a/conf/machine/raspberrypi4.conf b/conf/machine/raspberrypi4.conf index 42c765f..1bcf931 100644 --- a/conf/machine/raspberrypi4.conf +++ b/conf/machine/raspberrypi4.conf @@ -16,6 +16,5 @@ SDIMG_KERNELIMAGE ?= "kernel7l.img" UBOOT_MACHINE = "rpi_4_32b_config" SERIAL_CONSOLES ?= "115200;ttyS0" -MACHINE_FEATURES_append = " vc4graphics" VC4DTBO ?= "vc4-fkms-v3d" ARMSTUB ?= "armstub7.bin" -- cgit v1.2.3-54-g00ecf