trusted-firmware-a: Move back to tfa upstream except for am62lxx

This moves all of the platforms back to the main TFA repository, but
still points to the TI fork for the am62lxx platform while we continue
to work on upstreaming the needed patches.

With the the split into two repositories on two branches we need to also
split the LIC_FILES_CHECKSUM into two since the license.rst file is
slightly different between the two branches.  The upstream master
version is newer than the current am62l version.

Signed-off-by: Ryan Eatmon <reatmon@ti.com>

1 files changed, 12 insertions, 5 deletions

diff --git a/meta-ti-bsp/recipes-bsp/trusted-firmware-a/trusted-firmware-a-ti.inc b/meta-ti-bsp/recipes-bsp/trusted-firmware-a/trusted-firmware-a-ti.inc
index c17ac9de..ec52d09c 100644
--- a/meta-ti-bsp/recipes-bsp/trusted-firmware-a/trusted-firmware-a-ti.inc
+++ b/meta-ti-bsp/recipes-bsp/trusted-firmware-a/trusted-firmware-a-ti.inc
@@ -1,12 +1,19 @@
 # NOTE: This .inc file with customizations only gets included for K3 platforms
 
-PV = "2.12+git"
-SRCREV_tfa = "2ab59f45ad0a5d95b5cb339c0f64686954377050"
-SRC_URI_TRUSTED_FIRMWARE_A = "git://github.com/TexasInstruments/arm-trusted-firmware.git;protocol=https"
-SRCBRANCH = "ti-master"
+PV = "2.13+git"
+
+LIC_FILES_CHKSUM = "file://docs/license.rst;md5=6ed7bace7b0bc63021c6eba7b524039e"
+SRCREV_tfa = "d90bb650fe4cb3784f62214ab5829f4051c38d0a"
+SRC_URI_TRUSTED_FIRMWARE_A = "git://git.trustedfirmware.org/TF-A/trusted-firmware-a.git;protocol=https"
+SRCBRANCH = "master"
+
+LIC_FILES_CHKSUM:am62lxx = "file://docs/license.rst;md5=1118e32884721c0be33267bd7ae11130"
+SRCREV_tfa:am62lxx = "2ab59f45ad0a5d95b5cb339c0f64686954377050"
+SRC_URI_TRUSTED_FIRMWARE_A:am62lxx = "git://github.com/TexasInstruments/arm-trusted-firmware.git;protocol=https"
+SRCBRANCH:am62lxx = "ti-master"
+
 SRC_URI = "${SRC_URI_TRUSTED_FIRMWARE_A};name=tfa;branch=${SRCBRANCH}"
 
-LIC_FILES_CHKSUM = "file://docs/license.rst;md5=1118e32884721c0be33267bd7ae11130"
 COMPATIBLE_MACHINE = "k3"
 
 TFA_BUILD_TARGET = "all"