conf: switch k3r5 multiconfig to baremetal

There are couple of k3r5 components that need to be built for the target
and they are self-contained and don't use glibc. Moreover, when building
a cross-compile toolchain for k3r5, there's no need to build glibc and
all its dependencies. While build-time speed up is nice, the main benefit
comes when packaging a nativesdk toolchain for distribution, reducing the
number of packages and the resulting size of the toolchain installer.

To avoid potential namespace conflict in package feeds between nativesdk
binary packages of Linux glibc and k3r5 baremetal toolchains, adjust the
package suffix accordingly.

This also requires a rather impactful change in the deployment structure,
which affects CIs and user experience. By default different TCLIBC builds
(e.g. glibc and baremetal in this case) are built in separate TMPDIRs to
avoid conflicts, especially on the nativesdk side. Also the default config
has DEPLOY_DIR residing under corresponding TMPDIR. Of course, this can be
changed by local.conf or <distro>.conf, which meta-ti-bsp has no control
over. Unlike multiconfig-image-packager example that can access deployed
artifacts across multiconfigs to package in an image, we use wic and its
IMAGE_BOOT_FILES list to package a final image. Unfortunately, wic cannot
access deployed artifacts across multiconfigs in separate TMPDIRs, as it
uses DEPLOY_DIR_IMAGE to collect the artifacts. To overcome this, we need
to set up a "common" deploy directory for images and sdks produced by
multiconfigs, which is located outside of TMPDIRs, set by TI_COMMON_DEPLOY
variable that can be changed or adjusted by distros as needed.

Signed-off-by: Denys Dmytriyenko <denys@konsulko.com>
Signed-off-by: Ryan Eatmon <reatmon@ti.com>

2 files changed, 7 insertions, 1 deletions

diff --git a/meta-ti-bsp/conf/layer.conf b/meta-ti-bsp/conf/layer.conf
index ea6a12fa..68651b8d 100644
--- a/meta-ti-bsp/conf/layer.conf
+++ b/meta-ti-bsp/conf/layer.conf
@@ -27,3 +27,7 @@ SIGGEN_EXCLUDERECIPES_ABISAFE += " \
 "
 
 HOSTTOOLS_NONFATAL += "truncate xxd comm"
+
+TI_COMMON_DEPLOY ?= "${TOPDIR}/deploy-ti"
+DEPLOY_DIR_IMAGE:ti-soc = "${TI_COMMON_DEPLOY}/images/${MACHINE}"
+SDK_DEPLOY:ti-soc = "${TI_COMMON_DEPLOY}/sdk"
diff --git a/meta-ti-bsp/conf/multiconfig/k3r5.conf b/meta-ti-bsp/conf/multiconfig/k3r5.conf
index deb07210..04b9a746 100644
--- a/meta-ti-bsp/conf/multiconfig/k3r5.conf
+++ b/meta-ti-bsp/conf/multiconfig/k3r5.conf
@@ -1,5 +1,7 @@
 MAINMACHINE := "${MACHINE}"
 
-DEPLOY_DIR_IMAGE = "${DEPLOY_DIR}/images/${MAINMACHINE}"
+DEPLOY_DIR_IMAGE:k3r5 = "${TI_COMMON_DEPLOY}/images/${MAINMACHINE}"
 
 MACHINE:append = "-k3r5"
+TCLIBC = "baremetal"
+SDKPKGSUFFIX = "k3r5-nativesdk"