diff options
Diffstat (limited to 'meta-raspberrypi/conf')
| -rw-r--r-- | meta-raspberrypi/conf/layer.conf | 12 | ||||
| -rw-r--r-- | meta-raspberrypi/conf/machine/include/rpi-base.inc | 14 | ||||
| -rw-r--r-- | meta-raspberrypi/conf/machine/include/rpi-default-providers.inc | 4 |
3 files changed, 16 insertions, 14 deletions
diff --git a/meta-raspberrypi/conf/layer.conf b/meta-raspberrypi/conf/layer.conf index 76f9e92d3b..cdf81125c9 100644 --- a/meta-raspberrypi/conf/layer.conf +++ b/meta-raspberrypi/conf/layer.conf @@ -9,11 +9,8 @@ BBFILE_COLLECTIONS += "raspberrypi" BBFILE_PATTERN_raspberrypi := "^${LAYERDIR}/" BBFILE_PRIORITY_raspberrypi = "9" -LAYERSERIES_COMPAT_raspberrypi = "styhead" +LAYERSERIES_COMPAT_raspberrypi = "styhead walnascar" LAYERDEPENDS_raspberrypi = "core" -# Recommended for u-boot support for raspberrypi5 -# https://git.yoctoproject.org/meta-lts-mixins 'scarthgap/u-boot' branch -LAYERRECOMMENDS_raspberrypi = "lts-u-boot-mixin" # Additional license directories. LICENSE_PATH += "${LAYERDIR}/files/custom-licenses" @@ -23,11 +20,6 @@ LICENSE_PATH += "${LAYERDIR}/files/custom-licenses" # # The .bbappend and .bb files are included if the respective layer # collection is available. -BBFILES += "${@' '.join('${LAYERDIR}/dynamic-layers/%s/recipes*/*/*.bbappend' % layer \ - for layer in BBFILE_COLLECTIONS.split())}" -BBFILES += "${@' '.join('${LAYERDIR}/dynamic-layers/%s/recipes*/*/*.bb' % layer \ - for layer in BBFILE_COLLECTIONS.split())}" - BBFILES_DYNAMIC += " \ openembedded-layer:${LAYERDIR}/dynamic-layers/openembedded-layer/*/*/*.bb \ openembedded-layer:${LAYERDIR}/dynamic-layers/openembedded-layer/*/*/*.bbappend \ @@ -37,6 +29,8 @@ BBFILES_DYNAMIC += " \ qt5-layer:${LAYERDIR}/dynamic-layers/qt5-layer/*/*/*.bbappend \ multimedia-layer:${LAYERDIR}/dynamic-layers/multimedia-layer/*/*/*.bb \ multimedia-layer:${LAYERDIR}/dynamic-layers/multimedia-layer/*/*/*.bbappend \ + meta-python:${LAYERDIR}/dynamic-layers/meta-python/*/*/*.bb \ + meta-python:${LAYERDIR}/dynamic-layers/meta-python/*/*/*.bbappend \ " DEFAULT_TEST_SUITES:remove:rpi = "parselogs" diff --git a/meta-raspberrypi/conf/machine/include/rpi-base.inc b/meta-raspberrypi/conf/machine/include/rpi-base.inc index a5fd1a4578..9923133977 100644 --- a/meta-raspberrypi/conf/machine/include/rpi-base.inc +++ b/meta-raspberrypi/conf/machine/include/rpi-base.inc @@ -18,7 +18,9 @@ RPI_KERNEL_DEVICETREE_OVERLAYS ?= " \ overlays/overlay_map.dtb \ overlays/at86rf233.dtbo \ overlays/disable-bt.dtbo \ + overlays/disable-bt-pi5.dtbo \ overlays/disable-wifi.dtbo \ + overlays/disable-wifi-pi5.dtbo \ overlays/dwc2.dtbo \ overlays/gpio-ir.dtbo \ overlays/gpio-ir-tx.dtbo \ @@ -58,6 +60,17 @@ RPI_KERNEL_DEVICETREE_OVERLAYS ?= " \ overlays/pps-gpio.dtbo \ overlays/rpi-ft5406.dtbo \ overlays/rpi-poe.dtbo \ + overlays/uart0.dtbo \ + overlays/uart0-pi5.dtbo \ + overlays/uart1.dtbo \ + overlays/uart1-pi5.dtbo \ + overlays/uart2.dtbo \ + overlays/uart2-pi5.dtbo \ + overlays/uart3.dtbo \ + overlays/uart3-pi5.dtbo \ + overlays/uart4.dtbo \ + overlays/uart4-pi5.dtbo \ + overlays/uart5.dtbo \ overlays/vc4-fkms-v3d.dtbo \ overlays/vc4-fkms-v3d-pi4.dtbo \ overlays/vc4-kms-v3d.dtbo \ @@ -86,7 +99,6 @@ RPI_KERNEL_DEVICETREE ?= " \ broadcom/bcm2710-rpi-cm3.dtb \ broadcom/bcm2711-rpi-cm4.dtb \ broadcom/bcm2711-rpi-cm4s.dtb \ - broadcom/bcm2712-rpi-5-b.dtb \ " KERNEL_DEVICETREE ??= " \ diff --git a/meta-raspberrypi/conf/machine/include/rpi-default-providers.inc b/meta-raspberrypi/conf/machine/include/rpi-default-providers.inc index 3f810264b3..c02d24879e 100644 --- a/meta-raspberrypi/conf/machine/include/rpi-default-providers.inc +++ b/meta-raspberrypi/conf/machine/include/rpi-default-providers.inc @@ -7,10 +7,6 @@ PREFERRED_PROVIDER_virtual/libgles2 ?= "${@bb.utils.contains("MACHINE_FEATURES", 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_virtual/libgbm ?= "${@bb.utils.contains("MACHINE_FEATURES", "vc4graphics", "mesa", "mesa-gl", d)}" -PREFERRED_PROVIDER_vlc ?= "rpidistro-vlc" -PREFERRED_PROVIDER_ffmpeg ?= "rpidistro-ffmpeg" -PREFERRED_PROVIDER_libav ?= "rpidistro-ffmpeg" -PREFERRED_PROVIDER_libpostproc ?= "rpidistro-ffmpeg" PREFERRED_PROVIDER_jpeg ?= "jpeg" PREFERRED_PROVIDER_virtual/libomxil ?= "userland" |