From 05fd1a84882f4d992519e023a8ef40c017701776 Mon Sep 17 00:00:00 2001 From: Jan-Simon Möller Date: Tue, 30 Jun 2020 21:45:45 +0200 Subject: Apply the perf fix only when meta-rcar-gen3-adas is not present MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Currently the upstream rcar bsp does need the fix for building perf. The meta-rcar-gen3-adas layer contains a fix in the big patchqueue. Thus conditionally apply the perf build fix. Bug-AGL: SPEC-3443 Signed-off-by: Jan-Simon Möller Change-Id: Icbf53add71ed731c35dec149841691c82ae4372c Reviewed-on: https://gerrit.automotivelinux.org/gerrit/c/AGL/meta-agl/+/24914 Reviewed-by: Stéphane Desneux --- .../recipes-kernel/linux/linux-renesas_%.bbappend | 24 +++++++++++++++++ .../linux/linux-renesas_%.bbappendNOT | 31 ---------------------- 2 files changed, 24 insertions(+), 31 deletions(-) create mode 100644 meta-agl-bsp/meta-rcar-gen3-adas/recipes-kernel/linux/linux-renesas_%.bbappend delete mode 100644 meta-agl-bsp/meta-rcar-gen3-adas/recipes-kernel/linux/linux-renesas_%.bbappendNOT (limited to 'meta-agl-bsp/meta-rcar-gen3-adas/recipes-kernel/linux') diff --git a/meta-agl-bsp/meta-rcar-gen3-adas/recipes-kernel/linux/linux-renesas_%.bbappend b/meta-agl-bsp/meta-rcar-gen3-adas/recipes-kernel/linux/linux-renesas_%.bbappend new file mode 100644 index 000000000..7ebe36ad5 --- /dev/null +++ b/meta-agl-bsp/meta-rcar-gen3-adas/recipes-kernel/linux/linux-renesas_%.bbappend @@ -0,0 +1,24 @@ +FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" + +# disable the perf fix as the cogent layer contains it +perfFIX = "" + +KERNEL_DEVICETREE_remove_h3ulcb = " \ + renesas/r8a7795-es1-h3ulcb-view.dtb \ + renesas/r8a7795-es1-h3ulcb-had-alfa.dtb \ + renesas/r8a7795-es1-h3ulcb-had-beta.dtb \ + renesas/r8a7795-es1-h3ulcb-vb.dtb \ + renesas/r8a7795-es1-h3ulcb-vb2.dtb \ + renesas/r8a7795-es1-h3ulcb-vbm.dtb \ + renesas/r8a7795-h3ulcb-view.dtb \ + renesas/r8a7795-h3ulcb-had-alfa.dtb \ + renesas/r8a7795-h3ulcb-had-beta.dtb \ + renesas/r8a7795-h3ulcb-vb.dtb \ + renesas/r8a7795-h3ulcb-vb2.dtb \ + renesas/r8a7795-h3ulcb-vb2.1.dtb \ + renesas/r8a7795-h3ulcb-vbm.dtb \ + renesas/r8a7795-h3ulcb-4x2g-vb.dtb \ + renesas/r8a7795-h3ulcb-4x2g-vb2.dtb \ + renesas/r8a7795-h3ulcb-4x2g-vb2.1.dtb \ + renesas/r8a7795-h3ulcb-4x2g-vbm.dtb \ +" diff --git a/meta-agl-bsp/meta-rcar-gen3-adas/recipes-kernel/linux/linux-renesas_%.bbappendNOT b/meta-agl-bsp/meta-rcar-gen3-adas/recipes-kernel/linux/linux-renesas_%.bbappendNOT deleted file mode 100644 index 1ed92af03..000000000 --- a/meta-agl-bsp/meta-rcar-gen3-adas/recipes-kernel/linux/linux-renesas_%.bbappendNOT +++ /dev/null @@ -1,31 +0,0 @@ -FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" - -SRC_URI_append_ulcb = " \ - file://0001-arm64-dts-renesas-preserve-drm-HDMI-connector-naming.patch \ - file://disable_most.cfg \ - file://0004-ADSP-enable-and-add-sound-hardware-abstraction_kf.patch \ -" - -SRC_URI_remove_ulcb = " \ - file://0113-arm64-dts-ulcb-kf-increase-SDIO-frequency-for-WLAN-c.patch \ -" - -KERNEL_DEVICETREE_remove_h3ulcb = " \ - renesas/r8a7795-es1-h3ulcb-view.dtb \ - renesas/r8a7795-es1-h3ulcb-had-alfa.dtb \ - renesas/r8a7795-es1-h3ulcb-had-beta.dtb \ - renesas/r8a7795-es1-h3ulcb-vb.dtb \ - renesas/r8a7795-es1-h3ulcb-vb2.dtb \ - renesas/r8a7795-es1-h3ulcb-vbm.dtb \ - renesas/r8a7795-h3ulcb-view.dtb \ - renesas/r8a7795-h3ulcb-had-alfa.dtb \ - renesas/r8a7795-h3ulcb-had-beta.dtb \ - renesas/r8a7795-h3ulcb-vb.dtb \ - renesas/r8a7795-h3ulcb-vb2.dtb \ - renesas/r8a7795-h3ulcb-vb2.1.dtb \ - renesas/r8a7795-h3ulcb-vbm.dtb \ - renesas/r8a7795-h3ulcb-4x2g-vb.dtb \ - renesas/r8a7795-h3ulcb-4x2g-vb2.dtb \ - renesas/r8a7795-h3ulcb-4x2g-vb2.1.dtb \ - renesas/r8a7795-h3ulcb-4x2g-vbm.dtb \ -" -- cgit 1.2.3-korg