On 7/13/23 14:37, [email protected] wrote:
From: Praneeth Bajjuri <[email protected]>

commit 5f9be228390b ("machine: Add AM62Q HS-SE evm configuration")
has added am62xx-lp.inc which is used by am62xx-lp-evm machine.

The features listed in am62xx.inc are common between machines
am62xx-evm and am62xx-lp-evm. (Ex: MACHINE_FEATURES = "gpu")

Hence updating the necessary include file to have
common features to be enabled between these two platform variants.

Signed-off-by: Praneeth Bajjuri <[email protected]>
Suggested-by: Randolph Sapp <[email protected]>
---
  meta-ti-bsp/conf/machine/am62xx-lp-evm.conf    |  2 +-
  meta-ti-bsp/conf/machine/include/am62xx-lp.inc | 15 ---------------
  2 files changed, 1 insertion(+), 16 deletions(-)
  delete mode 100644 meta-ti-bsp/conf/machine/include/am62xx-lp.inc

diff --git a/meta-ti-bsp/conf/machine/am62xx-lp-evm.conf 
b/meta-ti-bsp/conf/machine/am62xx-lp-evm.conf
index 1f1b47ba..5c235c29 100644
--- a/meta-ti-bsp/conf/machine/am62xx-lp-evm.conf
+++ b/meta-ti-bsp/conf/machine/am62xx-lp-evm.conf
@@ -2,7 +2,7 @@
  #@NAME: AM62XX LP EVM
  #@DESCRIPTION: Machine configuration for the TI AM62XX LP EVM
-require conf/machine/include/am62xx-lp.inc
+require conf/machine/include/am62xx.inc
KERNEL_DEVICETREE_PREFIX = " \
      ti/k3-am62-lp \
diff --git a/meta-ti-bsp/conf/machine/include/am62xx-lp.inc 
b/meta-ti-bsp/conf/machine/include/am62xx-lp.inc
deleted file mode 100644
index f3fe944b..00000000
--- a/meta-ti-bsp/conf/machine/include/am62xx-lp.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-require conf/machine/include/k3.inc
-SOC_FAMILY:append = ":am62xx"
-
-MACHINE_FEATURES += "screen touchscreen"
-
-TFA_K3_SYSTEM_SUSPEND = "1"
-
-# Default tiboot3.bin on AM62x LP is for HS-FS
-IMAGE_BOOT_FILES += "tiboot3-am62x-hs-fs-evm.bin"
-
-# Since default tiboot3.bin on AM62x LP is for HS-FS, add a version for HS-SE
-IMAGE_BOOT_FILES += "tiboot3-am62x-hs-evm.bin"
-
-TFA_BOARD = "lite"
-OPTEEMACHINE = "k3-am62x"

I'm not sure what takes priority here but I'll add it anyway. LGTM. Applies cleanly to master as well.

Reviewed-by: Randolph Sapp <[email protected]>
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#16845): 
https://lists.yoctoproject.org/g/meta-ti/message/16845
Mute This Topic: https://lists.yoctoproject.org/mt/100127691/21656
Group Owner: [email protected]
Unsubscribe: https://lists.yoctoproject.org/g/meta-ti/unsub 
[[email protected]]
-=-=-=-=-=-=-=-=-=-=-=-

Reply via email to