From: Stéphane Desneux <stephane.desneux@iot.bzh>
Date: Fri, 24 May 2019 13:51:56 +0000 (+0000)
Subject: Merge "setup_mm_packages.sh: Use GFX 3.19 binaries instead of 3.15"
X-Git-Tag: halibut_7.99.1~8
X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=commitdiff_plain;h=c8836925509d3de6655984fbf38875e13893871d;hp=9bc6c25f56f4997e55b60e969e9f942cc1859988;p=AGL%2Fmeta-agl.git

Merge "setup_mm_packages.sh: Use GFX 3.19 binaries instead of 3.15"
---

diff --git a/meta-agl-bsp/conf/include/agl_raspberrypi3-64.inc b/meta-agl-bsp/conf/include/agl_raspberrypi3-64.inc
deleted file mode 100644
index f6801352c..000000000
--- a/meta-agl-bsp/conf/include/agl_raspberrypi3-64.inc
+++ /dev/null
@@ -1,25 +0,0 @@
-# Maximum memory allowed to be assigned
-GPU_MEM = "255"
-
-ENABLE_CMA = "1"
-CMA_LWM = "16"
-CMA_HWM = "32"
-
-KERNEL_IMAGETYPE = "Image"
-KERNEL_DEVICETREE_append = " overlays/vc4-kms-v3d-overlay.dtb"
-
-MACHINE_FEATURES += "vc4graphics"
-
-# For libomxil
-#LICENSE_FLAGS_WHITELIST = "commercial"
-
-IMAGE_INSTALL_append = " kernel-modules linux-firmware "
-
-# Psplash causes crash on first boot on RPi
-IMAGE_FEATURES_remove = "splash"
-
-# Add the custom rpi-sdimg output format
-AGL_EXTRA_IMAGE_FSTYPES  = " rpi-sdimg.xz"
-
-# Use the AGL default ext4.xz to generate the rpi-sdimg
-SDIMG_ROOTFS_TYPE = "ext4.xz"
diff --git a/meta-agl-profile-core/recipes-test/afb-test/afb-test_git.bb b/meta-agl-profile-core/recipes-test/afb-test/afb-test_git.bb
index 7d030de66..15fbb6f1c 100644
--- a/meta-agl-profile-core/recipes-test/afb-test/afb-test_git.bb
+++ b/meta-agl-profile-core/recipes-test/afb-test/afb-test_git.bb
@@ -6,10 +6,10 @@ LICENSE = "Apache-2.0"
 LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/Apache-2.0;md5=89aea4e17d99a7cacdbeed46a0096b10"
 SECTION = "apps"
 
-SRC_URI = "gitsm://gerrit.automotivelinux.org/gerrit/apps/app-afb-test;protocol=https;branch=${AGL_BRANCH}"
-SRCREV = "cdaad5dbef30d989fab207324ec3c37d6e50c5a0"
+SRC_URI = "git://gerrit.automotivelinux.org/gerrit/apps/app-afb-test;protocol=https;branch=${AGL_BRANCH}"
+SRCREV = "3605fd31f04a9198402a687b1a3242835b27cff0"
 
-DEPENDS += "lua"
+DEPENDS += "lua libafb-helpers libappcontroller"
 RDEPENDS_${PN} += "lua bash"
 RDEPENDS_${PN}-ptest += "af-binder"
 
diff --git a/templates/machine/raspberrypi3-64/50_bblayers.conf.inc b/templates/machine/raspberrypi3-64/50_bblayers.conf.inc
deleted file mode 120000
index 653316c5c..000000000
--- a/templates/machine/raspberrypi3-64/50_bblayers.conf.inc
+++ /dev/null
@@ -1 +0,0 @@
-../raspberrypi3/50_bblayers.conf.inc
\ No newline at end of file
diff --git a/templates/machine/raspberrypi3-64/50_local.conf.inc b/templates/machine/raspberrypi3-64/50_local.conf.inc
deleted file mode 100644
index 74d952ed9..000000000
--- a/templates/machine/raspberrypi3-64/50_local.conf.inc
+++ /dev/null
@@ -1,3 +0,0 @@
-MACHINE = "raspberrypi3-64"
-#see meta-agl/meta-agl-bsp/conf/include/agl_raspberrypi3-64.inc
-require conf/include/agl_raspberrypi3-64.inc