meta-agl-bsp: Update J7 EVM support for Kirkstone

Changes:
- Rename machine template and related files to use j721e-evm instead
  of j7-evm to match meta-ti change.
- Update machine template to point into new meta-ti-bsp layer in the
  meta-ti repository.
- Drop local multiconfig TMPDIR tweak as it seems unrequired now,
  and is triggering a build failure around sysroot population that
  needs further investigation.  It may be added back in the future
  if the single TMPDIR again proves to have issues.

Bug-AGL: SPEC-3819

Signed-off-by: Scott Murray <scott.murray@konsulko.com>
Change-Id: I8c2717bb749735cfe36d86b48e3c61b1cca990e4

7 files changed, 20 insertions, 28 deletions

diff --git a/meta-agl-bsp/conf/include/agl_j7-evm.inc b/meta-agl-bsp/conf/include/agl_j7-evm.inc
deleted file mode 100644
index b394aa5ee..000000000
--- a/meta-agl-bsp/conf/include/agl_j7-evm.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-# j7-evm has a k3r5 BBMULTICONFIG to build its bootloader firmware,
-# need to use an override to set DEFAULTTUNE back to what that
-# machine configuration needs.
-DEFAULTTUNE_k3r5 = "armv7athf"
-
-# Force using a separate TMPDIR for the multiconfig to avoid
-# issues (e.g. using the rm_work class currently fails with the
-# single shared TMPDIR).
-TMPDIR_k3r5 = "${TOPDIR}/tmp-${BB_CURRENT_MC}"
-# But we then also need to redefine DEPLOY_DIR for it to match
-# the existing expectations (pointing into the default config)
-DEPLOY_DIR_k3r5 = "${TOPDIR}/tmp/deploy"
-
-# Workaround for recipe assumption of poky location
-LIC_FILES_CHKSUM:pn-ti-rtos-firmware = "file://${THISDIR}/../../licenses/TI-TFL;md5=a1b59cb7ba626b9dbbcbf00f3fbc438a"
diff --git a/meta-agl-bsp/conf/include/agl_j721e-evm.inc b/meta-agl-bsp/conf/include/agl_j721e-evm.inc
new file mode 100644
index 000000000..61a4794f6
--- /dev/null
+++ b/meta-agl-bsp/conf/include/agl_j721e-evm.inc
@@ -0,0 +1,7 @@
+# j721e-evm has a k3r5 BBMULTICONFIG to build its bootloader
+# firmware, need to use an override to set DEFAULTTUNE back to
+# what that machine configuration needs.
+DEFAULTTUNE:k3r5 = "armv7athf"
+
+# Workaround for recipe assumption of poky location
+LIC_FILES_CHKSUM:pn-ti-rtos-firmware = "file://${THISDIR}/../../licenses/TI-TFL;md5=a1b59cb7ba626b9dbbcbf00f3fbc438a"
diff --git a/templates/machine/j7-evm/50_local.conf.inc b/templates/machine/j7-evm/50_local.conf.inc
deleted file mode 100644
index 1a81cb7ed..000000000
--- a/templates/machine/j7-evm/50_local.conf.inc
+++ /dev/null
@@ -1,3 +0,0 @@
-MACHINE = "j7-evm"
-#see meta-agl/meta-agl-bsp/conf/include/agl_j7-evm.inc
-require conf/include/agl_j7-evm.inc
diff --git a/templates/machine/j7-evm/README_machine_j7-evm.md b/templates/machine/j7-evm/README_machine_j7-evm.md
deleted file mode 100644
index f1441a301..000000000
--- a/templates/machine/j7-evm/README_machine_j7-evm.md
+++ /dev/null
@@ -1,9 +0,0 @@
----
-description: Machine j7-evm
-authors: Scott Murray <scott.murray@konsulko.com>
----
-
-### Machine j7-evm
-
-*Description is missing - please complete file meta-agl/templates/machine/dra7xx-evm/README_machine_j7-evm.md*
-
diff --git a/templates/machine/j7-evm/50_bblayers.conf.inc b/templates/machine/j721e-evm/50_bblayers.conf.inc
index 6152217d3..6ef08c43e 100644
--- a/templates/machine/j7-evm/50_bblayers.conf.inc
+++ b/templates/machine/j721e-evm/50_bblayers.conf.inc
@@ -1,5 +1,5 @@
 BBLAYERS =+ "\
     ${METADIR}/bsp/meta-arm/meta-arm \
     ${METADIR}/bsp/meta-arm/meta-arm-toolchain \
-    ${METADIR}/bsp/meta-ti \
+    ${METADIR}/bsp/meta-ti/meta-ti-bsp \
     "
diff --git a/templates/machine/j721e-evm/50_local.conf.inc b/templates/machine/j721e-evm/50_local.conf.inc
new file mode 100644
index 000000000..917ca73a7
--- /dev/null
+++ b/templates/machine/j721e-evm/50_local.conf.inc
@@ -0,0 +1,3 @@
+MACHINE = "j721e-evm"
+#see meta-agl/meta-agl-bsp/conf/include/agl_j721e-evm.inc
+require conf/include/agl_j721e-evm.inc
diff --git a/templates/machine/j721e-evm/README_machine_j721e-evm.md b/templates/machine/j721e-evm/README_machine_j721e-evm.md
new file mode 100644
index 000000000..c6f7320d6
--- /dev/null
+++ b/templates/machine/j721e-evm/README_machine_j721e-evm.md
@@ -0,0 +1,9 @@
+---
+description: Machine j721e-evm
+authors: Scott Murray <scott.murray@konsulko.com>
+---
+
+### Machine j721e-evm
+
+Texas Instruments J721e EVM (formerly J7 EVM).
+