From: Denys Dmytriyenko <denis@denix.org>
To: afd@ti.com
Cc: Denys Dmytriyenko <denys@konsulko.com>,
Ryan Eatmon <reatmon@ti.com>,
meta-ti@lists.yoctoproject.org
Subject: Re: [meta-ti][master/kirkstone][PATCH 6/7] conf: machine: Move TFA_BOARD and OPTEEMACHINE to the SoC level
Date: Mon, 12 Dec 2022 17:51:39 -0500 [thread overview]
Message-ID: <20221212225139.GM22689@denix.org> (raw)
In-Reply-To: <20221207214312.21735-6-afd@ti.com>
On Wed, Dec 07, 2022 at 03:43:11PM -0600, Andrew Davis via lists.yoctoproject.org wrote:
> 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.
See the question below
> Signed-off-by: Andrew Davis <afd@ti.com>
> ---
> meta-ti-bsp/conf/machine/include/am64xx.inc | 1 +
> meta-ti-bsp/conf/machine/include/am65xx.inc | 2 ++
> meta-ti-bsp/conf/machine/include/j7200.inc | 2 ++
> meta-ti-bsp/conf/machine/include/j721e.inc | 6 ++++--
> meta-ti-bsp/conf/machine/include/j721s2.inc | 6 ++++--
> meta-ti-bsp/conf/machine/include/j784s4.inc | 6 ++++--
> meta-ti-bsp/conf/machine/include/k3.inc | 1 -
> meta-ti-bsp/conf/machine/j721s2-evm.conf | 1 -
> meta-ti-bsp/conf/machine/j784s4-evm.conf | 4 ----
> 9 files changed, 17 insertions(+), 12 deletions(-)
>
> diff --git a/meta-ti-bsp/conf/machine/include/am64xx.inc b/meta-ti-bsp/conf/machine/include/am64xx.inc
> index 7c46b630..f1a91991 100644
> --- a/meta-ti-bsp/conf/machine/include/am64xx.inc
> +++ b/meta-ti-bsp/conf/machine/include/am64xx.inc
> @@ -32,4 +32,5 @@ do_image_wic[mcdepends] += "mc::k3r5-sr2-hs-se:ti-sci-fw:do_deploy"
> do_image_tar[mcdepends] += "mc::k3r5-sr2-hs-se:ti-sci-fw:do_deploy"
>
> TFA_BOARD = "lite"
> +
> OPTEEMACHINE = "k3-am64x"
> diff --git a/meta-ti-bsp/conf/machine/include/am65xx.inc b/meta-ti-bsp/conf/machine/include/am65xx.inc
> index 14e0d07f..88259717 100644
> --- a/meta-ti-bsp/conf/machine/include/am65xx.inc
> +++ b/meta-ti-bsp/conf/machine/include/am65xx.inc
> @@ -37,4 +37,6 @@ IMAGE_BOOT_FILES += "sysfw-am65x-evm.itb"
> do_image_wic[mcdepends] += "mc::k3r5-sr2:ti-sci-fw:do_deploy"
> do_image_tar[mcdepends] += "mc::k3r5-sr2:ti-sci-fw:do_deploy"
>
> +TFA_BOARD = "generic"
> +
> OPTEEMACHINE = "k3-am65x"
> diff --git a/meta-ti-bsp/conf/machine/include/j7200.inc b/meta-ti-bsp/conf/machine/include/j7200.inc
> index 1eaf7806..d21e26cc 100644
> --- a/meta-ti-bsp/conf/machine/include/j7200.inc
> +++ b/meta-ti-bsp/conf/machine/include/j7200.inc
> @@ -1,4 +1,6 @@
> require conf/machine/include/k3.inc
> SOC_FAMILY:append = ":j7200"
>
> +TFA_BOARD = "generic"
> +
> OPTEEMACHINE = "k3-j721e"
> diff --git a/meta-ti-bsp/conf/machine/include/j721e.inc b/meta-ti-bsp/conf/machine/include/j721e.inc
> index 34569a01..12ee0c90 100644
> --- a/meta-ti-bsp/conf/machine/include/j721e.inc
> +++ b/meta-ti-bsp/conf/machine/include/j721e.inc
> @@ -1,8 +1,6 @@
> require conf/machine/include/k3.inc
> SOC_FAMILY:append = ":j721e"
>
> -OPTEEMACHINE = "k3-j721e"
> -
> MACHINE_FEATURES += "gpu"
>
> PREFERRED_PROVIDER_virtual/egl ?= "ti-img-rogue-umlibs"
> @@ -10,3 +8,7 @@ PREFERRED_PROVIDER_virtual/libgles1 ?= "ti-img-rogue-umlibs"
> PREFERRED_PROVIDER_virtual/libgles2 ?= "ti-img-rogue-umlibs"
> PREFERRED_PROVIDER_virtual/libgbm ?= "ti-img-rogue-umlibs"
> PREFERRED_PROVIDER_virtual/gpudriver ?= "ti-img-rogue-driver"
> +
> +TFA_BOARD = "generic"
> +
> +OPTEEMACHINE = "k3-j721e"
> diff --git a/meta-ti-bsp/conf/machine/include/j721s2.inc b/meta-ti-bsp/conf/machine/include/j721s2.inc
> index 2a60458e..fc6493b8 100644
> --- a/meta-ti-bsp/conf/machine/include/j721s2.inc
> +++ b/meta-ti-bsp/conf/machine/include/j721s2.inc
> @@ -1,8 +1,6 @@
> require conf/machine/include/k3.inc
> SOC_FAMILY:append = ":j721s2"
>
> -OPTEEMACHINE = "k3-j721e"
> -
> MACHINE_FEATURES += "gpu"
>
> PREFERRED_PROVIDER_virtual/egl ?= "ti-img-rogue-umlibs"
> @@ -10,3 +8,7 @@ PREFERRED_PROVIDER_virtual/libgles1 ?= "ti-img-rogue-umlibs"
> PREFERRED_PROVIDER_virtual/libgles2 ?= "ti-img-rogue-umlibs"
> PREFERRED_PROVIDER_virtual/libgbm ?= "ti-img-rogue-umlibs"
> PREFERRED_PROVIDER_virtual/gpudriver ?= "ti-img-rogue-driver"
> +
> +TFA_BOARD = "generic"
> +
> +OPTEEMACHINE = "k3-j784s4"
> diff --git a/meta-ti-bsp/conf/machine/include/j784s4.inc b/meta-ti-bsp/conf/machine/include/j784s4.inc
> index e2f053ac..d268b810 100644
> --- a/meta-ti-bsp/conf/machine/include/j784s4.inc
> +++ b/meta-ti-bsp/conf/machine/include/j784s4.inc
> @@ -1,8 +1,6 @@
> require conf/machine/include/k3.inc
> SOC_FAMILY:append = ":j784s4"
>
> -OPTEEMACHINE = "k3-j721e"
> -
> MACHINE_FEATURES += "gpu"
>
> PREFERRED_PROVIDER_virtual/egl ?= "ti-img-rogue-umlibs"
> @@ -10,3 +8,7 @@ PREFERRED_PROVIDER_virtual/libgles1 ?= "ti-img-rogue-umlibs"
> PREFERRED_PROVIDER_virtual/libgles2 ?= "ti-img-rogue-umlibs"
> PREFERRED_PROVIDER_virtual/libgbm ?= "ti-img-rogue-umlibs"
> PREFERRED_PROVIDER_virtual/gpudriver ?= "ti-img-rogue-driver"
> +
> +TFA_BOARD = "j784s4"
Just wanted to check that it is the correct TFA_BOARD used here. I know that
you are simply moving the existing value from EVM to SOC config, but I still
wonder that we have these inconsistent values for all the K3 platforms:
1. generic
2. lite
3. j784s4
> +
> +OPTEEMACHINE = "k3-j784s4"
> diff --git a/meta-ti-bsp/conf/machine/include/k3.inc b/meta-ti-bsp/conf/machine/include/k3.inc
> index 84afd2e2..bd71becf 100644
> --- a/meta-ti-bsp/conf/machine/include/k3.inc
> +++ b/meta-ti-bsp/conf/machine/include/k3.inc
> @@ -29,7 +29,6 @@ UBOOT_SUFFIX = "img"
> EXTRA_IMAGEDEPENDS += "virtual/bootloader"
>
> TFA_PLATFORM = "k3"
> -TFA_BOARD = "generic"
>
> # Use the expected value of the ubifs filesystem's volume name in the kernel
> # and u-boot.
> diff --git a/meta-ti-bsp/conf/machine/j721s2-evm.conf b/meta-ti-bsp/conf/machine/j721s2-evm.conf
> index 37353df4..46d5dbf6 100644
> --- a/meta-ti-bsp/conf/machine/j721s2-evm.conf
> +++ b/meta-ti-bsp/conf/machine/j721s2-evm.conf
> @@ -7,7 +7,6 @@ require conf/machine/include/j721s2.inc
> SERIAL_CONSOLES = "115200;ttyS2"
> SERIAL_CONSOLES_CHECK = "${SERIAL_CONSOLES}"
> TFA_K3_USART = "0x8"
> -OPTEEMACHINE = "k3-j784s4"
> OPTEE_K3_USART = "0x8"
>
> KERNEL_DEVICETREE = " \
> 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"
> -
> --
> 2.38.1
>
next prev parent reply other threads:[~2022-12-12 22:52 UTC|newest]
Thread overview: 24+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-12-07 21:43 [meta-ti][master/kirkstone][PATCH 1/7] conf: machine: Remove multi-certificate image comment Andrew Davis
2022-12-07 21:43 ` [meta-ti][master/kirkstone][PATCH 2/7] conf: machine: j784s4: Move common defines into j784s4.inc Andrew Davis
2022-12-07 21:43 ` [meta-ti][master/kirkstone][PATCH 3/7] conf: machine: Use new J7 SoC names over specific board names Andrew Davis
2022-12-12 22:43 ` Denys Dmytriyenko
2022-12-13 17:03 ` Andrew Davis
2022-12-07 21:43 ` [meta-ti][master/kirkstone][PATCH 4/7] conf: machine: Remove j7 grouping and j7.inc Andrew Davis
2022-12-07 21:43 ` [meta-ti][master/kirkstone][PATCH 5/7] conf: machine: Remove OPTEEOUTPUTMACHINE definition Andrew Davis
2022-12-12 22:47 ` Denys Dmytriyenko
2022-12-13 17:05 ` Andrew Davis
2022-12-07 21:43 ` [meta-ti][master/kirkstone][PATCH 6/7] conf: machine: Move TFA_BOARD and OPTEEMACHINE to the SoC level Andrew Davis
2022-12-12 22:51 ` Denys Dmytriyenko [this message]
2022-12-13 17:12 ` Andrew Davis
2022-12-07 21:43 ` [meta-ti][master/kirkstone][PATCH 7/7] conf: machine: Rework do_image_wic dependencies Andrew Davis
2022-12-12 22:26 ` Denys Dmytriyenko
2022-12-13 16:55 ` Andrew Davis
2023-01-18 18:36 ` Denys Dmytriyenko
2023-01-18 19:28 ` Ryan Eatmon
2023-01-18 20:55 ` Denys Dmytriyenko
[not found] ` <173B82AA29E7A438.24231@lists.yoctoproject.org>
2023-01-18 21:08 ` Denys Dmytriyenko
2023-01-18 22:30 ` Andrew Davis
2023-01-20 20:51 ` Denys Dmytriyenko
2022-12-12 22:11 ` [meta-ti][master/kirkstone][PATCH 1/7] conf: machine: Remove multi-certificate image comment Denys Dmytriyenko
2022-12-19 21:23 ` Denys Dmytriyenko
[not found] ` <17324EC0684FFDBD.29066@lists.yoctoproject.org>
2023-01-13 20:17 ` Denys Dmytriyenko
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20221212225139.GM22689@denix.org \
--to=denis@denix.org \
--cc=afd@ti.com \
--cc=denys@konsulko.com \
--cc=meta-ti@lists.yoctoproject.org \
--cc=reatmon@ti.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.