From 85521d71312d95503e78e3470267cbd4d7a6ecfa Mon Sep 17 00:00:00 2001 From: Brad Bishop Date: Tue, 17 Sep 2019 07:33:03 -0400 Subject: meta-raspberrypi: subtree update:0381ac4d08..d34e054d51 Andrei Gherzan (3): raspberrypi*.conf: Remove vc4 configuration as we already default to it rpi-base.inc: Introduce DISABLE_VC4GRAPHICS extra-build-config.md: Document DISABLE_VC4GRAPHICS Change-Id: I0ceff4ab1c573b0a1f9f3b5dfaa4b1ad03514984 Signed-off-by: Brad Bishop --- meta-raspberrypi/conf/machine/include/rpi-base.inc | 2 +- meta-raspberrypi/conf/machine/raspberrypi3-64.conf | 1 - meta-raspberrypi/conf/machine/raspberrypi4-64.conf | 1 - meta-raspberrypi/conf/machine/raspberrypi4.conf | 1 - meta-raspberrypi/docs/extra-build-config.md | 4 ++++ 5 files changed, 5 insertions(+), 4 deletions(-) (limited to 'meta-raspberrypi') diff --git a/meta-raspberrypi/conf/machine/include/rpi-base.inc b/meta-raspberrypi/conf/machine/include/rpi-base.inc index af1418df5..36a8daf1a 100644 --- a/meta-raspberrypi/conf/machine/include/rpi-base.inc +++ b/meta-raspberrypi/conf/machine/include/rpi-base.inc @@ -70,7 +70,7 @@ KERNEL_IMAGETYPE_DIRECT ??= "zImage" KERNEL_IMAGETYPE ?= "${@bb.utils.contains('RPI_USE_U_BOOT', '1', \ '${KERNEL_IMAGETYPE_UBOOT}', '${KERNEL_IMAGETYPE_DIRECT}', d)}" -MACHINE_FEATURES += "apm usbhost keyboard vfat ext2 screen touchscreen alsa bluetooth wifi sdio vc4graphics" +MACHINE_FEATURES += "apm usbhost keyboard vfat ext2 screen touchscreen alsa bluetooth wifi sdio ${@bb.utils.contains('DISABLE_VC4GRAPHICS', '1', '', 'vc4graphics', d)}" # Raspberry Pi has no hardware clock MACHINE_FEATURES_BACKFILL_CONSIDERED = "rtc" diff --git a/meta-raspberrypi/conf/machine/raspberrypi3-64.conf b/meta-raspberrypi/conf/machine/raspberrypi3-64.conf index 60fe8bd81..23b59ed95 100644 --- a/meta-raspberrypi/conf/machine/raspberrypi3-64.conf +++ b/meta-raspberrypi/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/meta-raspberrypi/conf/machine/raspberrypi4-64.conf b/meta-raspberrypi/conf/machine/raspberrypi4-64.conf index e30857704..2bf62ef2b 100644 --- a/meta-raspberrypi/conf/machine/raspberrypi4-64.conf +++ b/meta-raspberrypi/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/meta-raspberrypi/conf/machine/raspberrypi4.conf b/meta-raspberrypi/conf/machine/raspberrypi4.conf index 42c765f8f..1bcf9311d 100644 --- a/meta-raspberrypi/conf/machine/raspberrypi4.conf +++ b/meta-raspberrypi/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" diff --git a/meta-raspberrypi/docs/extra-build-config.md b/meta-raspberrypi/docs/extra-build-config.md index 426423a3a..1f7ef68bf 100644 --- a/meta-raspberrypi/docs/extra-build-config.md +++ b/meta-raspberrypi/docs/extra-build-config.md @@ -31,6 +31,10 @@ Accommodate the values above to your own needs (ex: ext3 / ext4). See: +## VC4 + +By default, each machine uses `vc4` for graphics. This will in turn sets mesa as provider for `gl` libraries. `DISABLE_VC4GRAPHICS` can be set to `1` to disable this behaviour falling back to using `userland`. Be aware that `userland` has not support for 64-bit arch. If you disable `vc4` on a 64-bit Raspberry Pi machine, expect build breakage. + ## Add purchased license codecs To add you own licenses use variables `KEY_DECODE_MPG2` and `KEY_DECODE_WVC1` in -- cgit v1.2.3