Update rpi templates after recipe update

This integrates the changes mentioned in the wiki
https://wiki.automotivelinux.org/agl-distro/agl-raspberrypi?rev=1474470047

so we can simplify it to a simple '-m raspberrypi2' or '-m raspberrypi3'.

The license whitelist is commented-out for now.

Change-Id: I77a5bd97c9b671c3a4da78482ca70f68e08e4877
Signed-off-by: Jan-Simon Möller <jsmoeller@linuxfoundation.org>

diff --git a/templates/machine/raspberrypi2/50_local.conf.inc b/templates/machine/raspberrypi2/50_local.conf.inc
index 343768e..0739def 100644 (file)
--- a/templates/machine/raspberrypi2/50_local.conf.inc
+++ b/templates/machine/raspberrypi2/50_local.conf.inc
@@ -1,2 +1,20 @@
 MACHINE = "raspberrypi2"
 
+GPU_MEM = "128"
+
+CORE_IMAGE_EXTRA_INSTALL += "wayland weston"
+
+MULTI_PROVIDER_WHITELIST += "virtual/libgl virtual/egl virtual/libgles1 virtual/libgles2"
+IMAGE_CLASSES = "sdcard_image-rpi-gdp"
+KERNEL_DEVICETREE_append = " overlays/vc4-kms-v3d-overlay.dtb"
+PREFERRED_VERSION_linux-raspberrypi = "4.4.%"
+PREFERRED_VERSION_mesa = "11.%"
+
+PREFERRED_PROVIDER_virtual/egl = "mesa"
+PREFERRED_PROVIDER_virtual/libgles2 = "mesa"
+PREFERRED_PROVIDER_virtual/libgl = "mesa"
+PREFERRED_PROVIDER_virtual/mesa = "mesa"
+PREFERRED_PROVIDER_jpeg = "jpeg"
+
+# For libomxil
+#LICENSE_FLAGS_WHITELIST = "commercial"

diff --git a/templates/machine/raspberrypi3/50_local.conf.inc b/templates/machine/raspberrypi3/50_local.conf.inc
index cfdd029..f6bb6e5 100644 (file)
--- a/templates/machine/raspberrypi3/50_local.conf.inc
+++ b/templates/machine/raspberrypi3/50_local.conf.inc
@@ -1,2 +1,20 @@
 MACHINE = "raspberrypi3"
 
+GPU_MEM = "128"
+
+CORE_IMAGE_EXTRA_INSTALL += "wayland weston"
+
+MULTI_PROVIDER_WHITELIST += "virtual/libgl virtual/egl virtual/libgles1 virtual/libgles2"
+IMAGE_CLASSES = "sdcard_image-rpi-gdp"
+KERNEL_DEVICETREE_append = " overlays/vc4-kms-v3d-overlay.dtb"
+PREFERRED_VERSION_linux-raspberrypi = "4.4.%"
+PREFERRED_VERSION_mesa = "11.%"
+
+PREFERRED_PROVIDER_virtual/egl = "mesa"
+PREFERRED_PROVIDER_virtual/libgles2 = "mesa"
+PREFERRED_PROVIDER_virtual/libgl = "mesa"
+PREFERRED_PROVIDER_virtual/mesa = "mesa"
+PREFERRED_PROVIDER_jpeg = "jpeg"
+
+# For libomxil
+#LICENSE_FLAGS_WHITELIST = "commercial"