X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=meta-agl-bsp%2Fmeta-rcar-gen3%2Frecipes-kernel%2Flinux%2Flinux-renesas_%25.bbappend;fp=meta-agl-bsp%2Fmeta-rcar-gen3%2Frecipes-kernel%2Flinux%2Flinux-renesas_%25.bbappend;h=43aeb6272c697f972025c4e855b28da538cd8f42;hb=05fd1a84882f4d992519e023a8ef40c017701776;hp=405fc97a08217a6f90477001a3cdcd00b4d3a966;hpb=0524237a83de69a0877ea4775ebdd061441ade29;p=AGL%2Fmeta-agl.git

diff --git a/meta-agl-bsp/meta-rcar-gen3/recipes-kernel/linux/linux-renesas_%.bbappend b/meta-agl-bsp/meta-rcar-gen3/recipes-kernel/linux/linux-renesas_%.bbappend
index 405fc97a0..43aeb6272 100644
--- a/meta-agl-bsp/meta-rcar-gen3/recipes-kernel/linux/linux-renesas_%.bbappend
+++ b/meta-agl-bsp/meta-rcar-gen3/recipes-kernel/linux/linux-renesas_%.bbappend
@@ -5,14 +5,16 @@ require recipes-kernel/linux/linux-agl.inc
 SRC_URI_append  = " file://namespace_fix.cfg \
     "
 
+# This can fix a compilation issue with perf. As this seems to collide with the cogent layer
+# we apply this here by variable and reset it when the -adas layer is present.
+perfFIX ??= " file://9999-perf-libbft-upstream.patch "
+#
+
 # Add ADSP patch to enable and add sound hardware abstraction
 SRC_URI_append_ulcb = " \
     file://0004-ADSP-enable-and-add-sound-hardware-abstraction.patch \
+    ${perfFIX} \
 "
-# This can fix a compilation issue with perf. This seems to collide with the cogent layer
-# so for now just don't apply and see if or where we need this.
-#    file://9999-perf-libbft-upstream.patch \
-#
 
 # For Xen
 SRC_URI_append = " \