From e4e1a7211a86aaf35d40905fa00fa0a9fefae323 Mon Sep 17 00:00:00 2001
From: Nathan Dunne <Nathan.Dunne@arm.com>
Date: Thu, 17 Sep 2020 09:58:17 +0000
Subject: [PATCH] arm-bsp/u-boot: fix THISDIR name collision in
 u-boot_%.bbappend

Renamed ${THISDIR} user defined variable to ${THIS_DIR}, to prevent
it from breaking ${THISDIR} macro in subsequent u-boot .bbappend files

Change-Id: I4473ee5c3ac5c0aea9310557294cc9757579bdf1
Issue-Id: SCM-1302
Signed-off-by: Nathan Dunne <Nathan.Dunne@arm.com>
Reviewed-by: Diego Sueiro <diego.sueiro@arm.com>
Signed-off-by: Jon Mason <jon.mason@arm.com>
---
 meta-arm-bsp/recipes-bsp/u-boot/u-boot_%.bbappend | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/meta-arm-bsp/recipes-bsp/u-boot/u-boot_%.bbappend b/meta-arm-bsp/recipes-bsp/u-boot/u-boot_%.bbappend
index bf572424..5fc3723c 100644
--- a/meta-arm-bsp/recipes-bsp/u-boot/u-boot_%.bbappend
+++ b/meta-arm-bsp/recipes-bsp/u-boot/u-boot_%.bbappend
@@ -1,7 +1,7 @@
 # Machine specific u-boot
 
-THISDIR := "${THISDIR}"
-FILESEXTRAPATHS_prepend = "${THISDIR}/files/:${THISDIR}/${BP}:"
+THIS_DIR := "${THISDIR}"
+FILESEXTRAPATHS_prepend = "${THIS_DIR}/files/:${THIS_DIR}/${BP}:"
 FILESEXTRAPATHS_prepend_fvp-base := "${THISDIR}/files/fvp-common:"
 FILESEXTRAPATHS_prepend_foundation-armv8 := "${THISDIR}/files/fvp-common:"