conf: machine: Move TFA_BOARD and OPTEEMACHINE to the SoC level

These defines are specific to a SoC, not a SoC family (K3) nor
any specific board. Move these to the SoC level for all boards
to be consistent with boards already doing this correctly.

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

1 files changed, 0 insertions, 4 deletions

diff --git a/meta-ti-bsp/conf/machine/j784s4-evm.conf b/meta-ti-bsp/conf/machine/j784s4-evm.conf
index 10d8aad0..f8be7d18 100644
--- a/meta-ti-bsp/conf/machine/j784s4-evm.conf
+++ b/meta-ti-bsp/conf/machine/j784s4-evm.conf
@@ -7,7 +7,6 @@ require conf/machine/include/j784s4.inc
 SERIAL_CONSOLES = "115200;ttyS2"
 SERIAL_CONSOLES_CHECK = "${SERIAL_CONSOLES}"
 TFA_K3_USART = "0x8"
-OPTEEMACHINE = "k3-j784s4"
 OPTEE_K3_USART = "0x8"
 
 KERNEL_DEVICETREE = " \
@@ -18,6 +17,3 @@ UBOOT_MACHINE = "j784s4_evm_a72_defconfig"
 
 do_image_wic[mcdepends] = "mc::k3r5:ti-sci-fw:do_deploy"
 do_image_tar[mcdepends] = "mc::k3r5:ti-sci-fw:do_deploy"
-
-TFA_BOARD = "j784s4"
-