conf: machine: Remove j7 grouping and j7.inc

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>
Signed-off-by: Ryan Eatmon <reatmon@ti.com>

5 files changed, 16 insertions, 9 deletions

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"