From 96248a0eac73e990b767813c9b4e698fb76cf896 Mon Sep 17 00:00:00 2001 From: Ross Burton Date: Tue, 7 Jul 2020 17:24:59 +0100 Subject: [PATCH] arm-bsp/trusted-firmware-a: consolidate FILESEXTRAPATHS There's no need to set FILESEXTRAPATHS to "${THISDIR}/files/n1sdp:" when n1sdp is the name of the current MACHINE as bitbake will search for override-named directories automatically. Instead just add ${THISDIR}/files and let bitbake do it's thing. Change-Id: I0f58933ff9e56ee41a8fdd55f467d263c4e1b1e7 Signed-off-by: Ross Burton Signed-off-by: Jon Mason --- .../recipes-bsp/trusted-firmware-a/trusted-firmware-a-n1sdp.inc | 1 - .../trusted-firmware-a/trusted-firmware-a_2.%.bbappend | 2 ++ 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/meta-arm-bsp/recipes-bsp/trusted-firmware-a/trusted-firmware-a-n1sdp.inc b/meta-arm-bsp/recipes-bsp/trusted-firmware-a/trusted-firmware-a-n1sdp.inc index ad4af5ac..ef71ae58 100644 --- a/meta-arm-bsp/recipes-bsp/trusted-firmware-a/trusted-firmware-a-n1sdp.inc +++ b/meta-arm-bsp/recipes-bsp/trusted-firmware-a/trusted-firmware-a-n1sdp.inc @@ -7,7 +7,6 @@ TFA_DEBUG = "1" TFA_MBEDTLS = "0" TFA_UBOOT = "0" -FILESEXTRAPATHS_prepend := "${THISDIR}/files/n1sdp:" SRC_URI_append = " \ file://0001-n1sdp-arm-tf-disable-workaround-for-N1-Erratum-13157.patch \ " diff --git a/meta-arm-bsp/recipes-bsp/trusted-firmware-a/trusted-firmware-a_2.%.bbappend b/meta-arm-bsp/recipes-bsp/trusted-firmware-a/trusted-firmware-a_2.%.bbappend index 47915387..2ce14b80 100644 --- a/meta-arm-bsp/recipes-bsp/trusted-firmware-a/trusted-firmware-a_2.%.bbappend +++ b/meta-arm-bsp/recipes-bsp/trusted-firmware-a/trusted-firmware-a_2.%.bbappend @@ -1,3 +1,5 @@ +FILESEXTRAPATHS_prepend := "${THISDIR}/files/:" + # Machine specific TFAs MACHINE_TFA_REQUIRE ?= ""