conf: machine: Move ti-eth-fw-j784s4 to AM69-SK conf

The board specific firmware is added in the generic AM69 SoC include
instead of the AM69-SK board configuration. This follows the changes
already made for the J784s4 SoC and EVM board in
commit 27615406 ("conf: machine: j784s4: Move ti-eth-fw-j784s4 to EVM conf")

Move the machine-essential recommend from the SoC include
to the AM69-SK configuration.

Signed-off-by: Franz Schnyder <franz.schnyder@toradex.com>
Signed-off-by: Ryan Eatmon <reatmon@ti.com>

2 files changed, 3 insertions, 1 deletions

diff --git a/meta-ti-bsp/conf/machine/am69-sk.conf b/meta-ti-bsp/conf/machine/am69-sk.conf
index 9531cc27..3785dca6 100644
--- a/meta-ti-bsp/conf/machine/am69-sk.conf
+++ b/meta-ti-bsp/conf/machine/am69-sk.conf
@@ -22,3 +22,5 @@ KERNEL_DEVICETREE = " \
 "
 
 UBOOT_MACHINE = "am69_sk_a72_defconfig"
+
+MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS += "ti-eth-fw-j784s4"
diff --git a/meta-ti-bsp/conf/machine/include/am69.inc b/meta-ti-bsp/conf/machine/include/am69.inc
index 7956e355..aaed2f61 100644
--- a/meta-ti-bsp/conf/machine/include/am69.inc
+++ b/meta-ti-bsp/conf/machine/include/am69.inc
@@ -12,4 +12,4 @@ TFA_BOARD = "j784s4"
 
 OPTEEMACHINE = "k3-j784s4"
 
-MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS += "cadence-mhdp-fw cnm-wave-fw ti-eth-fw-j784s4"
+MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS += "cadence-mhdp-fw cnm-wave-fw"