From a656575ecd6b5e482ba7fa218bed6b77a66b0d37 Mon Sep 17 00:00:00 2001 From: Praneeth Bajjuri Date: Thu, 13 Jul 2023 14:37:02 -0500 Subject: [PATCH] meta-ti: conf: am62xx-lp-evm: Use common include am62xx.inc 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 Suggested-by: Randolph Sapp Reviewed-by: Randolph Sapp Signed-off-by: Ryan Eatmon --- 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"