From: Andrew Davis <afd@ti.com>
To: Denys Dmytriyenko <denys@konsulko.com>,
Ryan Eatmon <reatmon@ti.com>, <meta-ti@lists.yoctoproject.org>
Cc: Andrew Davis <afd@ti.com>
Subject: [meta-ti][master/kirkstone][PATCH 4/7] conf: machine: Remove j7 grouping and j7.inc
Date: Wed, 7 Dec 2022 15:43:09 -0600 [thread overview]
Message-ID: <20221207214312.21735-4-afd@ti.com> (raw)
In-Reply-To: <20221207214312.21735-1-afd@ti.com>
J7 is an unneeded level of grouping that is now causing issues and
leading to mistakes when adding new J7 based platforms. Each J7x
family device should use the SoC name specifically to prevent
accidentally adding or removing features that are not meant
for the new SoC.
Signed-off-by: Andrew Davis <afd@ti.com>
---
meta-ti-bsp/conf/machine/include/j7.inc | 5 -----
meta-ti-bsp/conf/machine/include/j7200.inc | 5 ++++-
meta-ti-bsp/conf/machine/include/j721e.inc | 5 ++++-
meta-ti-bsp/conf/machine/include/j721s2.inc | 5 ++++-
meta-ti-bsp/conf/machine/include/j784s4.inc | 5 ++++-
5 files changed, 16 insertions(+), 9 deletions(-)
delete mode 100644 meta-ti-bsp/conf/machine/include/j7.inc
diff --git a/meta-ti-bsp/conf/machine/include/j7.inc b/meta-ti-bsp/conf/machine/include/j7.inc
deleted file mode 100644
index cf4cc440..00000000
--- a/meta-ti-bsp/conf/machine/include/j7.inc
+++ /dev/null
@@ -1,5 +0,0 @@
-require conf/machine/include/k3.inc
-SOC_FAMILY:append = ":j7"
-
-OPTEEMACHINE = "k3-j721e"
-OPTEEOUTPUTMACHINE = "k3"
diff --git a/meta-ti-bsp/conf/machine/include/j7200.inc b/meta-ti-bsp/conf/machine/include/j7200.inc
index ce88567c..3aedb3f8 100644
--- a/meta-ti-bsp/conf/machine/include/j7200.inc
+++ b/meta-ti-bsp/conf/machine/include/j7200.inc
@@ -1,2 +1,5 @@
-require conf/machine/include/j7.inc
+require conf/machine/include/k3.inc
SOC_FAMILY:append = ":j7200"
+
+OPTEEMACHINE = "k3-j721e"
+OPTEEOUTPUTMACHINE = "k3"
diff --git a/meta-ti-bsp/conf/machine/include/j721e.inc b/meta-ti-bsp/conf/machine/include/j721e.inc
index fe260178..8a6c2bec 100644
--- a/meta-ti-bsp/conf/machine/include/j721e.inc
+++ b/meta-ti-bsp/conf/machine/include/j721e.inc
@@ -1,6 +1,9 @@
-require conf/machine/include/j7.inc
+require conf/machine/include/k3.inc
SOC_FAMILY:append = ":j721e"
+OPTEEMACHINE = "k3-j721e"
+OPTEEOUTPUTMACHINE = "k3"
+
MACHINE_FEATURES += "gpu"
PREFERRED_PROVIDER_virtual/egl ?= "ti-img-rogue-umlibs"
diff --git a/meta-ti-bsp/conf/machine/include/j721s2.inc b/meta-ti-bsp/conf/machine/include/j721s2.inc
index 5cd74683..4959ad8f 100644
--- a/meta-ti-bsp/conf/machine/include/j721s2.inc
+++ b/meta-ti-bsp/conf/machine/include/j721s2.inc
@@ -1,6 +1,9 @@
-require conf/machine/include/j7.inc
+require conf/machine/include/k3.inc
SOC_FAMILY:append = ":j721s2"
+OPTEEMACHINE = "k3-j721e"
+OPTEEOUTPUTMACHINE = "k3"
+
MACHINE_FEATURES += "gpu"
PREFERRED_PROVIDER_virtual/egl ?= "ti-img-rogue-umlibs"
diff --git a/meta-ti-bsp/conf/machine/include/j784s4.inc b/meta-ti-bsp/conf/machine/include/j784s4.inc
index d7a598d6..83d7c760 100644
--- a/meta-ti-bsp/conf/machine/include/j784s4.inc
+++ b/meta-ti-bsp/conf/machine/include/j784s4.inc
@@ -1,6 +1,9 @@
-require conf/machine/include/j7.inc
+require conf/machine/include/k3.inc
SOC_FAMILY:append = ":j784s4"
+OPTEEMACHINE = "k3-j721e"
+OPTEEOUTPUTMACHINE = "k3"
+
MACHINE_FEATURES += "gpu"
PREFERRED_PROVIDER_virtual/egl ?= "ti-img-rogue-umlibs"
--
2.38.1
next prev parent reply other threads:[~2022-12-07 21:43 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 ` Andrew Davis [this message]
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
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=20221207214312.21735-4-afd@ti.com \
--to=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.