diff options
Diffstat (limited to 'import-layers/meta-raspberrypi/conf/machine/include')
3 files changed, 30 insertions, 25 deletions
diff --git a/import-layers/meta-raspberrypi/conf/machine/include/rpi-base.inc b/import-layers/meta-raspberrypi/conf/machine/include/rpi-base.inc index 56ca83e1e..e069e7039 100644 --- a/import-layers/meta-raspberrypi/conf/machine/include/rpi-base.inc +++ b/import-layers/meta-raspberrypi/conf/machine/include/rpi-base.inc @@ -9,34 +9,35 @@ IMAGE_FSTYPES ?= "tar.bz2 ext3 rpi-sdimg" XSERVER = " \ xserver-xorg \ - xf86-input-evdev \ - xf86-input-mouse \ - xf86-input-keyboard \ - xf86-video-fbdev \ + ${@bb.utils.contains("MACHINE_FEATURES", "vc4graphics", "xserver-xorg-extension-glx", "", d)} \ + ${@bb.utils.contains("MACHINE_FEATURES", "vc4graphics", "xf86-video-modesetting", "xf86-video-fbdev", d)} \ " -# Really supported starting from linux-raspberrypi 3.18.y only KERNEL_DEVICETREE ?= " \ bcm2708-rpi-b.dtb \ bcm2708-rpi-b-plus.dtb \ bcm2709-rpi-2-b.dtb \ bcm2710-rpi-3-b.dtb \ + bcm2708-rpi-cm.dtb \ + bcm2710-rpi-cm3.dtb \ \ - overlays/hifiberry-amp-overlay.dtb \ - overlays/hifiberry-dac-overlay.dtb \ - overlays/hifiberry-dacplus-overlay.dtb \ - overlays/hifiberry-digi-overlay.dtb \ - overlays/i2c-rtc-overlay.dtb \ - overlays/iqaudio-dac-overlay.dtb \ - overlays/iqaudio-dacplus-overlay.dtb \ - overlays/lirc-rpi-overlay.dtb \ - overlays/pitft22-overlay.dtb \ - overlays/pitft28-resistive-overlay.dtb \ - overlays/pps-gpio-overlay.dtb \ - overlays/rpi-ft5406-overlay.dtb \ - overlays/w1-gpio-overlay.dtb \ - overlays/w1-gpio-pullup-overlay.dtb \ - overlays/pi3-miniuart-bt-overlay.dtb \ + overlays/hifiberry-amp.dtbo \ + overlays/hifiberry-dac.dtbo \ + overlays/hifiberry-dacplus.dtbo \ + overlays/hifiberry-digi.dtbo \ + overlays/i2c-rtc.dtbo \ + overlays/iqaudio-dac.dtbo \ + overlays/iqaudio-dacplus.dtbo \ + overlays/lirc-rpi.dtbo \ + overlays/pitft22.dtbo \ + overlays/pitft28-resistive.dtbo \ + overlays/pps-gpio.dtbo \ + overlays/rpi-ft5406.dtbo \ + overlays/w1-gpio.dtbo \ + overlays/w1-gpio-pullup.dtbo \ + overlays/pi3-disable-bt.dtbo \ + overlays/pi3-miniuart-bt.dtbo \ + overlays/vc4-kms-v3d.dtbo \ " KERNEL_IMAGETYPE ?= "Image" @@ -51,3 +52,7 @@ MACHINE_EXTRA_RRECOMMENDS += " kernel-modules" SPLASH = "psplash-raspberrypi" IMAGE_BOOT_FILES ?= "bcm2835-bootfiles/* ${KERNEL_IMAGETYPE};${SDIMG_KERNELIMAGE}" + +# The kernel image is installed into the FAT32 boot partition and does not need +# to also be installed into the rootfs. +RDEPENDS_kernel-base = "" diff --git a/import-layers/meta-raspberrypi/conf/machine/include/rpi-default-providers.inc b/import-layers/meta-raspberrypi/conf/machine/include/rpi-default-providers.inc index 359870d83..078e9d673 100644 --- a/import-layers/meta-raspberrypi/conf/machine/include/rpi-default-providers.inc +++ b/import-layers/meta-raspberrypi/conf/machine/include/rpi-default-providers.inc @@ -2,8 +2,8 @@ PREFERRED_PROVIDER_virtual/kernel ?= "linux-raspberrypi" PREFERRED_PROVIDER_virtual/xserver ?= "xserver-xorg" -PREFERRED_PROVIDER_virtual/egl ?= "userland" -PREFERRED_PROVIDER_virtual/libgles2 ?= "userland" -PREFERRED_PROVIDER_virtual/libgl ?= "mesa-gl" -PREFERRED_PROVIDER_virtual/mesa ?= "mesa-gl" +PREFERRED_PROVIDER_virtual/egl ?= "${@bb.utils.contains("MACHINE_FEATURES", "vc4graphics", "mesa", "userland", d)}" +PREFERRED_PROVIDER_virtual/libgles2 ?= "${@bb.utils.contains("MACHINE_FEATURES", "vc4graphics", "mesa", "userland", d)}" +PREFERRED_PROVIDER_virtual/libgl ?= "${@bb.utils.contains("MACHINE_FEATURES", "vc4graphics", "mesa", "mesa-gl", d)}" +PREFERRED_PROVIDER_virtual/mesa ?= "${@bb.utils.contains("MACHINE_FEATURES", "vc4graphics", "mesa", "mesa-gl", d)}" PREFERRED_PROVIDER_jpeg ?= "jpeg" diff --git a/import-layers/meta-raspberrypi/conf/machine/include/rpi-default-versions.inc b/import-layers/meta-raspberrypi/conf/machine/include/rpi-default-versions.inc index c879ddea9..e65a4ae9e 100644 --- a/import-layers/meta-raspberrypi/conf/machine/include/rpi-default-versions.inc +++ b/import-layers/meta-raspberrypi/conf/machine/include/rpi-default-versions.inc @@ -1,3 +1,3 @@ # RaspberryPi BSP default versions -PREFERRED_VERSION_linux-raspberrypi ?= "4.1.%" +PREFERRED_VERSION_linux-raspberrypi ?= "4.4.%" |