From: Leon Anavi <leon.anavi@konsulko.com>
Date: Mon, 4 Nov 2019 21:24:44 +0000 (+0200)
Subject: raspberrypi*/50_local.conf.inc: Update rpi 3/4
X-Git-Tag: 8.99.1~16
X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=commitdiff_plain;h=4491d5a8d4a0d4487d73354307ecd7b6f129d406;hp=121c565de6ed2662b941a3915c80850a2b4cc391;p=AGL%2Fmeta-agl.git

raspberrypi*/50_local.conf.inc: Update rpi 3/4

Use the same versions for Linux kernel and Mesa on both Raspberry
Pi 3B/B+ and 4. This allows to run firmware KMS that supports
HDMI and the official 7" Raspberry Pi touch screen DSI display.

Bug-AGL: SPEC-2465

Change-Id: I7ae5739bbb6b8d2efd3264d3d1eab9c28e6f2559
Signed-off-by: Leon Anavi <leon.anavi@konsulko.com>
---

diff --git a/templates/machine/raspberrypi3/50_local.conf.inc b/templates/machine/raspberrypi3/50_local.conf.inc
index dcaf5e9d4..e47637178 100644
--- a/templates/machine/raspberrypi3/50_local.conf.inc
+++ b/templates/machine/raspberrypi3/50_local.conf.inc
@@ -1,7 +1,3 @@
 MACHINE = "raspberrypi3"
 #see meta-agl/meta-agl-bsp/conf/include/agl_raspberrypi3.inc
 require conf/include/agl_raspberrypi3.inc
-
-# Set appropriate version of Mesa for Raspberry Pi 3 and
-# ignore the newer version with has been added for Raspberry Pi 4
-PREFERRED_VERSION_mesa_raspberrypi3 = "18.1%"
diff --git a/templates/machine/raspberrypi4/50_local.conf.inc b/templates/machine/raspberrypi4/50_local.conf.inc
index 27a8bf2af..cff2f1878 100644
--- a/templates/machine/raspberrypi4/50_local.conf.inc
+++ b/templates/machine/raspberrypi4/50_local.conf.inc
@@ -1,8 +1,3 @@
 MACHINE = "raspberrypi4"
 #see meta-agl/meta-agl-bsp/conf/include/agl_raspberrypi3.inc
 require conf/include/agl_raspberrypi3.inc
-
-PREFERRED_VERSION_linux-raspberrypi_raspberrypi4 = "4.19%"
-
-# Set appropriate version of Mesa for Raspberry Pi 4
-PREFERRED_VERSION_mesa_raspberrypi4 = "19.1%"