ti-pdk: clean up variables by adding TI_PDK_ prefix

* Add TI_PDK_ prefix to variables which may be set by recipes to
  stress that they are used to configure the ti-pdk class.
* Deprecate TI_PDK_XDCARGS in favor of TI_PDK_LIMIT_SOCS as both are
  used to define a list of SOCs.

Signed-off-by: Jacob Stiffler <j-stiffler@ti.com>
Cc: Justin Sobota <jsobota@ti.com>
Signed-off-by: Denys Dmytriyenko <denys@ti.com>

8 files changed, 37 insertions, 35 deletions

diff --git a/classes/ti-pdk.bbclass b/classes/ti-pdk.bbclass
index 981ec12e..45024b10 100644
--- a/classes/ti-pdk.bbclass
+++ b/classes/ti-pdk.bbclass
@@ -48,9 +48,11 @@ export PDK_INSTALL_PATH = "${PDK_INSTALL_DIR}/packages"
 export XDCPATH = "${XDC_INSTALL_DIR}/packages;${SYSBIOS_INSTALL_DIR}/packages;${PDK_INSTALL_DIR}/packages"
 export SECTTI="perl ${CG_XML_INSTALL_DIR}/ofd/sectti.pl"
 
-XDCMAKE ?= "1"
-LIMSOCS ?= ""
-LIMBOARDS ?= ""
+TI_PDK_XDCMAKE ?= "1"
+TI_PDK_LIMIT_SOCS ?= ""
+TI_PDK_LIMIT_BOARDS ?= ""
+
+TI_PDK_XDC_ARGS ?= "${TI_PDK_LIMIT_SOCS}"
 
 PARALLEL_XDC = "--jobs=${BB_NUMBER_THREADS}"
 
@@ -60,7 +62,7 @@ do_configure() {
     mkdir -p ${BUILD_DIR}
     cp -r ${S}/* ${BUILD_DIR}
 
-    if [ "${XDCMAKE}" == "1" ]
+    if [ "${TI_PDK_XDCMAKE}" == "1" ]
     then
         cd ${BUILD_DIR}
 
@@ -74,16 +76,16 @@ do_configure() {
 
 do_compile() {
 
-    if [ "${XDCMAKE}" == "1" ]
+    if [ "${TI_PDK_XDCMAKE}" == "1" ]
     then
         ${XDC_INSTALL_DIR}/xdc clean ${PARALLEL_XDC} -PR .
-        ${XDC_INSTALL_DIR}/xdc all ${PARALLEL_XDC} XDCARGS="${XDCARGS}" ROOTDIR="${ROOTDIR}" -PR .
-        ${XDC_INSTALL_DIR}/xdc release XDCARGS="${XDCARGS}" -PR .
+        ${XDC_INSTALL_DIR}/xdc all ${PARALLEL_XDC} XDCARGS="${TI_PDK_XDC_ARGS}" ROOTDIR="${ROOTDIR}" -PR .
+        ${XDC_INSTALL_DIR}/xdc release XDCARGS="${TI_PDK_XDC_ARGS}" -PR .
     else
         BUILD_DIR=${B}/`get_build_dir_bash`
         cd ${BUILD_DIR}
 
-        make release LIMIT_SOCS="${LIMSOCS}" LIMIT_BOARDS="${LIMBOARDS}"
+        make release LIMIT_SOCS="${TI_PDK_LIMIT_SOCS}" LIMIT_BOARDS="${TI_PDK_LIMIT_BOARDS}"
     fi
 }
 
diff --git a/recipes-bsp/common-csl-ip/common-csl-ip-rtos_git.bb b/recipes-bsp/common-csl-ip/common-csl-ip-rtos_git.bb
index ab848bdd..6892daa5 100644
--- a/recipes-bsp/common-csl-ip/common-csl-ip-rtos_git.bb
+++ b/recipes-bsp/common-csl-ip/common-csl-ip-rtos_git.bb
@@ -8,15 +8,15 @@ inherit ti-pdk
 DEPENDS_remove = "${PN}"
 
 # Build with make instead of XDC
-XDCMAKE = "0"
+TI_PDK_XDCMAKE = "0"
 
-LIMSOCS_ti33x = "am335x"
-LIMSOCS_ti43x = "am437x"
-LIMSOCS_omap-a15 = "am571x am572x"
-LIMSOCS_k2hk = "k2h k2k"
-LIMSOCS_k2l-evm = "k2l"
-LIMSOCS_k2e = "k2e"
-LIMSOCS_k2g = "k2g"
+TI_PDK_LIMIT_SOCS_ti33x = "am335x"
+TI_PDK_LIMIT_SOCS_ti43x = "am437x"
+TI_PDK_LIMIT_SOCS_omap-a15 = "am571x am572x"
+TI_PDK_LIMIT_SOCS_k2hk = "k2h k2k"
+TI_PDK_LIMIT_SOCS_k2l-evm = "k2l"
+TI_PDK_LIMIT_SOCS_k2e = "k2e"
+TI_PDK_LIMIT_SOCS_k2g = "k2g"
 
 export PDK_CSL_ROOT_PATH ="${WORKDIR}/build"
 export DEST_ROOT="${S}"
diff --git a/recipes-bsp/cppi-lld/cppi-lld-rtos_git.bb b/recipes-bsp/cppi-lld/cppi-lld-rtos_git.bb
index ef1d959d..f27f5e06 100644
--- a/recipes-bsp/cppi-lld/cppi-lld-rtos_git.bb
+++ b/recipes-bsp/cppi-lld/cppi-lld-rtos_git.bb
@@ -7,7 +7,7 @@ DEPENDS_append = " rm-lld-rtos \
                    qmss-lld-rtos \
 "
 
-XDCARGS_k2hk = "k2h k2k"
-XDCARGS_k2e = "k2e"
-XDCARGS_k2l-evm = "k2l"
-XDCARGS_k2g = "k2g"
+TI_PDK_LIMIT_SOCS_k2hk = "k2h k2k"
+TI_PDK_LIMIT_SOCS_k2e = "k2e"
+TI_PDK_LIMIT_SOCS_k2l-evm = "k2l"
+TI_PDK_LIMIT_SOCS_k2g = "k2g"
diff --git a/recipes-bsp/pktlib/pktlib-rtos_git.bb b/recipes-bsp/pktlib/pktlib-rtos_git.bb
index e76b445f..2cca3ea5 100644
--- a/recipes-bsp/pktlib/pktlib-rtos_git.bb
+++ b/recipes-bsp/pktlib/pktlib-rtos_git.bb
@@ -8,6 +8,6 @@ DEPENDS_append = " rm-lld-rtos \
                    cppi-lld-rtos \
 "
 
-XDCARGS_k2hk = "k2h k2k"
-XDCARGS_k2e = "k2e"
-XDCARGS_k2l-evm = "k2l"
+TI_PDK_LIMIT_SOCS_k2hk = "k2h k2k"
+TI_PDK_LIMIT_SOCS_k2e = "k2e"
+TI_PDK_LIMIT_SOCS_k2l-evm = "k2l"
diff --git a/recipes-bsp/qmss-lld/qmss-lld-rtos_git.bb b/recipes-bsp/qmss-lld/qmss-lld-rtos_git.bb
index dcfacfd8..adb091af 100644
--- a/recipes-bsp/qmss-lld/qmss-lld-rtos_git.bb
+++ b/recipes-bsp/qmss-lld/qmss-lld-rtos_git.bb
@@ -6,7 +6,7 @@ PR = "${INC_PR}.0"
 
 DEPENDS_append = " rm-lld-rtos"
 
-XDCARGS_k2hk = "k2h k2k"
-XDCARGS_k2l-evm = "k2l"
-XDCARGS_k2e = "k2e"
-XDCARGS_k2g = "k2g"
+TI_PDK_LIMIT_SOCS_k2hk = "k2h k2k"
+TI_PDK_LIMIT_SOCS_k2l-evm = "k2l"
+TI_PDK_LIMIT_SOCS_k2e = "k2e"
+TI_PDK_LIMIT_SOCS_k2g = "k2g"
diff --git a/recipes-bsp/rm-lld/rm-lld-rtos_git.bb b/recipes-bsp/rm-lld/rm-lld-rtos_git.bb
index c9364a3f..b5f2fd19 100644
--- a/recipes-bsp/rm-lld/rm-lld-rtos_git.bb
+++ b/recipes-bsp/rm-lld/rm-lld-rtos_git.bb
@@ -6,7 +6,7 @@ PR = "${INC_PR}.0"
 
 PACKAGE_ARCH = "${MACHINE_ARCH}"
 
-XDCARGS_k2hk = "k2h k2k"
-XDCARGS_k2e = "k2e"
-XDCARGS_k2l-evm = "k2l"
-XDCARGS_k2g = "k2g"
+TI_PDK_LIMIT_SOCS_k2hk = "k2h k2k"
+TI_PDK_LIMIT_SOCS_k2e = "k2e"
+TI_PDK_LIMIT_SOCS_k2l-evm = "k2l"
+TI_PDK_LIMIT_SOCS_k2g = "k2g"
diff --git a/recipes-ti/ipc/ipc-transport-qmss-rtos_git.bb b/recipes-ti/ipc/ipc-transport-qmss-rtos_git.bb
index 2607a140..b34cdd4c 100644
--- a/recipes-ti/ipc/ipc-transport-qmss-rtos_git.bb
+++ b/recipes-ti/ipc/ipc-transport-qmss-rtos_git.bb
@@ -17,9 +17,9 @@ IPC_TRANSPORT_QMSS_DESTSUFFIX = "git/c66/qmss"
 
 S = "${WORKDIR}/${IPC_TRANSPORT_QMSS_DESTSUFFIX}"
 
-XDCARGS_k2hk = "k2h k2k"
-XDCARGS_k2e = "k2e"
-XDCARGS_k2l-evm = "k2l"
+TI_PDK_LIMIT_SOCS_k2hk = "k2h k2k"
+TI_PDK_LIMIT_SOCS_k2e = "k2e"
+TI_PDK_LIMIT_SOCS_k2l-evm = "k2l"
 
 export IPC_INSTALL_PATH = "${IPC_INSTALL_DIR}"
 XDCPATH_append = ";${IPC_INSTALL_DIR}/packages"
diff --git a/recipes-ti/ipc/ipc-transport-srio-rtos_git.bb b/recipes-ti/ipc/ipc-transport-srio-rtos_git.bb
index b95d646f..19ee5c5a 100644
--- a/recipes-ti/ipc/ipc-transport-srio-rtos_git.bb
+++ b/recipes-ti/ipc/ipc-transport-srio-rtos_git.bb
@@ -18,7 +18,7 @@ IPC_TRANSPORT_SRIO_DESTSUFFIX = "git/c66/srio"
 
 S = "${WORKDIR}/${IPC_TRANSPORT_SRIO_DESTSUFFIX}"
 
-XDCARGS_k2hk = "k2h k2k"
+TI_PDK_LIMIT_SOCS_k2hk = "k2h k2k"
 
 export IPC_INSTALL_PATH = "${IPC_INSTALL_DIR}"
 XDCPATH_append = ";${IPC_INSTALL_DIR}/packages"