diff options
| author | Andrei Gherzan <andrei@gherzan.ro> | 2019-09-13 12:22:19 +0100 |
|---|---|---|
| committer | Andrei Gherzan <andrei@gherzan.ro> | 2019-09-16 14:44:39 +0100 |
| commit | c1d16a30258aca6eff7948fb54b05c184e8037a1 (patch) | |
| tree | 98ea76251ecc7ef727f60dbe2b4b2f71e740e8fe | |
| parent | 0381ac4d08abdb3dda815e6594536ac774baad8d (diff) | |
| download | meta-raspberrypi-c1d16a30258aca6eff7948fb54b05c184e8037a1.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.conf | 1 | ||||
| -rw-r--r-- | conf/machine/raspberrypi4-64.conf | 1 | ||||
| -rw-r--r-- | conf/machine/raspberrypi4.conf | 1 |
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 = " \ | |||
| 23 | SERIAL_CONSOLES ?= "115200;ttyS0" | 23 | SERIAL_CONSOLES ?= "115200;ttyS0" |
| 24 | 24 | ||
| 25 | UBOOT_MACHINE = "rpi_3_config" | 25 | UBOOT_MACHINE = "rpi_3_config" |
| 26 | MACHINE_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" | |||
| 20 | SERIAL_CONSOLES ?= "115200;ttyS0" | 20 | SERIAL_CONSOLES ?= "115200;ttyS0" |
| 21 | 21 | ||
| 22 | UBOOT_MACHINE = "rpi_4_config" | 22 | UBOOT_MACHINE = "rpi_4_config" |
| 23 | MACHINE_FEATURES_append = " vc4graphics" | ||
| 24 | 23 | ||
| 25 | VC4DTBO ?= "vc4-fkms-v3d" | 24 | VC4DTBO ?= "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" | |||
| 16 | UBOOT_MACHINE = "rpi_4_32b_config" | 16 | UBOOT_MACHINE = "rpi_4_32b_config" |
| 17 | SERIAL_CONSOLES ?= "115200;ttyS0" | 17 | SERIAL_CONSOLES ?= "115200;ttyS0" |
| 18 | 18 | ||
| 19 | MACHINE_FEATURES_append = " vc4graphics" | ||
| 20 | VC4DTBO ?= "vc4-fkms-v3d" | 19 | VC4DTBO ?= "vc4-fkms-v3d" |
| 21 | ARMSTUB ?= "armstub7.bin" | 20 | ARMSTUB ?= "armstub7.bin" |
