ti-recipes: Shoot ti-multimedia-common.inc, move inside ti-paths.inc

   * Following cleanup, ti-paths is empty and simply includes ti-multimedia-common
   * Move ti-multimedia-common into ti-paths and shoot ti-multimedia-common
   * Fix recipe references that directly reference ti-multimedia-common

Signed-off-by: Roger Monk <r-monk@ti.com>
Signed-off-by: Koen Kooi <k-kooi@ti.com>

5 files changed, 44 insertions, 46 deletions

diff --git a/recipes/ti/README b/recipes/ti/README
index c239d233bc..eed00f0253 100644
--- a/recipes/ti/README
+++ b/recipes/ti/README
@@ -32,7 +32,7 @@ PACKAGE_ARCH = "${MACHINE_ARCH}"
 BASEPKG_HOST_SYS = "${MULTIMACH_HOST_SYS}"
 INHIBIT_PACKAGE_STRIP = "1"
 
-The 'BASEPKG_HOST_SYS' bit is what makes it work, but cause trouble is you want to read from it, so ti-multimedia-common.inc does:
+The 'BASEPKG_HOST_SYS' bit is what makes it work, but cause trouble is you want to read from it, so ti-paths.inc does:
 
 export CODEGEN_INSTALL_DIR_RECIPE    = "${installdir}/ti-cgt6x"
 export CODEGEN_INSTALL_DIR    = "${STAGING_DIR}/${MULTIMACH_TARGET_SYS}/${CODEGEN_INSTALL_DIR_RECIPE}"
diff --git a/recipes/ti/ti-dvsdk-demos.inc b/recipes/ti/ti-dvsdk-demos.inc
index 91d5e786ba..99e9875dd1 100644
--- a/recipes/ti/ti-dvsdk-demos.inc
+++ b/recipes/ti/ti-dvsdk-demos.inc
@@ -11,7 +11,7 @@ SRC_URI = "${BASE_SRC_URI}/dvsdk_demos_${PV}.tar.gz;name=dvsdkdemostarball"
 
 S = "${WORKDIR}/dvsdk_demos_${PV}"
 
-require ti-multimedia-common.inc
+require ti-paths.inc
 
 DEMOSPLATFORM_dm355    = "dm355"
 DEMOSPLATFORM_dm365    = "dm365"
diff --git a/recipes/ti/ti-linuxutils.inc b/recipes/ti/ti-linuxutils.inc
index 4ab6cfe4dd..3482d707ab 100644
--- a/recipes/ti/ti-linuxutils.inc
+++ b/recipes/ti/ti-linuxutils.inc
@@ -7,7 +7,7 @@ SRC_URI = "${BASE_SRC_URI}/linuxutils_${PV}.tar.gz "
 
 S = "${WORKDIR}/linuxutils_${PV}"
 
-require ti-multimedia-common.inc
+require ti-paths.inc
 require ti-staging.inc
 
 #This is a kernel module, don't set PR directly
diff --git a/recipes/ti/ti-multimedia-common.inc b/recipes/ti/ti-multimedia-common.inc
deleted file mode 100644
index d3d1b980f9..0000000000
--- a/recipes/ti/ti-multimedia-common.inc
+++ /dev/null
@@ -1,42 +0,0 @@
-installdir = "${datadir}/ti"
-
-# This is where do_install will put it
-export CODEGEN_INSTALL_DIR_RECIPE    = "${installdir}/ti-cgt6x-tree"
-export XDC_INSTALL_DIR_RECIPE        = "${installdir}/ti-xdctools-tree"
-export XDAIS_INSTALL_DIR_RECIPE      = "${installdir}/ti-xdais-tree"
-export BIOS_INSTALL_DIR_RECIPE       = "${installdir}/ti-dspbios-tree"
-export SYSBIOS_INSTALL_DIR_RECIPE    = "${installdir}/ti-sysbios-tree"
-export BIOSUTILS_INSTALL_DIR_RECIPE  = "${installdir}/ti-biosutils-tree"
-export FC_INSTALL_DIR_RECIPE         = "${installdir}/ti-framework-components-tree"
-export CE_INSTALL_DIR_RECIPE         = "${installdir}/ti-codec-engine-tree"
-export EDMA3_LLD_INSTALL_DIR_RECIPE  = "${installdir}/ti-edma3lld-tree"
-export LINUXUTILS_INSTALL_DIR_RECIPE = "${installdir}/ti-linuxutils-tree"
-export CMEM_INSTALL_DIR_RECIPE       = "${installdir}/ti-linuxutils-tree"
-export LINK_INSTALL_DIR_RECIPE       = "${installdir}/ti-dsplink-tree/packages"
-export LPM_INSTALL_DIR_RECIPE        = "${installdir}/ti-local-power-manager-tree"
-export DMAI_INSTALL_DIR_RECIPE       = "${installdir}/ti-dmai-tree"
-export CODEC_INSTALL_DIR_RECIPE      = "${installdir}/ti-codecs-tree"
-export DSPLIB_INSTALL_DIR_RECIPE     = "${installdir}/ti-dsplib-tree"
-
-# This is where the tools will end up in staging provided PACKAGE_ARCH = ${MACHINE_ARCH} is set
-export CODEGEN_INSTALL_DIR    = "${STAGING_DIR}/${MULTIMACH_TARGET_SYS}${CODEGEN_INSTALL_DIR_RECIPE}"
-export XDC_INSTALL_DIR        = "${STAGING_DIR}/${MULTIMACH_TARGET_SYS}${XDC_INSTALL_DIR_RECIPE}"
-export XDAIS_INSTALL_DIR      = "${STAGING_DIR}/${MULTIMACH_TARGET_SYS}${XDAIS_INSTALL_DIR_RECIPE}"
-export BIOS_INSTALL_DIR       = "${STAGING_DIR}/${MULTIMACH_TARGET_SYS}${BIOS_INSTALL_DIR_RECIPE}"
-export SYSBIOS_INSTALL_DIR    = "${STAGING_DIR}/${MULTIMACH_TARGET_SYS}${SYSBIOS_INSTALL_DIR_RECIPE}"
-export BIOSUTILS_INSTALL_DIR  = "${STAGING_DIR}/${MULTIMACH_TARGET_SYS}${BIOSUTILS_INSTALL_DIR_RECIPE}"
-export FC_INSTALL_DIR         = "${STAGING_DIR}/${MULTIMACH_TARGET_SYS}${FC_INSTALL_DIR_RECIPE}"
-export CE_INSTALL_DIR         = "${STAGING_DIR}/${MULTIMACH_TARGET_SYS}${CE_INSTALL_DIR_RECIPE}"
-export EDMA3_LLD_INSTALL_DIR  = "${STAGING_DIR}/${MULTIMACH_TARGET_SYS}${EDMA3_LLD_INSTALL_DIR_RECIPE}"
-export LINUXUTILS_INSTALL_DIR = "${STAGING_DIR}/${MULTIMACH_TARGET_SYS}${LINUXUTILS_INSTALL_DIR_RECIPE}"
-export CMEM_INSTALL_DIR       = "${STAGING_DIR}/${MULTIMACH_TARGET_SYS}${CMEM_INSTALL_DIR_RECIPE}"
-export LINK_INSTALL_DIR       = "${STAGING_DIR}/${MULTIMACH_TARGET_SYS}${LINK_INSTALL_DIR_RECIPE}"
-export LPM_INSTALL_DIR        = "${STAGING_DIR}/${MULTIMACH_TARGET_SYS}${LPM_INSTALL_DIR_RECIPE}"
-export DMAI_INSTALL_DIR       = "${STAGING_DIR}/${MULTIMACH_TARGET_SYS}${DMAI_INSTALL_DIR_RECIPE}"
-export CODEC_INSTALL_DIR      = "${STAGING_DIR}/${MULTIMACH_TARGET_SYS}${CODEC_INSTALL_DIR_RECIPE}"
-export DSPLIB_INSTALL_DIR     = "${STAGING_DIR}/${MULTIMACH_TARGET_SYS}${DSPLIB_INSTALL_DIR_RECIPE}"
-
-DSPSUFFIX_omapl137 = "x674"
-DSPSUFFIX_omapl138 = "x674"
-DSPSUFFIX ?= "x64P"
-
diff --git a/recipes/ti/ti-paths.inc b/recipes/ti/ti-paths.inc
index 35b1f5061b..d3d1b980f9 100644
--- a/recipes/ti/ti-paths.inc
+++ b/recipes/ti/ti-paths.inc
@@ -1,2 +1,42 @@
-require ti-multimedia-common.inc
+installdir = "${datadir}/ti"
+
+# This is where do_install will put it
+export CODEGEN_INSTALL_DIR_RECIPE    = "${installdir}/ti-cgt6x-tree"
+export XDC_INSTALL_DIR_RECIPE        = "${installdir}/ti-xdctools-tree"
+export XDAIS_INSTALL_DIR_RECIPE      = "${installdir}/ti-xdais-tree"
+export BIOS_INSTALL_DIR_RECIPE       = "${installdir}/ti-dspbios-tree"
+export SYSBIOS_INSTALL_DIR_RECIPE    = "${installdir}/ti-sysbios-tree"
+export BIOSUTILS_INSTALL_DIR_RECIPE  = "${installdir}/ti-biosutils-tree"
+export FC_INSTALL_DIR_RECIPE         = "${installdir}/ti-framework-components-tree"
+export CE_INSTALL_DIR_RECIPE         = "${installdir}/ti-codec-engine-tree"
+export EDMA3_LLD_INSTALL_DIR_RECIPE  = "${installdir}/ti-edma3lld-tree"
+export LINUXUTILS_INSTALL_DIR_RECIPE = "${installdir}/ti-linuxutils-tree"
+export CMEM_INSTALL_DIR_RECIPE       = "${installdir}/ti-linuxutils-tree"
+export LINK_INSTALL_DIR_RECIPE       = "${installdir}/ti-dsplink-tree/packages"
+export LPM_INSTALL_DIR_RECIPE        = "${installdir}/ti-local-power-manager-tree"
+export DMAI_INSTALL_DIR_RECIPE       = "${installdir}/ti-dmai-tree"
+export CODEC_INSTALL_DIR_RECIPE      = "${installdir}/ti-codecs-tree"
+export DSPLIB_INSTALL_DIR_RECIPE     = "${installdir}/ti-dsplib-tree"
+
+# This is where the tools will end up in staging provided PACKAGE_ARCH = ${MACHINE_ARCH} is set
+export CODEGEN_INSTALL_DIR    = "${STAGING_DIR}/${MULTIMACH_TARGET_SYS}${CODEGEN_INSTALL_DIR_RECIPE}"
+export XDC_INSTALL_DIR        = "${STAGING_DIR}/${MULTIMACH_TARGET_SYS}${XDC_INSTALL_DIR_RECIPE}"
+export XDAIS_INSTALL_DIR      = "${STAGING_DIR}/${MULTIMACH_TARGET_SYS}${XDAIS_INSTALL_DIR_RECIPE}"
+export BIOS_INSTALL_DIR       = "${STAGING_DIR}/${MULTIMACH_TARGET_SYS}${BIOS_INSTALL_DIR_RECIPE}"
+export SYSBIOS_INSTALL_DIR    = "${STAGING_DIR}/${MULTIMACH_TARGET_SYS}${SYSBIOS_INSTALL_DIR_RECIPE}"
+export BIOSUTILS_INSTALL_DIR  = "${STAGING_DIR}/${MULTIMACH_TARGET_SYS}${BIOSUTILS_INSTALL_DIR_RECIPE}"
+export FC_INSTALL_DIR         = "${STAGING_DIR}/${MULTIMACH_TARGET_SYS}${FC_INSTALL_DIR_RECIPE}"
+export CE_INSTALL_DIR         = "${STAGING_DIR}/${MULTIMACH_TARGET_SYS}${CE_INSTALL_DIR_RECIPE}"
+export EDMA3_LLD_INSTALL_DIR  = "${STAGING_DIR}/${MULTIMACH_TARGET_SYS}${EDMA3_LLD_INSTALL_DIR_RECIPE}"
+export LINUXUTILS_INSTALL_DIR = "${STAGING_DIR}/${MULTIMACH_TARGET_SYS}${LINUXUTILS_INSTALL_DIR_RECIPE}"
+export CMEM_INSTALL_DIR       = "${STAGING_DIR}/${MULTIMACH_TARGET_SYS}${CMEM_INSTALL_DIR_RECIPE}"
+export LINK_INSTALL_DIR       = "${STAGING_DIR}/${MULTIMACH_TARGET_SYS}${LINK_INSTALL_DIR_RECIPE}"
+export LPM_INSTALL_DIR        = "${STAGING_DIR}/${MULTIMACH_TARGET_SYS}${LPM_INSTALL_DIR_RECIPE}"
+export DMAI_INSTALL_DIR       = "${STAGING_DIR}/${MULTIMACH_TARGET_SYS}${DMAI_INSTALL_DIR_RECIPE}"
+export CODEC_INSTALL_DIR      = "${STAGING_DIR}/${MULTIMACH_TARGET_SYS}${CODEC_INSTALL_DIR_RECIPE}"
+export DSPLIB_INSTALL_DIR     = "${STAGING_DIR}/${MULTIMACH_TARGET_SYS}${DSPLIB_INSTALL_DIR_RECIPE}"
+
+DSPSUFFIX_omapl137 = "x674"
+DSPSUFFIX_omapl138 = "x674"
+DSPSUFFIX ?= "x64P"