conf: machine: add optee-os into am62lxx-evm builds

Newer silicon revision of the AM62L family are capable of reliably
booting with OP-TEE integrated in the bootflow with all bootmedia.
However to support as many DDR densities as possible we cannot use the
default 0x9e78000 location as with other K3 devices.

So add OP-TEE back into the default build but modify the BL32 base
address for TF-A so it will jump to the correct location.

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

2 files changed, 2 insertions, 1 deletions

diff --git a/meta-ti-bsp/conf/machine/am62lxx-evm.conf b/meta-ti-bsp/conf/machine/am62lxx-evm.conf
index 607092a7..5c0535c2 100644
--- a/meta-ti-bsp/conf/machine/am62lxx-evm.conf
+++ b/meta-ti-bsp/conf/machine/am62lxx-evm.conf
@@ -5,6 +5,8 @@
 require conf/machine/include/am62lxx.inc
 require conf/machine/include/ti-extras.inc
 
+TFA_K3_BL32_BASE = "0x80200000"
+
 IMAGE_FSTYPES += "ubifs ubi"
 
 MKUBIFS_ARGS ?= "-F -m 4096 -e 258048 -c 8500"
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 c2c6b007..80691883 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
@@ -22,7 +22,6 @@ TFA_SPD = "opteed"
 
 # For am62lxx, install bl1 & bl31 using TFA_INSTALL_TARGET
 TFA_INSTALL_TARGET:am62lxx = "bl31 bl1"
-TFA_SPD:am62lxx = ""
 
 EXTRA_OEMAKE += "${@ 'K3_USART=' + d.getVar('TFA_K3_USART') if d.getVar('TFA_K3_USART') else ''}"
 EXTRA_OEMAKE += "${@ 'BL32_BASE=' + d.getVar('TFA_K3_BL32_BASE') if d.getVar('TFA_K3_BL32_BASE') else ''}"