meta-ti: remove remaining Keystone1/2 overrides

Cleanup remaining recipes that are used by other platforms from any machine
overrides that still refer to deprecated Keystone1/2 platforms.

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

9 files changed, 5 insertions, 67 deletions

diff --git a/recipes-ti/ctoolslib/libaet_git.bb b/recipes-ti/ctoolslib/libaet_git.bb
index 6d6680f0..c15ab229 100644
--- a/recipes-ti/ctoolslib/libaet_git.bb
+++ b/recipes-ti/ctoolslib/libaet_git.bb
@@ -17,7 +17,6 @@ S = "${WORKDIR}/git/aet"
 
 DEVICE=""
 DEVICE:dra7xx = "DRA7xx"
-DEVICE:keystone = "C66AK2Hxx"
 
 EXTRA_OEMAKE = "C6X_C_DIR=${STAGING_DIR_NATIVE}/usr/share/ti/cgt-c6x/include"
 
@@ -29,7 +28,7 @@ do_install() {
     install -m 0644 ${S}/build/c66/libaet.ae66 ${D}${datadir}/ti/ctoolslib/aet/lib/
 }
 
-COMPATIBLE_MACHINE = "dra7xx|keystone"
+COMPATIBLE_MACHINE = "dra7xx"
 PACKAGE_ARCH = "${MACHINE_ARCH}"
 
 FILES:${PN}-dev += "\
diff --git a/recipes-ti/imglib/imglib-c66x.inc b/recipes-ti/imglib/imglib-c66x.inc
index 82fea284..ab5cbdb6 100644
--- a/recipes-ti/imglib/imglib-c66x.inc
+++ b/recipes-ti/imglib/imglib-c66x.inc
@@ -7,7 +7,7 @@ require ../includes/ti-paths.inc
 require ../includes/ti-staging.inc
 require ../includes/ti-unpack.inc
 
-COMPATIBLE_MACHINE = "omap-a15|keystone"
+COMPATIBLE_MACHINE = "omap-a15"
 
 SRC_URI = "http://software-dl.ti.com/sdoemb/sdoemb_public_sw/imglib/${PV}/exports/${BINFILE};name=imglib"
 
diff --git a/recipes-ti/ipc/ti-ipc-common.inc b/recipes-ti/ipc/ti-ipc-common.inc
index 1879a3f2..4962a3ec 100644
--- a/recipes-ti/ipc/ti-ipc-common.inc
+++ b/recipes-ti/ipc/ti-ipc-common.inc
@@ -7,13 +7,6 @@ COMPATIBLE_HOST:ti-soc = "(.*)"
 
 PLATFORM = "UNKNOWN"
 PLATFORM:dra7xx = "DRA7XX"
-PLATFORM:k2hk = "TCI6638"
-PLATFORM:k2l = "TCI6630"
-PLATFORM:k2e = "66AK2E"
-PLATFORM:k2g = "66AK2G"
 PLATFORM:omapl138 = "OMAPL138"
-PLATFORM_c667x-evm = "C6678"
-PLATFORM_c665x-evm = "C6678"
 
-ALT_PLATFORM:k2hk = "TCI6636"
 ALT_PLATFORM:am57xx-evm = "AM572X AM571X"
diff --git a/recipes-ti/ipc/ti-ipc-rtos.inc b/recipes-ti/ipc/ti-ipc-rtos.inc
index a43d6935..56667ad1 100644
--- a/recipes-ti/ipc/ti-ipc-rtos.inc
+++ b/recipes-ti/ipc/ti-ipc-rtos.inc
@@ -41,17 +41,12 @@ RELEASE_SUFFIX = ""
 
 PR = "${INC_PR}.r0"
 
-DEPENDS:append:keystone = " ti-cgt6x-native \
-                            gcc-arm-baremetal-native \
-"
 DEPENDS:append:omap-a15 = " ti-cgt6x-native \
                             ti-cgt-arm-native \
                             gcc-arm-baremetal-native \
 "
 DEPENDS:append:omapl138 = " ti-cgt6x-native \
 "
-DEPENDS:append:c66x = " ti-cgt6x-native \
-"
 
 IPC_TARGETS = ""
 
@@ -66,16 +61,6 @@ IPC_TARGETS:omapl138 = "\
     ti.targets.elf.C674="${STAGING_DIR_NATIVE}/usr/share/ti/cgt-c6x" \
 "
 
-IPC_TARGETS:keystone = " \
-    gnu.targets.arm.A15F="${GCC_ARM_NONE_TOOLCHAIN}" \
-    ti.targets.elf.C66="${STAGING_DIR_NATIVE}/usr/share/ti/cgt-c6x" \
-    ti.targets.elf.C66_big_endian="${STAGING_DIR_NATIVE}/usr/share/ti/cgt-c6x" \
-"
-IPC_TARGETS:c66x = " \
-    ti.targets.elf.C66="${STAGING_DIR_NATIVE}/usr/share/ti/cgt-c6x" \
-    ti.targets.elf.C66_big_endian="${STAGING_DIR_NATIVE}/usr/share/ti/cgt-c6x" \
-"
-
 PARALLEL_XDC = "${@oe.utils.parallel_make_argument(d, '--jobs=%d')}"
 EXTRA_OEMAKE = "\
     PLATFORM=${PLATFORM} \
diff --git a/recipes-ti/ipc/ti-ipc-rtos_git.bb b/recipes-ti/ipc/ti-ipc-rtos_git.bb
index 3439cab1..abef3195 100644
--- a/recipes-ti/ipc/ti-ipc-rtos_git.bb
+++ b/recipes-ti/ipc/ti-ipc-rtos_git.bb
@@ -73,34 +73,11 @@ do_install() {
 }
 
 KFDSPNUM = "0"
-KFDSPNUM:k2hk = "8"
-KFDSPNUM:k2l = "4"
-KFDSPNUM:keystone = "1"
 
 KFPLAT = ""
-KFPLAT:k2hk = "TCI6638K2K"
-KFPLAT:k2l = "TCI6630K2L"
-KFPLAT:k2e = "C66AK2E"
-KFPLAT:k2g = "TCI66AK2G02"
 
 ALTERNATIVE_PRIORITY = "5"
 
-pkg_postinst:${PN}-fw:keystone () {
-  i=0
-  while [ $i -lt ${KFDSPNUM} ]; do
-    update-alternatives --install /lib/firmware/keystone-dsp$i-fw keystone-dsp$i-fw ipc/ti_platforms_evm${KFPLAT}_core0/messageq_single.xe66 ${ALTERNATIVE_PRIORITY}
-    i=$(($i + 1))
-  done
-}
-
-pkg_postrm:${PN}-fw:keystone () {
-  i=0
-  while [ $i -lt ${KFDSPNUM} ]; do
-    update-alternatives --remove keystone-dsp$i-fw ipc/ti_platforms_evm${KFPLAT}_core0/messageq_single.xe66
-    i=$(($i + 1))
-  done
-}
-
 pkg_postinst:${PN}-fw:omap-a15 () {
   update-alternatives --install /lib/firmware/dra7-dsp1-fw.xe66 dra7-dsp1-fw.xe66 ipc/ti_platforms_evmDRA7XX_dsp1/test_omx_dsp1_vayu.xe66 ${ALTERNATIVE_PRIORITY}
   update-alternatives --install /lib/firmware/dra7-dsp2-fw.xe66 dra7-dsp2-fw.xe66 ipc/ti_platforms_evmDRA7XX_dsp2/test_omx_dsp2_vayu.xe66 ${ALTERNATIVE_PRIORITY}
diff --git a/recipes-ti/ipc/ti-ipc_git.bb b/recipes-ti/ipc/ti-ipc_git.bb
index ed712bab..01b857c2 100644
--- a/recipes-ti/ipc/ti-ipc_git.bb
+++ b/recipes-ti/ipc/ti-ipc_git.bb
@@ -16,10 +16,6 @@ SRC_URI += "file://tiipclad-daemon.sh \
 
 DAEMON = "UNKNOWN"
 DAEMON:dra7xx = "lad_dra7xx"
-DAEMON:k2hk = "lad_tci6638"
-DAEMON:k2l = "lad_tci6630"
-DAEMON:k2e = "lad_66ak2e"
-DAEMON:k2g = "lad_66ak2g"
 DAEMON:omapl138 = "lad_omapl138"
 
 inherit autotools-brokensep pkgconfig update-rc.d systemd
diff --git a/recipes-ti/openmp-rtos/openmp-rtos_git.bb b/recipes-ti/openmp-rtos/openmp-rtos_git.bb
index 119c070a..59a9635d 100644
--- a/recipes-ti/openmp-rtos/openmp-rtos_git.bb
+++ b/recipes-ti/openmp-rtos/openmp-rtos_git.bb
@@ -24,11 +24,8 @@ SRCREV = "c090eb664d9815a36ead0e14f31e102590680fb8"
 LIC_FILES_CHKSUM = "file://docs/license/omp_manifest_template.html;md5=61a6972303c0447b7c056195d7ebafee"
 
 DEPENDS = "common-csl-ip-rtos doxygen-native libulm ti-xdctools-native ti-ipc-rtos ti-sysbios ti-cgt6x-native zip-native"
-DEPENDS:append:k2hk = " qmss-lld-rtos cppi-lld-rtos"
-DEPENDS:append:k2e = " qmss-lld-rtos cppi-lld-rtos"
-DEPENDS:append:k2l = " qmss-lld-rtos cppi-lld-rtos"
 
-COMPATIBLE_MACHINE = "keystone|omap-a15"
+COMPATIBLE_MACHINE = "omap-a15"
 PACKAGE_ARCH = "${MACHINE_ARCH}"
 
 S = "${WORKDIR}/git"
@@ -38,22 +35,14 @@ export BIOS_DIR = "${SYSBIOS_INSTALL_DIR}"
 export ULM_DIR ="${STAGING_DIR_TARGET}/usr/share/ti/ulm"
 export C6636_PDK_DIR ="${PDK_INSTALL_DIR}"
 export AM572_PDK_DIR ="${PDK_INSTALL_DIR}"
-export K2G_PDK_DIR ="${PDK_INSTALL_DIR}"
 export XDCCGROOT = "${STAGING_DIR_NATIVE}/usr/share/ti/cgt-c6x"
 
-export BUILD_K2H = "0"
 export BUILD_AM572 = "0"
-export BUILD_K2G = "0"
 
-BUILD_K2H:keystone = "1"
 BUILD_AM572:omap-a15 = "1"
-BUILD_K2H:k2g = "0"
-BUILD_K2G:k2g = "1"
 
 RELEASE_TARGET = ""
-RELEASE_TARGET:keystone = "k2x"
 RELEASE_TARGET:omap-a15 = "am57xx"
-RELEASE_TARGET:k2g = "k2g"
 
 do_compile() {
     make -f utils/product/Makefile .zipfile
diff --git a/recipes-ti/uio-test-pruss/uio-test-pruss_git.bb b/recipes-ti/uio-test-pruss/uio-test-pruss_git.bb
index b5186e0c..59576daa 100644
--- a/recipes-ti/uio-test-pruss/uio-test-pruss_git.bb
+++ b/recipes-ti/uio-test-pruss/uio-test-pruss_git.bb
@@ -21,7 +21,7 @@ SRCREV = "${UIO_TEST_PRUSS_SRCREV}"
 
 PR = "r0"
 
-COMPATIBLE_MACHINE = "omap-a15|ti33x|ti43x|k2g"
+COMPATIBLE_MACHINE = "omap-a15|ti33x|ti43x"
 
 PACKAGE_ARCH = "${MACHINE_ARCH}"
 
@@ -29,7 +29,6 @@ DEVICE_NAME = ""
 DEVICE_NAME:append:am57xx-evm = "am57xx"
 DEVICE_NAME:append:ti33x = "am33xx"
 DEVICE_NAME:append:ti43x = "am43xx"
-DEVICE_NAME:append:k2g = "k2g"
 
 EXTRA_OEMAKE = "CGT_PRU=${TI_CGT_PRU_INSTALL_DIR} DEVICE=${DEVICE_NAME}"
 
diff --git a/recipes-ti/vlib/vlib-c66x.inc b/recipes-ti/vlib/vlib-c66x.inc
index 9ab9c506..460964b3 100644
--- a/recipes-ti/vlib/vlib-c66x.inc
+++ b/recipes-ti/vlib/vlib-c66x.inc
@@ -7,7 +7,7 @@ require ../includes/ti-paths.inc
 require ../includes/ti-staging.inc
 require ../includes/ti-eula-unpack.inc
 
-COMPATIBLE_MACHINE = "omap-a15|keystone"
+COMPATIBLE_MACHINE = "omap-a15"
 
 SRC_URI = "http://software-dl.ti.com/libs/vlib/${PV}//exports/vlib_c66x_obj_${PV}_Linux.bin;name=vlibbin"