summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndrei Gherzan <andrei@gherzan.ro>2019-09-13 12:22:19 +0100
committerAndrei Gherzan <andrei@gherzan.ro>2019-09-16 14:51:26 +0100
commit31fb767c7cf5212e4e98e776ef859d1cec11a716 (patch)
tree507dcc0b824c113e0f97daa316d34d05426ada29
parentbfa90d0cf6b219fd2d5e86d4dbf096fa6ff135f3 (diff)
downloadmeta-raspberrypi-31fb767c7cf5212e4e98e776ef859d1cec11a716.tar.gz
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 <andrei@gherzan.ro>
-rw-r--r--conf/machine/raspberrypi3-64.conf1
-rw-r--r--conf/machine/raspberrypi4-64.conf1
-rw-r--r--conf/machine/raspberrypi4.conf1
3 files changed, 0 insertions, 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 = " \
23SERIAL_CONSOLES ?= "115200;ttyS0" 23SERIAL_CONSOLES ?= "115200;ttyS0"
24 24
25UBOOT_MACHINE = "rpi_3_config" 25UBOOT_MACHINE = "rpi_3_config"
26MACHINE_FEATURES_append = " vc4graphics"
27 26
28# When u-boot is enabled we need to use the "Image" format and the "booti" 27# When u-boot is enabled we need to use the "Image" format and the "booti"
29# command to load the kernel 28# 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"
20SERIAL_CONSOLES ?= "115200;ttyS0" 20SERIAL_CONSOLES ?= "115200;ttyS0"
21 21
22UBOOT_MACHINE = "rpi_4_config" 22UBOOT_MACHINE = "rpi_4_config"
23MACHINE_FEATURES_append = " vc4graphics"
24 23
25VC4DTBO ?= "vc4-fkms-v3d" 24VC4DTBO ?= "vc4-fkms-v3d"
26 25
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"
16UBOOT_MACHINE = "rpi_4_32b_config" 16UBOOT_MACHINE = "rpi_4_32b_config"
17SERIAL_CONSOLES ?= "115200;ttyS0" 17SERIAL_CONSOLES ?= "115200;ttyS0"
18 18
19MACHINE_FEATURES_append = " vc4graphics"
20VC4DTBO ?= "vc4-fkms-v3d" 19VC4DTBO ?= "vc4-fkms-v3d"
21ARMSTUB ?= "armstub7.bin" 20ARMSTUB ?= "armstub7.bin"