From: Denys Dmytriyenko <de...@konsulko.com>

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 <de...@konsulko.com>
---
 conf/layer.conf                                    |   9 -
 recipes-bsp/dsptop/debugss-module-drv_git.bb       |   4 +-
 recipes-bsp/dsptop/dsptop_git.bb                   |   4 +-
 recipes-bsp/dsptop/libulm_git.bb                   |   3 +-
 recipes-bsp/pru/pru-icss_git.bb                    |  32 +-
 recipes-bsp/u-boot/u-boot-ti.inc                   | 126 -------
 .../uio-module-drv/uio-module-drv-test_git.bb      |  12 +-
 recipes-devtools/gdbc6x/gdbc6x_git.bb              |   2 +-
 recipes-devtools/gdbc6x/gdbserver-c6x_git.bb       |   3 +-
 .../gdbc6x/gdbserverproxy-module-drv_git.bb        |   3 +-
 recipes-kernel/linux/files/k2e/cmem.dtsi           |  36 --
 recipes-kernel/linux/files/k2e/k2e-uio.dtsi        |  32 --
 recipes-kernel/linux/files/k2g/cmem.dtsi           |  37 --
 .../linux/files/k2g/keystone-k2g-pru-uio.dtsi      | 391 ---------------------
 recipes-kernel/linux/files/k2hk/cmem.dtsi          |  37 --
 recipes-kernel/linux/files/k2hk/k2hk-uio.dtsi      |  58 ---
 recipes-kernel/linux/files/k2l/cmem.dtsi           |  37 --
 recipes-kernel/linux/files/k2l/k2l-uio.dtsi        |  10 -
 .../linux/files/keystone/keystone-uio.dtsi         | 186 ----------
 recipes-kernel/linux/kernel-rdepends.inc           |  17 -
 .../linux/linux-ti-mainline/k2g/defconfig          |   1 -
 .../linux/linux-ti-mainline/keystone/defconfig     |   1 -
 .../linux/linux-ti-staging-5.10/k2g/defconfig      |   1 -
 .../linux/linux-ti-staging-5.10/keystone/defconfig |   1 -
 .../linux/linux-ti-staging-5.4/k2g/defconfig       |   1 -
 .../linux/linux-ti-staging-5.4/keystone/defconfig  |   1 -
 .../linux/linux-ti-staging-rt-5.10/k2g/defconfig   |   1 -
 .../linux-ti-staging-rt-5.10/keystone/defconfig    |   1 -
 .../linux/linux-ti-staging-rt-5.4/k2g/defconfig    |   1 -
 .../linux-ti-staging-rt-5.4/keystone/defconfig     |   1 -
 .../linux-ti-staging-systest-5.10/k2g/defconfig    |   1 -
 .../keystone/defconfig                             |   1 -
 .../linux-ti-staging-systest-5.4/k2g/defconfig     |   1 -
 .../keystone/defconfig                             |   1 -
 recipes-kernel/linux/ti-uio.inc                    |  21 --
 recipes-ti/ctoolslib/libaet_git.bb                 |   3 +-
 recipes-ti/imglib/imglib-c66x.inc                  |   2 +-
 recipes-ti/ipc/ti-ipc-common.inc                   |   7 -
 recipes-ti/ipc/ti-ipc-rtos.inc                     |  15 -
 recipes-ti/ipc/ti-ipc-rtos_git.bb                  |  23 --
 recipes-ti/ipc/ti-ipc_git.bb                       |   4 -
 recipes-ti/openmp-rtos/openmp-rtos_git.bb          |  13 +-
 recipes-ti/uio-test-pruss/uio-test-pruss_git.bb    |   3 +-
 recipes-ti/vlib/vlib-c66x.inc                      |   2 +-
 44 files changed, 13 insertions(+), 1133 deletions(-)
 delete mode 100644 recipes-kernel/linux/files/k2e/cmem.dtsi
 delete mode 100644 recipes-kernel/linux/files/k2e/k2e-uio.dtsi
 delete mode 100644 recipes-kernel/linux/files/k2g/cmem.dtsi
 delete mode 100644 recipes-kernel/linux/files/k2g/keystone-k2g-pru-uio.dtsi
 delete mode 100644 recipes-kernel/linux/files/k2hk/cmem.dtsi
 delete mode 100644 recipes-kernel/linux/files/k2hk/k2hk-uio.dtsi
 delete mode 100644 recipes-kernel/linux/files/k2l/cmem.dtsi
 delete mode 100644 recipes-kernel/linux/files/k2l/k2l-uio.dtsi
 delete mode 100644 recipes-kernel/linux/files/keystone/keystone-uio.dtsi
 delete mode 100644 recipes-kernel/linux/linux-ti-mainline/k2g/defconfig
 delete mode 100644 recipes-kernel/linux/linux-ti-mainline/keystone/defconfig
 delete mode 100644 recipes-kernel/linux/linux-ti-staging-5.10/k2g/defconfig
 delete mode 100644 
recipes-kernel/linux/linux-ti-staging-5.10/keystone/defconfig
 delete mode 100644 recipes-kernel/linux/linux-ti-staging-5.4/k2g/defconfig
 delete mode 100644 recipes-kernel/linux/linux-ti-staging-5.4/keystone/defconfig
 delete mode 100644 recipes-kernel/linux/linux-ti-staging-rt-5.10/k2g/defconfig
 delete mode 100644 
recipes-kernel/linux/linux-ti-staging-rt-5.10/keystone/defconfig
 delete mode 100644 recipes-kernel/linux/linux-ti-staging-rt-5.4/k2g/defconfig
 delete mode 100644 
recipes-kernel/linux/linux-ti-staging-rt-5.4/keystone/defconfig
 delete mode 100644 
recipes-kernel/linux/linux-ti-staging-systest-5.10/k2g/defconfig
 delete mode 100644 
recipes-kernel/linux/linux-ti-staging-systest-5.10/keystone/defconfig
 delete mode 100644 
recipes-kernel/linux/linux-ti-staging-systest-5.4/k2g/defconfig
 delete mode 100644 
recipes-kernel/linux/linux-ti-staging-systest-5.4/keystone/defconfig

diff --git a/conf/layer.conf b/conf/layer.conf
index f399ff0..f64ac5e 100644
--- a/conf/layer.conf
+++ b/conf/layer.conf
@@ -21,15 +21,6 @@ LAYERDEPENDS_meta-ti = " \
 SIGGEN_EXCLUDERECIPES_ABISAFE += " \
     ti-sgx-ddk-km \
     ti-sgx-ddk-um \
-    cmem-mod \
-    hplib-mod \
-    gdbserverproxy-module-drv \
-    debugss-module-drv \
-    uio-module-drv \
-    mpm-transport \
-    cppi-lld \
-    qmss-lld \
-    multiprocmgr \
 "
 
 HOSTTOOLS_NONFATAL += "truncate xxd comm"
diff --git a/recipes-bsp/dsptop/debugss-module-drv_git.bb 
b/recipes-bsp/dsptop/debugss-module-drv_git.bb
index dc4cde5..a250b82 100644
--- a/recipes-bsp/dsptop/debugss-module-drv_git.bb
+++ b/recipes-bsp/dsptop/debugss-module-drv_git.bb
@@ -13,12 +13,10 @@ inherit module
 
 PLATFORM = ""
 PLATFORM:dra7xx = "DRA7xx_PLATFORM"
-PLATFORM:keystone = "KEYSTONE_PLATFORM"
-PLATFORM:k2e = "K2E_PLATFORM"
 
 EXTRA_OEMAKE = "'PLATFORM=${PLATFORM}' KVERSION=${KERNEL_VERSION} 
KERNEL_SRC=${STAGING_KERNEL_DIR}"
 
-COMPATIBLE_MACHINE = "dra7xx|keystone"
+COMPATIBLE_MACHINE = "dra7xx"
 PACKAGE_ARCH = "${MACHINE_ARCH}"
 
 include dsptop.inc
diff --git a/recipes-bsp/dsptop/dsptop_git.bb b/recipes-bsp/dsptop/dsptop_git.bb
index 9896eda..2081844 100644
--- a/recipes-bsp/dsptop/dsptop_git.bb
+++ b/recipes-bsp/dsptop/dsptop_git.bb
@@ -10,7 +10,6 @@ S = "${WORKDIR}/git/dsptop"
 
 DEVICE = ""
 DEVICE:dra7xx = "DRA7xx"
-DEVICE:keystone = "C66AK2Hxx"
 
 EXTRA_OEMAKE = "release DEVICE=${DEVICE} CROSS_COMPILE=${TARGET_PREFIX} 
CC="${CC}""
 
@@ -18,11 +17,10 @@ do_install() {
     oe_runmake install DESTDIR=${D}
 }
 
-COMPATIBLE_MACHINE = "dra7xx|keystone"
+COMPATIBLE_MACHINE = "dra7xx"
 PACKAGE_ARCH = "${MACHINE_ARCH}"
 
 RDEPENDS:${PN} = "debugss-module-drv bash"
-RDEPENDS:${PN}:append:keystone = " temperature-module-drv"
 
 include dsptop.inc
 
diff --git a/recipes-bsp/dsptop/libulm_git.bb b/recipes-bsp/dsptop/libulm_git.bb
index acefef5..f3e7ec3 100644
--- a/recipes-bsp/dsptop/libulm_git.bb
+++ b/recipes-bsp/dsptop/libulm_git.bb
@@ -13,7 +13,6 @@ S = "${WORKDIR}/git/dsptop/ulm"
 
 DEVICE=""
 DEVICE:dra7xx = "DRA7xx"
-DEVICE:keystone = "C66AK2Hxx"
 
 EXTRA_OEMAKE = "release DEVICE=${DEVICE} CROSS_COMPILE=${TARGET_PREFIX}"
 
@@ -32,7 +31,7 @@ do_install() {
     cp -f release/libtiulm.ae66 ${D}${datadir}/ti/ulm
 }
 
-COMPATIBLE_MACHINE = "dra7xx|keystone"
+COMPATIBLE_MACHINE = "dra7xx"
 PACKAGE_ARCH = "${MACHINE_ARCH}"
 
 FILES:${PN}-dev += "\
diff --git a/recipes-bsp/pru/pru-icss_git.bb b/recipes-bsp/pru/pru-icss_git.bb
index b690291..779f96f 100644
--- a/recipes-bsp/pru/pru-icss_git.bb
+++ b/recipes-bsp/pru/pru-icss_git.bb
@@ -15,7 +15,7 @@ PR = "r0"
 
 require recipes-ti/includes/ti-paths.inc
 
-COMPATIBLE_MACHINE = "ti33x|ti43x|omap-a15|k2g|k3"
+COMPATIBLE_MACHINE = "ti33x|ti43x|omap-a15|k3"
 PACKAGE_ARCH = "${MACHINE_ARCH}"
 
 PACKAGES:prepend = " \
@@ -40,7 +40,6 @@ SUBDIRS = "examples pru_cape/pru_fw lib/src labs"
 PLATFORM:ti33x = "am335x"
 PLATFORM:ti43x = "am437x"
 PLATFORM:omap-a15 = "am572x"
-PLATFORM:k2g = "k2g"
 PLATFORM:am64xx = "am64x"
 PLATFORM:am65xx = "am65x"
 PLATFORM:j7 = "j721e"
@@ -100,19 +99,6 @@ do_install:append:omap-a15() {
     done
 }
 
-do_install:append:k2g() {
-    install -m 644 ${S}/examples/${PLATFORM}/PRU_Halt/gen/PRU_Halt.out \
-                   ${D}${base_libdir}/firmware/pru
-    for i in 0 1
-    do
-        for j in 0 1
-        do
-            install -m 0644 
${S}/examples/k2g/PRU_RPMsg_Echo_Interrupt${i}_${j}/gen/PRU_RPMsg_Echo_Interrupt${i}_${j}.out
 \
-                            ${D}${base_libdir}/firmware/pru
-        done
-    done
-}
-
 do_install:append:am64xx(){
     for i in 0 1
     do
@@ -189,7 +175,6 @@ FILES:${PN}-rpmsg-echo = 
"${base_libdir}/firmware/pru/PRU_RPMsg_Echo_Interrupt*
 PRU_ICSS_ALTERNATIVES:ti33x    = "am335x-pru0-fw am335x-pru1-fw"
 PRU_ICSS_ALTERNATIVES:ti43x    = "am437x-pru0_0-fw am437x-pru0_1-fw 
am437x-pru1_0-fw am437x-pru1_1-fw"
 PRU_ICSS_ALTERNATIVES:omap-a15 = "am57xx-pru1_0-fw am57xx-pru1_1-fw 
am57xx-pru2_0-fw am57xx-pru2_1-fw"
-PRU_ICSS_ALTERNATIVES:k2g      = "k2g-pru0_0-fw k2g-pru0_1-fw k2g-pru1_0-fw 
k2g-pru1_1-fw"
 PRU_ICSS_ALTERNATIVES:am64xx   = "am64x-pru0_0-fw am64x-pru0_1-fw 
am64x-pru1_0-fw am64x-pru1_1-fw am64x-rtu0_0-fw am64x-rtu0_1-fw am64x-rtu1_0-fw 
am64x-rtu1_1-fw"
 PRU_ICSS_ALTERNATIVES:am65xx   = "am65x-pru0_0-fw am65x-pru0_1-fw 
am65x-pru1_0-fw am65x-pru1_1-fw am65x-pru2_0-fw am65x-pru2_1-fw am65x-rtu0_0-fw 
am65x-rtu0_1-fw am65x-rtu1_0-fw am65x-rtu1_1-fw am65x-rtu2_0-fw am65x-rtu2_1-fw"
 PRU_ICSS_ALTERNATIVES:j7       = "j7-pru0_0-fw j7-pru0_1-fw j7-pru1_0-fw 
j7-pru1_1-fw j7-rtu0_0-fw j7-rtu0_1-fw j7-rtu1_0-fw j7-rtu1_1-fw"
@@ -208,11 +193,6 @@ ALTERNATIVE_LINK_NAME[am57xx-pru1_1-fw] = 
"${base_libdir}/firmware/am57xx-pru1_1
 ALTERNATIVE_LINK_NAME[am57xx-pru2_0-fw] = 
"${base_libdir}/firmware/am57xx-pru2_0-fw"
 ALTERNATIVE_LINK_NAME[am57xx-pru2_1-fw] = 
"${base_libdir}/firmware/am57xx-pru2_1-fw"
 
-ALTERNATIVE_LINK_NAME[k2g-pru0_0-fw] = "${base_libdir}/firmware/k2g-pru0_0-fw"
-ALTERNATIVE_LINK_NAME[k2g-pru0_1-fw] = "${base_libdir}/firmware/k2g-pru0_1-fw"
-ALTERNATIVE_LINK_NAME[k2g-pru1_0-fw] = "${base_libdir}/firmware/k2g-pru1_0-fw"
-ALTERNATIVE_LINK_NAME[k2g-pru1_1-fw] = "${base_libdir}/firmware/k2g-pru1_1-fw"
-
 ALTERNATIVE_LINK_NAME[am64x-pru0_0-fw] = 
"${base_libdir}/firmware/am64x-pru0_0-fw"
 ALTERNATIVE_LINK_NAME[am64x-pru0_1-fw] = 
"${base_libdir}/firmware/am64x-pru0_1-fw"
 ALTERNATIVE_LINK_NAME[am64x-pru1_0-fw] = 
"${base_libdir}/firmware/am64x-pru1_0-fw"
@@ -279,11 +259,6 @@ ALTERNATIVE_TARGET_pru-icss-halt[am57xx-pru1_1-fw] = 
"${base_libdir}/firmware/pr
 ALTERNATIVE_TARGET_pru-icss-halt[am57xx-pru2_0-fw] = 
"${base_libdir}/firmware/pru/PRU_Halt.out"
 ALTERNATIVE_TARGET_pru-icss-halt[am57xx-pru2_1-fw] = 
"${base_libdir}/firmware/pru/PRU_Halt.out"
 
-ALTERNATIVE_TARGET_pru-icss-halt[k2g-pru0_0-fw] = 
"${base_libdir}/firmware/pru/PRU_Halt.out"
-ALTERNATIVE_TARGET_pru-icss-halt[k2g-pru0_1-fw] = 
"${base_libdir}/firmware/pru/PRU_Halt.out"
-ALTERNATIVE_TARGET_pru-icss-halt[k2g-pru1_0-fw] = 
"${base_libdir}/firmware/pru/PRU_Halt.out"
-ALTERNATIVE_TARGET_pru-icss-halt[k2g-pru1_1-fw] = 
"${base_libdir}/firmware/pru/PRU_Halt.out"
-
 ALTERNATIVE_TARGET_pru-icss-halt[am64x-pru0_0-fw] = 
"${base_libdir}/firmware/pru/PRU_Halt_0.out"
 ALTERNATIVE_TARGET_pru-icss-halt[am64x-pru0_1-fw] = 
"${base_libdir}/firmware/pru/PRU_Halt_1.out"
 ALTERNATIVE_TARGET_pru-icss-halt[am64x-pru1_0-fw] = 
"${base_libdir}/firmware/pru/PRU_Halt_0.out"
@@ -348,11 +323,6 @@ ALTERNATIVE_TARGET_pru-icss-rpmsg-echo[am57xx-pru1_1-fw] = 
"${base_libdir}/firmw
 ALTERNATIVE_TARGET_pru-icss-rpmsg-echo[am57xx-pru2_0-fw] = 
"${base_libdir}/firmware/pru/PRU_RPMsg_Echo_Interrupt2_0.out"
 ALTERNATIVE_TARGET_pru-icss-rpmsg-echo[am57xx-pru2_1-fw] = 
"${base_libdir}/firmware/pru/PRU_RPMsg_Echo_Interrupt2_1.out"
 
-ALTERNATIVE_TARGET_pru-icss-rpmsg-echo[k2g-pru0_0-fw] = 
"${base_libdir}/firmware/pru/PRU_RPMsg_Echo_Interrupt0_0.out"
-ALTERNATIVE_TARGET_pru-icss-rpmsg-echo[k2g-pru0_1-fw] = 
"${base_libdir}/firmware/pru/PRU_RPMsg_Echo_Interrupt0_1.out"
-ALTERNATIVE_TARGET_pru-icss-rpmsg-echo[k2g-pru1_0-fw] = 
"${base_libdir}/firmware/pru/PRU_RPMsg_Echo_Interrupt1_0.out"
-ALTERNATIVE_TARGET_pru-icss-rpmsg-echo[k2g-pru1_1-fw] = 
"${base_libdir}/firmware/pru/PRU_RPMsg_Echo_Interrupt1_1.out"
-
 ALTERNATIVE_TARGET_pru-icss-rpmsg-echo[am64x-pru0_0-fw] = 
"${base_libdir}/firmware/pru/PRU_RPMsg_Echo_Interrupt0_0.out"
 ALTERNATIVE_TARGET_pru-icss-rpmsg-echo[am64x-pru0_1-fw] = 
"${base_libdir}/firmware/pru/PRU_RPMsg_Echo_Interrupt0_1.out"
 ALTERNATIVE_TARGET_pru-icss-rpmsg-echo[am64x-pru1_0-fw] = 
"${base_libdir}/firmware/pru/PRU_RPMsg_Echo_Interrupt1_0.out"
diff --git a/recipes-bsp/u-boot/u-boot-ti.inc b/recipes-bsp/u-boot/u-boot-ti.inc
index 8ded12c..4b9f543 100644
--- a/recipes-bsp/u-boot/u-boot-ti.inc
+++ b/recipes-bsp/u-boot/u-boot-ti.inc
@@ -61,7 +61,6 @@ SYSROOT_DIRS += "/boot"
 
 # SPL (Second Program Loader) to be loaded over UART
 SPL_UART_BINARY = "u-boot-spl.bin"
-SPL_UART_BINARY:keystone = ""
 SPL_UART_BINARY:k3r5 = ""
 SPL_UART_BINARY:lego-ev3 = ""
 SPL_UART_BINARY:j7200-evm-k3r5 = "u-boot-spl.bin"
@@ -74,20 +73,8 @@ SPL_UART_SYMLINK ?= "${SPL_UART_BINARY}-${MACHINE}"
 
 # SPI NOR Flash binaries
 UBOOT_SPI_SPL_BINARY = "u-boot-spl.bin"
-UBOOT_SPI_SPL_BINARY:k2e-hs-evm = ""
-UBOOT_SPI_SPL_BINARY:k2hk-hs-evm = ""
-UBOOT_SPI_SPL_BINARY:k2g-hs-evm = ""
-UBOOT_SPI_SPL_BINARY:k2l-hs-evm = ""
 UBOOT_SPI_BINARY = "u-boot.img"
-UBOOT_SPI_BINARY:k2e-hs-evm = ""
-UBOOT_SPI_BINARY:k2hk-hs-evm = ""
-UBOOT_SPI_BINARY:k2g-hs-evm = ""
-UBOOT_SPI_BINARY:k2l-hs-evm = ""
 UBOOT_SPI_GPH_BINARY = "u-boot-spi.gph"
-UBOOT_SPI_GPH_BINARY:k2e-hs-evm = ""
-UBOOT_SPI_GPH_BINARY:k2hk-hs-evm = ""
-UBOOT_SPI_GPH_BINARY:k2g-hs-evm = ""
-UBOOT_SPI_GPH_BINARY:k2l-hs-evm = ""
 
 # SPI NOR Flash deployed images
 UBOOT_SPI_SPL_IMAGE = "u-boot-spl-${MACHINE}-${PV}-${PR}.bin"
@@ -277,119 +264,6 @@ do_deploy:append () {
        rm ${DEPLOYDIR}/${PN}-initial-env-${MACHINE}-${PV}-${PR} || true
 }
 
-do_install:append:keystone () {
-       if [ -n "${UBOOT_CONFIG}" ]
-       then
-               for config in ${UBOOT_MACHINE}; do
-                       i=$(expr $i + 1);
-                       for type in ${UBOOT_CONFIG}; do
-                               j=$(expr $j + 1);
-                               if [ $j -eq $i ]
-                               then
-                                       if [ "x${UBOOT_SPI_SPL_BINARY}" != "x" 
]; then
-                                               install 
${B}/${config}/spl/${UBOOT_SPI_SPL_BINARY} 
${D}/boot/${UBOOT_SPI_SPL_IMAGE}-${type}
-                                               ln -sf 
${UBOOT_SPI_SPL_IMAGE}-${type} ${D}/boot/${UBOOT_SPI_SPL_BINARY}-${type}
-                                               ln -sf 
${UBOOT_SPI_SPL_IMAGE}-${type} ${D}/boot/${UBOOT_SPI_SPL_BINARY}
-                                       fi
-
-                                       if [ "x${UBOOT_SPI_BINARY}" != "x" ]; 
then
-                                               install 
${B}/${config}/${UBOOT_SPI_BINARY} ${D}/boot/${UBOOT_SPI_IMAGE}-${type}
-                                               ln -sf 
${UBOOT_SPI_IMAGE}-${type} ${D}/boot/${UBOOT_SPI_BINARY}-${type}
-                                               ln -sf 
${UBOOT_SPI_IMAGE}-${type} ${D}/boot/${UBOOT_SPI_BINARY}
-                                       fi
-
-                                       if [ "x${UBOOT_SPI_GPH_BINARY}" != "x" 
]; then
-                                               install 
${B}/${config}/${UBOOT_SPI_GPH_BINARY} ${D}/boot/${UBOOT_SPI_GPH_IMAGE}-${type}
-                                               ln -sf 
${UBOOT_SPI_GPH_IMAGE}-${type} ${D}/boot/${UBOOT_SPI_GPH_BINARY}-${type}
-                                               ln -sf 
${UBOOT_SPI_GPH_IMAGE}-${type} ${D}/boot/${UBOOT_SPI_GPH_BINARY}
-                                       fi
-                               fi
-                       done
-                       unset  j
-               done
-               unset  i
-       else
-               if [ "x${UBOOT_SPI_SPL_BINARY}" != "x" ]; then
-                       install ${B}/spl/${UBOOT_SPI_SPL_BINARY} 
${D}/boot/${UBOOT_SPI_SPL_IMAGE}
-                       ln -sf ${UBOOT_SPI_SPL_IMAGE} 
${D}/boot/${UBOOT_SPI_SPL_BINARY}
-               fi
-
-               if [ "x${UBOOT_SPI_BINARY}" != "x" ]; then
-                       install ${B}/${UBOOT_SPI_BINARY} 
${D}/boot/${UBOOT_SPI_IMAGE}
-                       ln -sf ${UBOOT_SPI_IMAGE} ${D}/boot/${UBOOT_SPI_BINARY}
-               fi
-
-               if [ "x${UBOOT_SPI_GPH_BINARY}" != "x" ]; then
-                       install ${B}/${UBOOT_SPI_GPH_BINARY} 
${D}/boot/${UBOOT_SPI_GPH_IMAGE}
-                       ln -sf ${UBOOT_SPI_GPH_IMAGE} 
${D}/boot/${UBOOT_SPI_GPH_BINARY}
-               fi
-       fi
-}
-
-do_deploy:append:keystone () {
-       if [ -n "${UBOOT_CONFIG}" ]
-       then
-               for config in ${UBOOT_MACHINE}; do
-                       i=$(expr $i + 1);
-                       for type in ${UBOOT_CONFIG}; do
-                               j=$(expr $j + 1);
-                               if [ $j -eq $i ]
-                               then
-                                       if [ "x${UBOOT_SPI_SPL_BINARY}" != "x" 
]; then
-                                               install 
${B}/${config}/spl/${UBOOT_SPI_SPL_BINARY} 
${DEPLOYDIR}/${UBOOT_SPI_SPL_IMAGE}-${type}
-                                               rm -f ${UBOOT_SPI_SPL_BINARY} 
${UBOOT_SPI_SPL_SYMLINK}
-                                               ln -sf 
${UBOOT_SPI_SPL_IMAGE}-${type} ${UBOOT_SPI_SPL_SYMLINK}-${type}
-                                               ln -sf 
${UBOOT_SPI_SPL_IMAGE}-${type} ${UBOOT_SPI_SPL_SYMLINK}
-                                               ln -sf 
${UBOOT_SPI_SPL_IMAGE}-${type} ${UBOOT_SPI_SPL_BINARY}-${type}
-                                               ln -sf 
${UBOOT_SPI_SPL_IMAGE}-${type} ${UBOOT_SPI_SPL_BINARY}
-                                       fi
-
-                                       if [ "x${UBOOT_SPI_BINARY}" != "x" ]; 
then
-                                               install 
${B}/${config}/${UBOOT_SPI_BINARY} ${DEPLOYDIR}/${UBOOT_SPI_IMAGE}-${type}
-                                               rm -f ${UBOOT_SPI_BINARY} 
${UBOOT_SPI_SYMLINK}
-                                               ln -sf 
${UBOOT_SPI_IMAGE}-${type} ${UBOOT_SPI_SYMLINK}-${type}
-                                               ln -sf 
${UBOOT_SPI_IMAGE}-${type} ${UBOOT_SPI_SYMLINK}
-                                               ln -sf 
${UBOOT_SPI_IMAGE}-${type} ${UBOOT_SPI_BINARY}-${type}
-                                               ln -sf 
${UBOOT_SPI_IMAGE}-${type} ${UBOOT_SPI_BINARY}
-                                       fi
-
-                                       if [ "x${UBOOT_SPI_GPH_BINARY}" != "x" 
]; then
-                                               install 
${B}/${config}/${UBOOT_SPI_GPH_BINARY} 
${DEPLOYDIR}/${UBOOT_SPI_GPH_IMAGE}-${type}
-                                               rm -f ${UBOOT_SPI_GPH_BINARY} 
${UBOOT_SPI_GPH_SYMLINK}
-                                               ln -sf 
${UBOOT_SPI_GPH_IMAGE}-${type} ${UBOOT_SPI_GPH_SYMLINK}-${type}
-                                               ln -sf 
${UBOOT_SPI_GPH_IMAGE}-${type} ${UBOOT_SPI_GPH_SYMLINK}
-                                               ln -sf 
${UBOOT_SPI_GPH_IMAGE}-${type} ${UBOOT_SPI_GPH_BINARY}-${type}
-                                               ln -sf 
${UBOOT_SPI_GPH_IMAGE}-${type} ${UBOOT_SPI_GPH_BINARY}
-                                       fi
-                               fi
-                       done
-                       unset  j
-               done
-               unset  i
-       else
-               if [ "x${UBOOT_SPI_SPL_BINARY}" != "x" ]; then
-                       install ${B}/spl/${UBOOT_SPI_SPL_BINARY} 
${DEPLOYDIR}/${UBOOT_SPI_SPL_IMAGE}
-                       rm -f ${UBOOT_SPI_SPL_BINARY} ${UBOOT_SPI_SPL_SYMLINK}
-                       ln -sf ${UBOOT_SPI_SPL_IMAGE} ${UBOOT_SPI_SPL_SYMLINK}
-                       ln -sf ${UBOOT_SPI_SPL_IMAGE} ${UBOOT_SPI_SPL_BINARY}
-               fi
-
-               if [ "x${UBOOT_SPI_BINARY}" != "x" ]; then
-                       install ${B}/${UBOOT_SPI_BINARY} 
${DEPLOYDIR}/${UBOOT_SPI_IMAGE}
-                       rm -f ${UBOOT_SPI_BINARY} ${UBOOT_SPI_SYMLINK}
-                       ln -sf ${UBOOT_SPI_IMAGE} ${UBOOT_SPI_SYMLINK}
-                       ln -sf ${UBOOT_SPI_IMAGE} ${UBOOT_SPI_BINARY}
-               fi
-
-               if [ "x${UBOOT_SPI_GPH_BINARY}" != "x" ]; then
-                       install ${B}/${UBOOT_SPI_GPH_BINARY} 
${DEPLOYDIR}/${UBOOT_SPI_GPH_IMAGE}
-                       rm -f ${UBOOT_SPI_GPH_BINARY} ${UBOOT_SPI_GPH_SYMLINK}
-                       ln -sf ${UBOOT_SPI_GPH_IMAGE} ${UBOOT_SPI_GPH_SYMLINK}
-                       ln -sf ${UBOOT_SPI_GPH_IMAGE} ${UBOOT_SPI_GPH_BINARY}
-               fi
-       fi
-}
-
 # j7200 uses combined image for tiboot3.bin that includes u-boot-spl.bin and 
sysfw
 # along with board PM/RM configs generated by k3-image-gen and comes from 
ti-sci-fw
 # hence move the legacy u-boot's tiboot3.bin and u-boot-spl.bin out of the way
diff --git a/recipes-bsp/uio-module-drv/uio-module-drv-test_git.bb 
b/recipes-bsp/uio-module-drv/uio-module-drv-test_git.bb
index b5f73b2..dc17a1e 100644
--- a/recipes-bsp/uio-module-drv/uio-module-drv-test_git.bb
+++ b/recipes-bsp/uio-module-drv/uio-module-drv-test_git.bb
@@ -4,14 +4,12 @@ include uio-module-drv.inc
 
 PR = "r1"
 
-COMPATIBLE_MACHINE = "keystone|omap-a15|ti33x|ti43x"
+COMPATIBLE_MACHINE = "omap-a15|ti33x|ti43x"
 PACKAGE_ARCH = "${MACHINE_ARCH}"
 
 DEVICE_NAME:omap-a15 = "am57xx"
 DEVICE_NAME:ti33x = "am33xx"
 DEVICE_NAME:ti43x = "am43xx"
-DEVICE_NAME:keystone = "keystone"
-DEVICE_NAME:k2g = "k2g"
 RDEPENDS:${PN} = "uio-module-drv"
 
 do_compile() {
@@ -24,14 +22,6 @@ do_install() {
        install -c -m 755 ${S}/test/uio_int_test ${D}${bindir}/.
 }
 
-do_install:append:keystone () {
-       install -c -m 755 ${S}/test/uio_cic2_int_multithread_test 
${D}${bindir}/.
-}
-
-do_install:append:k2g () {
-        install -c -m 755 ${S}/test/prussdrv_test/test/pruss_uio_test 
${D}${bindir}/.
-}
-
 do_install:append:omap-a15 () {
        install -c -m 755 ${S}/test/prussdrv_test/test/pruss_uio_test 
${D}${bindir}/.
 }
diff --git a/recipes-devtools/gdbc6x/gdbc6x_git.bb 
b/recipes-devtools/gdbc6x/gdbc6x_git.bb
index 08f8197..df9aaee 100644
--- a/recipes-devtools/gdbc6x/gdbc6x_git.bb
+++ b/recipes-devtools/gdbc6x/gdbc6x_git.bb
@@ -5,7 +5,7 @@ LIC_FILES_CHKSUM = 
"file://debian/copyright;md5=bf0fe2872eb3dfeebb2cbe38206fe81f
 
 DEPENDS = "ncurses bison-native texinfo flex-native gettext"
 
-COMPATIBLE_MACHINE = "dra7xx|keystone"
+COMPATIBLE_MACHINE = "dra7xx"
 
 PR = "${INC_PR}.1"
 
diff --git a/recipes-devtools/gdbc6x/gdbserver-c6x_git.bb 
b/recipes-devtools/gdbc6x/gdbserver-c6x_git.bb
index 544a97f..fab4fbd 100644
--- a/recipes-devtools/gdbc6x/gdbserver-c6x_git.bb
+++ b/recipes-devtools/gdbc6x/gdbserver-c6x_git.bb
@@ -10,7 +10,6 @@ S = "${WORKDIR}/git/gdbserver-c6x/src"
 
 PLATFORM = ""
 PLATFORM:dra7xx = "DRA7xx_PLATFORM"
-PLATFORM:keystone = "KEYSTONE_PLATFORM"
 
 EXTRA_OEMAKE = "PLATFORM=${PLATFORM}"
 
@@ -34,7 +33,7 @@ do_install() {
     cp -f ../lib/* ${D}${datadir}/ti/gdbc6x/lib
 }
 
-COMPATIBLE_MACHINE = "dra7xx|keystone"
+COMPATIBLE_MACHINE = "dra7xx"
 PACKAGE_ARCH = "${MACHINE_ARCH}"
 
 FILES:${PN}-dev += "\
diff --git a/recipes-devtools/gdbc6x/gdbserverproxy-module-drv_git.bb 
b/recipes-devtools/gdbc6x/gdbserverproxy-module-drv_git.bb
index 1b28c50..168e4be 100644
--- a/recipes-devtools/gdbc6x/gdbserverproxy-module-drv_git.bb
+++ b/recipes-devtools/gdbc6x/gdbserverproxy-module-drv_git.bb
@@ -13,7 +13,6 @@ inherit module
 
 PLATFORM = ""
 PLATFORM:dra7xx = "DRA7xx_PLATFORM"
-PLATFORM:keystone = "KEYSTONE_PLATFORM"
 
 EXTRA_OEMAKE = "PLATFORM=${PLATFORM} KVERSION=${KERNEL_VERSION} 
KERNEL_SRC=${STAGING_KERNEL_DIR}"
 
@@ -24,7 +23,7 @@ do_configure() {
     :
 }
 
-COMPATIBLE_MACHINE = "dra7xx|keystone"
+COMPATIBLE_MACHINE = "dra7xx"
 PACKAGE_ARCH = "${MACHINE_ARCH}"
 
 include gdbc6x.inc
diff --git a/recipes-kernel/linux/files/k2e/cmem.dtsi 
b/recipes-kernel/linux/files/k2e/cmem.dtsi
deleted file mode 100644
index c233768..0000000
--- a/recipes-kernel/linux/files/k2e/cmem.dtsi
+++ /dev/null
@@ -1,36 +0,0 @@
-/ {
-       reserved-memory {
-               cmem_block_mem_0: cmem_block_mem@830000000 {
-                       reg = <0x00000008 0x30000000 0x00000000 0x18000000>;
-                       no-map;
-                       status = "okay";
-               };
-       };
-
-       cmem {
-               compatible = "ti,cmem";
-               #address-cells = <1>;
-               #size-cells = <0>;
-
-               #pool-size-cells = <2>;
-
-               status = "okay";
-
-               cmem_block_0: cmem_block@0 {
-                       reg = <0>;
-                       memory-region = <&cmem_block_mem_0>;
-                       cmem-buf-pools = <1 0x00000000 0x18000000>;
-               };
-
-               cmem_block_1: cmem_block@1 {
-                       reg = <1>;
-                       sram = <&sram_cmem>;
-               };
-       };
-};
-
-&msm_ram {
-       sram_cmem: sram-cmem@80000 {
-               reg = <0x80000 0xc0000>;
-       };
-};
diff --git a/recipes-kernel/linux/files/k2e/k2e-uio.dtsi 
b/recipes-kernel/linux/files/k2e/k2e-uio.dtsi
deleted file mode 100644
index 052ae97..0000000
--- a/recipes-kernel/linux/files/k2e/k2e-uio.dtsi
+++ /dev/null
@@ -1,32 +0,0 @@
-/ {
-       soc {
-               uio_hyperlink0: hyperlink0 {
-                       compatible = "ti,uio-module-drv";
-                       mem  = <0x21400000 0x00001000
-                               0x40000000 0x10000000
-                               0x0231a000 0x00002000>;
-                       clocks = <&clkhyperlink0>;
-                       interrupts      = <0 387 0x101>;
-                       cfg-params
-                       {
-                               ti,serdes_refclk_khz = <312500>;
-                               ti,serdes_maxserrate_khz = <6250000>;
-                               ti,serdes_lanerate = "half";
-                               ti,serdes_numlanes = <4>;
-                               ti,serdes_c1 = <4 4 4 4>;
-                               ti,serdes_c2 = <0 0 0 0>;
-                               ti,serdes_cm = <0 0 0 0>;
-                               ti,serdes_tx_att = <12 12 12 12>;
-                               ti,serdes_tx_vreg = <4 4 4 4>;
-                               ti,serdes_rx_att = <11 11 11 11>;
-                               ti,serdes_rx_boost = <3 3 3 3>;
-                       };
-               };
-               uio_srss: srss {
-                       compatible = "ti,uio-module-drv";
-                       mem  = <0x02330000 0x0000400>;
-                       clocks=<&clksr>;
-                       interrupts = <0 0x173 0xf01>;
-               };
-       };
-};
diff --git a/recipes-kernel/linux/files/k2g/cmem.dtsi 
b/recipes-kernel/linux/files/k2g/cmem.dtsi
deleted file mode 100644
index 4c68d82..0000000
--- a/recipes-kernel/linux/files/k2g/cmem.dtsi
+++ /dev/null
@@ -1,37 +0,0 @@
-/ {
-       reserved-memory {
-
-               cmem_block_mem_0: cmem_block_mem@818000000 {
-                       reg = <0x00000008 0x18000000 0x00000000 0x5000000>;
-                       no-map;
-                       status = "okay";
-               };
-       };
-
-       cmem {
-               compatible = "ti,cmem";
-               #address-cells = <1>;
-               #size-cells = <0>;
-
-               #pool-size-cells = <2>;
-
-               status = "okay";
-
-               cmem_block_0: cmem_block@0 {
-                       reg = <0>;
-                       memory-region = <&cmem_block_mem_0>;
-                       cmem-buf-pools = <1 0x00000000 0x5000000>;
-               };
-
-               cmem_block_1: cmem_block@1 {
-                       reg = <1>;
-                       sram = <&sram_cmem>;
-               };
-       };
-};
-
-&msm_ram {
-       sram_cmem: sram-cmem@a0000 {
-               reg = <0xa0000 0x57000>;
-       };
-};
diff --git a/recipes-kernel/linux/files/k2g/keystone-k2g-pru-uio.dtsi 
b/recipes-kernel/linux/files/k2g/keystone-k2g-pru-uio.dtsi
deleted file mode 100644
index 49894e0..0000000
--- a/recipes-kernel/linux/files/k2g/keystone-k2g-pru-uio.dtsi
+++ /dev/null
@@ -1,391 +0,0 @@
-&pruss_soc_bus0 {
-               uio_pruss1_mdio: uio_mdio@20ab2400 {
-                       compatible = "ti,davinci_mdio";
-                       reg = <0x20ab2400 0x90>;
-                       clocks = <&k2g_clks 0x0014 1>;
-                       clock-names = "fck";
-                       #address-cells = <1>;
-                       #size-cells = <0>;
-                       bus_freq = <2500000>;
-                       status = "disabled";
-               };
-
-               uio_pruss1_mem: uio_pruss1_mem {
-                       compatible = "ti,uio-module-drv";
-                       mem = <0x20a80000 0x2000>,
-                             <0x20a82000 0x2000>,
-                             <0x20a90000 0x10000>,
-                             <0x20aa0000 0x2000>,
-                             <0x20aa6000 0x2000>,
-                             <0x20aae000 0x31c>,
-                             <0x20ab2000 0x70>;
-                       mem-names = "dram0", "dram1", "shrdram2", "intc", "cfg",
-                                   "iep", "mii_rt";
-                       status = "okay";
-               };
-               uio_pruss1_mem2: uio_pruss1_mem2 {
-                       compatible = "ti,uio-module-drv";
-                       mem = <0x20aa8000 0x38>,
-                             <0x20ab0000 0x60>,
-                             <0x20ab2400 0x90>,
-                             <0x0c080000 0xe000>;
-                       mem-names = "uart", "ecap", "mdio", "ocmc";
-                       status = "okay";
-               };
-               uio_pruss1_evt0: uio_pruss1_evt0 {
-                       compatible = "ti,uio-module-drv";
-                       interrupts = <GIC_SPI 224 0xf01>;
-                       interrupt-mode = <0>;
-                       status = "okay";
-               };
-               uio_pruss1_evt1: uio_pruss1_evt1 {
-                       compatible = "ti,uio-module-drv";
-                       interrupts = <GIC_SPI 225 0xf01>;
-                       interrupt-mode = <0>;
-                       status = "okay";
-               };
-               uio_pruss1_evt2: uio_pruss1_evt2 {
-                       compatible = "ti,uio-module-drv";
-                       interrupts = <GIC_SPI 226 0xf01>;
-                       interrupt-mode = <0>;
-                       status = "okay";
-               };
-               uio_pruss1_evt3: uio_pruss1_evt3 {
-                       compatible = "ti,uio-module-drv";
-                       interrupts = <GIC_SPI 227 0xf01>;
-                       interrupt-mode = <0>;
-                       status = "okay";
-               };
-               uio_pruss1_evt4: uio_pruss1_evt4 {
-                       compatible = "ti,uio-module-drv";
-                       interrupts = <GIC_SPI 228 0xf01>;
-                       interrupt-mode = <0>;
-                       status = "okay";
-               };
-               uio_pruss1_evt6: uio_pruss1_evt6 {
-                       compatible = "ti,uio-module-drv";
-                       interrupts = <GIC_SPI 230 0xf01>;
-                       interrupt-mode = <0>;
-                       status = "okay";
-               };
-               uio_pruss1_evt7: uio_pruss1_evt7 {
-                       compatible = "ti,uio-module-drv";
-                       interrupts = <GIC_SPI 231 0xf01>;
-                       interrupt-mode = <0>;
-                       status = "okay";
-               };
-
-               uio_pruss1_0_mem: uio_pruss1_0_mem {
-                       compatible = "ti,uio-module-drv";
-                       mem = <0x20ab4000 0x3000>,
-                             <0x20aa2000 0x400>,
-                             <0x20aa2400 0x100>;
-                       mem-names = "iram", "control", "debug";
-                       status = "okay";
-               };
-
-               uio_pruss1_1_mem: uio_pruss1_1_mem {
-                       compatible = "ti,uio-module-drv";
-                       mem = <0x20ab8000 0x3000>,
-                             <0x20aa4000 0x400>,
-                             <0x20aa4400 0x100>;
-                       mem-names = "iram", "control", "debug";
-                       status = "okay";
-               };
-};
-
-&pruss_soc_bus1 {
-               uio_pruss2_mdio: uio_mdio@20af2400 {
-                       compatible = "ti,davinci_mdio";
-                       reg = <0x20af2400 0x90>;
-                       clocks = <&k2g_clks 0x0015 1>;
-                       clock-names = "fck";
-                       #address-cells = <1>;
-                       #size-cells = <0>;
-                       bus_freq = <2500000>;
-                       status = "disabled";
-               };
-
-               uio_pruss2_mem: uio_pruss2_mem {
-                       compatible = "ti,uio-module-drv";
-                       mem = <0x20ac0000 0x2000>,
-                             <0x20ac2000 0x2000>,
-                             <0x20ad0000 0x10000>,
-                             <0x20ae0000 0x2000>,
-                             <0x20ae6000 0x2000>,
-                             <0x20aee000 0x31c>,
-                             <0x20af2000 0x70>;
-                       mem-names = "dram0", "dram1", "shrdram2", "intc", "cfg",
-                                   "iep", "mii_rt";
-                       status = "okay";
-               };
-               uio_pruss2_mem2: uio_pruss2_mem2 {
-                       compatible = "ti,uio-module-drv";
-                       mem = <0x20ae8000 0x38>,
-                             <0x20af0000 0x60>,
-                             <0x20af2400 0x90>,
-                             <0x0c08e000 0xe000>;
-                       mem-names = "uart", "ecap", "mdio", "ocmc";
-                       status = "okay";
-               };
-               uio_pruss2_evt0: uio_pruss2_evt0 {
-                       compatible = "ti,uio-module-drv";
-                       interrupts = <GIC_SPI 232 0xf01>;
-                       interrupt-mode = <0>;
-                       status = "okay";
-               };
-               uio_pruss2_evt1: uio_pruss2_evt1 {
-                       compatible = "ti,uio-module-drv";
-                       interrupts = <GIC_SPI 233 0xf01>;
-                       interrupt-mode = <0>;
-                       status = "okay";
-               };
-               uio_pruss2_evt2: uio_pruss2_evt2 {
-                       compatible = "ti,uio-module-drv";
-                       interrupts = <GIC_SPI 234 0xf01>;
-                       interrupt-mode = <0>;
-                       status = "okay";
-               };
-               uio_pruss2_evt3: uio_pruss2_evt3 {
-                       compatible = "ti,uio-module-drv";
-                       interrupts = <GIC_SPI 235 0xf01>;
-                       interrupt-mode = <0>;
-                       status = "okay";
-               };
-               uio_pruss2_evt4: uio_pruss2_evt4 {
-                       compatible = "ti,uio-module-drv";
-                       interrupts = <GIC_SPI 236 0xf01>;
-                       interrupt-mode = <0>;
-                       status = "okay";
-               };
-               uio_pruss2_evt6: uio_pruss2_evt6 {
-                       compatible = "ti,uio-module-drv";
-                       interrupts = <GIC_SPI 238 0xf01>;
-                       interrupt-mode = <0>;
-                       status = "okay";
-               };
-               uio_pruss2_evt7: uio_pruss2_evt7 {
-                       compatible = "ti,uio-module-drv";
-                       interrupts = <GIC_SPI 239 0xf01>;
-                       interrupt-mode = <0>;
-                       status = "okay";
-               };
-
-               uio_pruss2_0_mem: uio_pruss2_0_mem {
-                       compatible = "ti,uio-module-drv";
-                       mem = <0x20af4000 0x3000>,
-                             <0x20ae2000 0x400>,
-                             <0x20ae2400 0x100>;
-                       mem-names = "iram", "control", "debug";
-                       status = "okay";
-               };
-               uio_pruss2_1_mem: uio_pruss2_1_mem {
-                       compatible = "ti,uio-module-drv";
-                       mem = <0x20af8000 0x3000>,
-                             <0x20ae4000 0x400>,
-                             <0x20ae4400 0x100>;
-                       mem-names = "iram", "control", "debug";
-                       status = "okay";
-               };
-};
-
-&k2g_pinctrl {
-       uio_pruss1_mdio_eth_default: uio_pruss1_mdio_eth_default {
-               pinctrl-single,pins = <
-                        K2G_CORE_IOPAD(0x12cc) (BUFFER_CLASS_B | PULL_DISABLE 
| MUX_MODE0)      /* pr0_mdio_data.pr0_mdio_data */
-                        K2G_CORE_IOPAD(0x12d0) (BUFFER_CLASS_B | PIN_PULLDOWN 
| MUX_MODE0)      /* pr0_mdio_mdclk.pr0_mdio_mdclk */
-                        K2G_CORE_IOPAD(0x105c) (BUFFER_CLASS_B | PULL_DISABLE 
| MUX_MODE3)      /* gpmc_wait1.gpio0_23 (pr0_mii0_resetn) */
-                        K2G_CORE_IOPAD(0x1070) (BUFFER_CLASS_B | PIN_PULLUP | 
MUX_MODE3)        /* gpmc_csn2.gpio0_28 (pr0_mii0_intn) */
-                        K2G_CORE_IOPAD(0x1054) (BUFFER_CLASS_B | PULL_DISABLE 
| MUX_MODE3)      /* gpmc_be1n.gpio0_21 (pr0_mii1_resetn) */
-                        K2G_CORE_IOPAD(0x1074) (BUFFER_CLASS_B | PIN_PULLUP | 
MUX_MODE3)        /* gpmc_csn3.gpio0_29 (pr0_mii1_intn) */
-
-                        /* PRUSS0 External Mux routing */
-                        K2G_CORE_IOPAD(0x11d4) (BUFFER_CLASS_B | MUX_MODE3)    
                 /* uart0_ctsn.gpio0_106 */
-                        K2G_CORE_IOPAD(0x11d8) (BUFFER_CLASS_B | MUX_MODE3)    
                 /* uart0_rtsn.gpio0_107 */
-                        K2G_CORE_IOPAD(0x11fc) (BUFFER_CLASS_B | MUX_MODE3)    
                 /* dcan0_rx.gpio1_57 */
-                        K2G_CORE_IOPAD(0x1200) (BUFFER_CLASS_B | MUX_MODE3)    
                 /* dcan0_tx.gpio1_56 */
-                        K2G_CORE_IOPAD(0x1224) (BUFFER_CLASS_B | MUX_MODE3)    
                 /* qspi_csn2.gpio1_66 */
-                        K2G_CORE_IOPAD(0x1228) (BUFFER_CLASS_B | MUX_MODE3)    
                 /* qspi_csn3.gpio1_67 */
-
-                        /* PRUSS0 PRU0 Ethernet */
-                        K2G_CORE_IOPAD(0x122c) (BUFFER_CLASS_B | PULL_DISABLE 
| MUX_MODE1)      /* pr0_pru0_gpo0.pr0_pru0_gpi0 (pr0_mii0_rxd0) */
-                        K2G_CORE_IOPAD(0x1230) (BUFFER_CLASS_B | PULL_DISABLE 
| MUX_MODE1)      /* pr0_pru0_gpo1.pr0_pru0_gpi1 (pr0_mii0_rxd1) */
-                        K2G_CORE_IOPAD(0x1234) (BUFFER_CLASS_B | PULL_DISABLE 
| MUX_MODE1)      /* pr0_pru0_gpo2.pr0_pru0_gpi2 (pr0_mii0_rxd2) */
-                        K2G_CORE_IOPAD(0x1238) (BUFFER_CLASS_B | PULL_DISABLE 
| MUX_MODE1)      /* pr0_pru0_gpo3.pr0_pru0_gpi3 (pr0_mii0_rxd3) */
-                        K2G_CORE_IOPAD(0x123c) (BUFFER_CLASS_B | PULL_DISABLE 
| MUX_MODE1)      /* pr0_pru0_gpo4.pr0_pru0_gpi4 (pr0_mii0_rxdv) */
-                        K2G_CORE_IOPAD(0x1240) (BUFFER_CLASS_B | PULL_DISABLE 
| MUX_MODE1)      /* pr0_pru0_gpo5.pr0_pru0_gpi5 (pr0_mii0_rxer) */
-                        K2G_CORE_IOPAD(0x1244) (BUFFER_CLASS_B | MUX_MODE1)    
                 /* pr0_pru0_gpo6.pr0_pru0_gpi6 (pr0_mii_mr0_clk) */
-
-                        K2G_CORE_IOPAD(0x124c) (BUFFER_CLASS_B | MUX_MODE1)    
                 /* pr0_pru0_gpo8.pr0_pru0_gpi8 (pr0_mii0_rxlink) */
-                        K2G_CORE_IOPAD(0x1250) (BUFFER_CLASS_B | PULL_DISABLE 
| MUX_MODE1)      /* pr0_pru0_gpo9.pr0_pru0_gpi9 (pr0_mii0_col) */
-                        K2G_CORE_IOPAD(0x1254) (BUFFER_CLASS_B | PULL_DISABLE 
| MUX_MODE1)      /* pr0_pru0_gpo10.pr0_pru0_gpi10 (pr0_mii0_crs) */
-
-                        K2G_CORE_IOPAD(0x12a8) (BUFFER_CLASS_B | MUX_MODE0)    
                 /* pr0_pru1_gpo11.pr0_pru1_gpo11 (pr0_mii0_txd0) */
-                        K2G_CORE_IOPAD(0x12ac) (BUFFER_CLASS_B | MUX_MODE0)    
                 /* pr0_pru1_gpo12.pr0_pru1_gpo12 (pr0_mii0_txd1) */
-                        K2G_CORE_IOPAD(0x12b0) (BUFFER_CLASS_B | MUX_MODE0)    
                 /* pr0_pru1_gpo13.pr0_pru1_gpo13 (pr0_mii0_txd2) */
-                        K2G_CORE_IOPAD(0x12b4) (BUFFER_CLASS_B | MUX_MODE0)    
                 /* pr0_pru1_gpo14.pr0_pru1_gpo14 (pr0_mii0_txd3) */
-                        K2G_CORE_IOPAD(0x12b8) (BUFFER_CLASS_B | MUX_MODE0)    
                 /* pr0_pru1_gpo15.pr0_pru1_gpo15 (pr0_mii0_txen) */
-                        K2G_CORE_IOPAD(0x12bc) (BUFFER_CLASS_B | MUX_MODE1)    
                 /* pr0_pru1_gpo16.pr0_pru1_gpo16 (pr0_mii_mt0_clk) */
-
-                        /* PRUSS0 PRU1 Ethernet */
-                        K2G_CORE_IOPAD(0x127c) (BUFFER_CLASS_B | PULL_DISABLE 
| MUX_MODE1)      /* pr0_pru1_gpo0.pr0_pru1_gpi0 (pr0_mii1_rxd0) */
-                        K2G_CORE_IOPAD(0x1280) (BUFFER_CLASS_B | PULL_DISABLE 
| MUX_MODE1)      /* pr0_pru1_gpo1.pr0_pru1_gpi1 (pr0_mii1_rxd1) */
-                        K2G_CORE_IOPAD(0x1284) (BUFFER_CLASS_B | PULL_DISABLE 
| MUX_MODE1)      /* pr0_pru1_gpo2.pr0_pru1_gpi2 (pr0_mii1_rxd2) */
-                        K2G_CORE_IOPAD(0x1288) (BUFFER_CLASS_B | PULL_DISABLE 
| MUX_MODE1)      /* pr0_pru1_gpo3.pr0_pru1_gpi3 (pr0_mii1_rxd3) */
-                        K2G_CORE_IOPAD(0x128c) (BUFFER_CLASS_B | PULL_DISABLE 
| MUX_MODE1)      /* pr0_pru1_gpo4.pr0_pru1_gpi4 (pr0_mii1_rxdv) */
-                        K2G_CORE_IOPAD(0x1290) (BUFFER_CLASS_B | PULL_DISABLE 
| MUX_MODE1)      /* pr0_pru1_gpo5.pr0_pru1_gpi5 (pr0_mii1_rxer) */
-                        K2G_CORE_IOPAD(0x1294) (BUFFER_CLASS_B | MUX_MODE1)    
                 /* pr0_pru1_gpo6.pr0_pru1_gpi6 (pr0_mii_mr1_clk) */
-
-                        K2G_CORE_IOPAD(0x129c) (BUFFER_CLASS_B | MUX_MODE1)    
                 /* pr0_pru1_gpo8.pr0_pru1_gpi8 (pr0_mii1_rxlink) */
-                        K2G_CORE_IOPAD(0x12a0) (BUFFER_CLASS_B | PULL_DISABLE 
| MUX_MODE1)      /* pr0_pru1_gpo9.pr0_pru1_gpi9 (pr0_mii1_col) */
-                        K2G_CORE_IOPAD(0x12a4) (BUFFER_CLASS_B | PULL_DISABLE 
| MUX_MODE1)      /* pr0_pru1_gpo10.pr0_pru1_gpi10 (pr0_mii1_crs) */
-
-                        K2G_CORE_IOPAD(0x1258) (BUFFER_CLASS_B | MUX_MODE0)    
                 /* pr0_pru0_gpo11.pr0_pru0_gpo11 (pr0_mii1_txd0) */
-                        K2G_CORE_IOPAD(0x125c) (BUFFER_CLASS_B | MUX_MODE0)    
                 /* pr0_pru0_gpo12.pr0_pru0_gpo12 (pr0_mii1_txd1) */
-                        K2G_CORE_IOPAD(0x1260) (BUFFER_CLASS_B | MUX_MODE0)    
                 /* pr0_pru0_gpo13.pr0_pru0_gpo13 (pr0_mii1_txd2) */
-                        K2G_CORE_IOPAD(0x1264) (BUFFER_CLASS_B | MUX_MODE0)    
                 /* pr0_pru0_gpo14.pr0_pru0_gpo14 (pr0_mii1_txd3) */
-                        K2G_CORE_IOPAD(0x1268) (BUFFER_CLASS_B | MUX_MODE0)    
                 /* pr0_pru0_gpo15.pr0_pru0_gpo15 (pr0_mii1_txen) */
-                        K2G_CORE_IOPAD(0x126c) (BUFFER_CLASS_B | MUX_MODE1)    
                 /* pr0_pru0_gpo16.pr0_pru0_gpo16 (pr0_mii_mt1_clk) */
-               >;
-       };
-
-       uio_pruss2_mdio_eth_default: uio_pruss2_mdio_eth_default {
-               pinctrl-single,pins = <
-                        K2G_CORE_IOPAD(0x1374) (BUFFER_CLASS_B | PULL_DISABLE 
| MUX_MODE0)      /* pr1_mdio_data.pr1_mdio_data */
-                        K2G_CORE_IOPAD(0x1378) (BUFFER_CLASS_B | PIN_PULLDOWN 
| MUX_MODE0)      /* pr1_mdio_mdclk.pr1_mdio_mdclk */
-                        K2G_CORE_IOPAD(0x1050) (BUFFER_CLASS_B | PULL_DISABLE 
| MUX_MODE3)      /* gpmc_be0ncle.gpio0_20 (pr1_mii0_resetn) */
-                        K2G_CORE_IOPAD(0x1044) (BUFFER_CLASS_B | PIN_PULLUP | 
MUX_MODE3)        /* gpmc_advnale.gpio0_17 (pr1_mii0_intn) */
-                        K2G_CORE_IOPAD(0x1060) (BUFFER_CLASS_B | PULL_DISABLE 
| MUX_MODE3)      /* gpmc_wpn.gpio0_24 (pr1_mii1_resetn) */
-                        K2G_CORE_IOPAD(0x1088) (BUFFER_CLASS_B | PIN_PULLUP | 
MUX_MODE3)        /* gpmc_wait0.gpio0_22 (pr1_mii1_intn) */
-
-                        /* PRUSS1 PRU0 Ethernet */
-                        K2G_CORE_IOPAD(0x12d4) (BUFFER_CLASS_B | PULL_DISABLE 
| MUX_MODE1)      /* pr1_pru0_gpo0.pr1_pru0_gpi0 (pr1_mii0_rxd0) */
-                        K2G_CORE_IOPAD(0x12d8) (BUFFER_CLASS_B | PULL_DISABLE 
| MUX_MODE1)      /* pr1_pru0_gpo1.pr1_pru0_gpi1 (pr1_mii0_rxd1) */
-                        K2G_CORE_IOPAD(0x12dc) (BUFFER_CLASS_B | PULL_DISABLE 
| MUX_MODE1)      /* pr1_pru0_gpo2.pr1_pru0_gpi2 (pr1_mii0_rxd2) */
-                        K2G_CORE_IOPAD(0x12e0) (BUFFER_CLASS_B | PULL_DISABLE 
| MUX_MODE1)      /* pr1_pru0_gpo3.pr1_pru0_gpi3 (pr1_mii0_rxd3) */
-                        K2G_CORE_IOPAD(0x12e4) (BUFFER_CLASS_B | PULL_DISABLE 
| MUX_MODE1)      /* pr1_pru0_gpo4.pr1_pru0_gpi4 (pr1_mii0_rxdv) */
-                        K2G_CORE_IOPAD(0x12e8) (BUFFER_CLASS_B | PULL_DISABLE 
| MUX_MODE1)      /* pr1_pru0_gpo5.pr1_pru0_gpi5 (pr1_mii0_rxer) */
-                        K2G_CORE_IOPAD(0x12ec) (BUFFER_CLASS_B | MUX_MODE1)    
                 /* pr1_pru0_gpo6.pr1_pru0_gpi6 (pr1_mii_mr0_clk) */
-
-                        K2G_CORE_IOPAD(0x12f4) (BUFFER_CLASS_B | MUX_MODE1)    
                 /* pr1_pru0_gpo8.pr1_pru0_gpi8 (pr1_mii0_rxlink) */
-                        K2G_CORE_IOPAD(0x12f8) (BUFFER_CLASS_B | PULL_DISABLE 
| MUX_MODE1)      /* pr1_pru0_gpo9.pr1_pru0_gpi9 (pr1_mii0_col) */
-                        K2G_CORE_IOPAD(0x12fc) (BUFFER_CLASS_B | PULL_DISABLE 
| MUX_MODE1)      /* pr1_pru0_gpo10.pr1_pru0_gpi10 (pr1_mii0_crs) */
-
-                        K2G_CORE_IOPAD(0x1350) (BUFFER_CLASS_B | MUX_MODE0)    
                 /* pr1_pru1_gpo11.pr1_pru1_gpo11 (pr1_mii0_txd0) */
-                        K2G_CORE_IOPAD(0x1354) (BUFFER_CLASS_B | MUX_MODE0)    
                 /* pr1_pru1_gpo12.pr1_pru1_gpo12 (pr1_mii0_txd1) */
-                        K2G_CORE_IOPAD(0x1358) (BUFFER_CLASS_B | MUX_MODE0)    
                 /* pr1_pru1_gpo13.pr1_pru1_gpo13 (pr1_mii0_txd2) */
-                        K2G_CORE_IOPAD(0x135c) (BUFFER_CLASS_B | MUX_MODE0)    
                 /* pr1_pru1_gpo14.pr1_pru1_gpo14 (pr1_mii0_txd3) */
-                        K2G_CORE_IOPAD(0x1360) (BUFFER_CLASS_B | MUX_MODE0)    
                 /* pr1_pru1_gpo15.pr1_pru1_gpo15 (pr1_mii0_txen) */
-                        K2G_CORE_IOPAD(0x1364) (BUFFER_CLASS_B | MUX_MODE1)    
                 /* pr1_pru1_gpo16.pr1_pru1_gpo16 (pr1_mii_mt0_clk) */
-
-                        /* PRUSS1 PRU1 Ethernet */
-                        K2G_CORE_IOPAD(0x1324) (BUFFER_CLASS_B | PULL_DISABLE 
| MUX_MODE1)      /* pr1_pru1_gpo0.pr1_pru1_gpi0 (pr1_mii1_rxd0) */
-                        K2G_CORE_IOPAD(0x132c) (BUFFER_CLASS_B | PULL_DISABLE 
| MUX_MODE1)      /* pr1_pru1_gpo2.pr1_pru1_gpi2 (pr1_mii1_rxd2) */
-                        K2G_CORE_IOPAD(0x1330) (BUFFER_CLASS_B | PULL_DISABLE 
| MUX_MODE1)      /* pr1_pru1_gpo3.pr1_pru1_gpi3 (pr1_mii1_rxd3) */
-                        K2G_CORE_IOPAD(0x1334) (BUFFER_CLASS_B | PULL_DISABLE 
| MUX_MODE1)      /* pr1_pru1_gpo4.pr1_pru1_gpi4 (pr1_mii1_rxdv) */
-                        K2G_CORE_IOPAD(0x1338) (BUFFER_CLASS_B | PULL_DISABLE 
| MUX_MODE1)      /* pr1_pru1_gpo5.pr1_pru1_gpi5 (pr1_mii1_rxer) */
-                        K2G_CORE_IOPAD(0x133c) (BUFFER_CLASS_B | MUX_MODE1)    
                 /* pr1_pru1_gpo6.pr1_pru1_gpi6 (pr1_mii_mr1_clk) */
-
-                        K2G_CORE_IOPAD(0x1344) (BUFFER_CLASS_B | MUX_MODE1)    
                 /* pr1_pru1_gpo8.pr1_pru1_gpi8 (pr1_mii1_rxlink) */
-                        K2G_CORE_IOPAD(0x1348) (BUFFER_CLASS_B | PULL_DISABLE 
| MUX_MODE1)      /* pr1_pru1_gpo9.pr1_pru1_gpi9 (pr1_mii1_col) */
-                        K2G_CORE_IOPAD(0x134c) (BUFFER_CLASS_B | PULL_DISABLE 
| MUX_MODE1)      /* pr1_pru1_gpo10.pr1_pru1_gpi10 (pr1_mii1_crs) */
-
-                        K2G_CORE_IOPAD(0x1300) (BUFFER_CLASS_B | MUX_MODE0)    
                 /* pr1_pru0_gpo11.pr1_pru0_gpo11 (pr1_mii1_txd0) */
-                        K2G_CORE_IOPAD(0x1304) (BUFFER_CLASS_B | MUX_MODE0)    
                 /* pr1_pru0_gpo12.pr1_pru0_gpo12 (pr1_mii1_txd1) */
-                        K2G_CORE_IOPAD(0x1308) (BUFFER_CLASS_B | MUX_MODE0)    
                 /* pr1_pru0_gpo13.pr1_pru0_gpo13 (pr1_mii1_txd2) */
-                        K2G_CORE_IOPAD(0x130c) (BUFFER_CLASS_B | MUX_MODE0)    
                 /* pr1_pru0_gpo14.pr1_pru0_gpo14 (pr1_mii1_txd3) */
-                        K2G_CORE_IOPAD(0x1310) (BUFFER_CLASS_B | MUX_MODE0)    
                 /* pr1_pru0_gpo15.pr1_pru0_gpo15 (pr1_mii1_txen) */
-                        K2G_CORE_IOPAD(0x1314) (BUFFER_CLASS_B | MUX_MODE1)    
                 /* pr1_pru0_gpo16.pr1_pru0_gpo16 (pr1_mii_mt1_clk) */
-               >;
-       };
-};
-
-&uio_pruss1_mdio {
-        status = "okay";
-        pinctrl-0 = <&uio_pruss1_mdio_eth_default>;
-        pinctrl-names = "default";
-        reset-gpios = <&gpio0 23 GPIO_ACTIVE_LOW>,
-                      <&gpio0 21 GPIO_ACTIVE_LOW>;
-        reset-delay-us = <20>;
-
-        uio_pruss1_eth0_phy: uio-ethernet-phy@0 {
-                reg = <0>;
-        };
-
-        uio_pruss1_eth1_phy: uio-ethernet-phy@1 {
-                reg = <1>;
-        };
-};
-
-&uio_pruss2_mdio {
-        status = "okay";
-        pinctrl-0 = <&uio_pruss2_mdio_eth_default>;
-        pinctrl-names = "default";
-        reset-gpios = <&gpio0 20 GPIO_ACTIVE_LOW>,
-                      <&gpio0 24 GPIO_ACTIVE_LOW>;
-        reset-delay-us = <20>;
-
-        uio_pruss2_eth0_phy: uio-ethernet-phy@2 {
-                reg = <2>;
-        };
-
-        uio_pruss2_eth1_phy: uio-ethernet-phy@3 {
-                reg = <3>;
-        };
-};
-
-&pruss0 {
-       status = "disabled";
-};
-
-&pru0_0 {
-       status = "disabled";
-};
-
-&pru0_1 {
-       status = "disabled";
-};
-
-&pruss0_intc {
-       status = "disabled";
-};
-
-&pruss0_mdio {
-       status = "disabled";
-};
-
-&pruss1 {
-       status = "disabled";
-};
-
-&pru1_0 {
-       status = "disabled";
-};
-
-&pru1_1 {
-       status = "disabled";
-};
-
-&pruss1_intc {
-       status = "disabled";
-};
-
-&pruss1_mdio {
-       status = "disabled";
-};
-
-&pruss0_emac0 {
-       status = "disabled";
-};
-
-&pruss0_emac1 {
-       status = "disabled";
-};
-
-&pruss1_emac0 {
-       status = "disabled";
-};
-
-&pruss1_emac1 {
-       status = "disabled";
-};
diff --git a/recipes-kernel/linux/files/k2hk/cmem.dtsi 
b/recipes-kernel/linux/files/k2hk/cmem.dtsi
deleted file mode 100644
index 400aa9d..0000000
--- a/recipes-kernel/linux/files/k2hk/cmem.dtsi
+++ /dev/null
@@ -1,37 +0,0 @@
-/ {
-       reserved-memory {
-
-               cmem_block_mem_0: cmem_block_mem@830000000 {
-                       reg = <0x00000008 0x30000000 0x00000000 0x18000000>;
-                       no-map;
-                       status = "okay";
-               };
-       };
-
-       cmem {
-               compatible = "ti,cmem";
-               #address-cells = <1>;
-               #size-cells = <0>;
-
-               #pool-size-cells = <2>;
-
-               status = "okay";
-
-               cmem_block_0: cmem_block@0 {
-                       reg = <0>;
-                       memory-region = <&cmem_block_mem_0>;
-                       cmem-buf-pools = <1 0x00000000 0x18000000>;
-               };
-
-               cmem_block_1: cmem_block@1 {
-                       reg = <1>;
-                       sram = <&sram_cmem>;
-               };
-       };
-};
-
-&msm_ram {
-       sram_cmem: sram-cmem@100000 {
-               reg = <0x100000 0x480000>;
-       };
-};
diff --git a/recipes-kernel/linux/files/k2hk/k2hk-uio.dtsi 
b/recipes-kernel/linux/files/k2hk/k2hk-uio.dtsi
deleted file mode 100644
index cabe0b8..0000000
--- a/recipes-kernel/linux/files/k2hk/k2hk-uio.dtsi
+++ /dev/null
@@ -1,58 +0,0 @@
-/ {
-       soc {
-               uio_hyperlink0: hyperlink0 {
-                       compatible = "ti,uio-module-drv";
-                       mem  = <0x21400000 0x00001000
-                               0x40000000 0x10000000
-                               0x0231a000 0x00002000>;
-                       clocks = <&clkhyperlink0>;
-                       interrupts      = <0 387 0x101>;
-                       cfg-params
-                       {
-                               ti,serdes_refclk_khz = <312500>;
-                               ti,serdes_maxserrate_khz = <6250000>;
-                               ti,serdes_lanerate = "half";
-                               ti,serdes_numlanes = <4>;
-                               ti,serdes_c1 = <4 4 4 4>;
-                               ti,serdes_c2 = <0 0 0 0>;
-                               ti,serdes_cm = <0 0 0 0>;
-                               ti,serdes_tx_att = <12 12 12 12>;
-                               ti,serdes_tx_vreg = <4 4 4 4>;
-                               ti,serdes_rx_att = <11 11 11 11>;
-                               ti,serdes_rx_boost = <3 3 3 3>;
-                       };
-               };
-
-               uio_hyperlink1: hyperlink1 {
-                       compatible = "ti,uio-module-drv";
-                       mem  = <0x21400000 0x00001000
-                               0x28000000 0x08000000
-                               0x0231c000 0x00002000>;
-                       clocks = <&clkhyperlink1>;
-                       interrupts      = <0 388 0x101>;
-                       cfg-params
-                       {
-                               ti,serdes_refclk_khz = <312500>;
-                               ti,serdes_maxserrate_khz = <6250000>;
-                               ti,serdes_lanerate = "half";
-                               ti,serdes_numlanes = <4>;
-                               ti,serdes_c1 = <4 4 4 4>;
-                               ti,serdes_c2 = <0 0 0 0>;
-                               ti,serdes_cm = <0 0 0 0>;
-                               ti,serdes_tx_att = <12 12 12 12>;
-                               ti,serdes_tx_vreg = <4 4 4 4>;
-                               ti,serdes_rx_att = <11 11 11 11>;
-                               ti,serdes_rx_boost = <3 3 3 3>;
-                       };
-               };
-
-               uio_srio: srio {
-                       compatible = "ti,uio-module-drv";
-                       mem  = <0x0232C000 0x00002000
-                               0x02900000 0x00040000
-                               0x0232C000 0x00002000>;
-                       clocks=<&clksrio>;
-                       interrupts = <0 154 0xf01>;
-               };
-       };
-};
diff --git a/recipes-kernel/linux/files/k2l/cmem.dtsi 
b/recipes-kernel/linux/files/k2l/cmem.dtsi
deleted file mode 100644
index da389e5..0000000
--- a/recipes-kernel/linux/files/k2l/cmem.dtsi
+++ /dev/null
@@ -1,37 +0,0 @@
-/ {
-       reserved-memory {
-
-               cmem_block_mem_0: cmem_block_mem@830000000 {
-                       reg = <0x00000008 0x30000000 0x00000000 0x18000000>;
-                       no-map;
-                       status = "okay";
-               };
-       };
-
-       cmem {
-               compatible = "ti,cmem";
-               #address-cells = <1>;
-               #size-cells = <0>;
-
-               #pool-size-cells = <2>;
-
-               status = "okay";
-
-               cmem_block_0: cmem_block@0 {
-                       reg = <0>;
-                       memory-region = <&cmem_block_mem_0>;
-                       cmem-buf-pools = <1 0x00000000 0x18000000>;
-               };
-
-               cmem_block_1: cmem_block@1 {
-                       reg = <1>;
-                       sram = <&sram_cmem>;
-               };
-       };
-};
-
-&msm_ram {
-       sram_cmem: sram-cmem@80000 {
-               reg = <0x80000 0xc0000>;
-       };
-};
diff --git a/recipes-kernel/linux/files/k2l/k2l-uio.dtsi 
b/recipes-kernel/linux/files/k2l/k2l-uio.dtsi
deleted file mode 100644
index a1b2e07..0000000
--- a/recipes-kernel/linux/files/k2l/k2l-uio.dtsi
+++ /dev/null
@@ -1,10 +0,0 @@
-/ {
-       soc {
-               uio_srss: srss {
-                       compatible = "ti,uio-module-drv";
-                       mem  = <0x02330000 0x0000400>;
-                       clocks=<&clksr>;
-                       interrupts = <0 0x173 0xf01>;
-               };
-       };
-};
diff --git a/recipes-kernel/linux/files/keystone/keystone-uio.dtsi 
b/recipes-kernel/linux/files/keystone/keystone-uio.dtsi
deleted file mode 100644
index 43b183d..0000000
--- a/recipes-kernel/linux/files/keystone/keystone-uio.dtsi
+++ /dev/null
@@ -1,186 +0,0 @@
-/ {
-       soc {
-               uio_mpax: mpax {
-                       compatible = "ti,uio-module-drv";
-                       mem  = <0x00bc00000 0x00000a00>;
-               };
-
-               uio_edma3: edma3 {
-                       compatible = "ti,uio-module-drv";
-                       mem = <0x02700000 0x000C0000>;
-               };
-               uio_secmgr: secmgr {
-                       compatible = "ti,uio-module-drv";
-                       mem  = <0x002500100 0x00000004>;
-               };
-               uio_qmss: qmss {
-                       compatible = "ti,uio-module-drv";
-                       mem  = <0x02a00000 0x00100000
-                               0x23a00000 0x00200000>;
-               };
-
-               uio_qpend0: qpend0 {
-                       compatible = "ti,uio-module-drv";
-                       interrupts = <0 44 0xf04>;
-                       interrupt-mode = <1>; /* Interrupt mode oneshot */
-                       cfg-params
-                       {
-                               ti,qm-queue = <662>;
-                       };
-               };
-
-               uio_qpend1: qpend1 {
-                       compatible = "ti,uio-module-drv";
-                       interrupts = <0 45 0xf04>;
-                       interrupt-mode = <1>; /* Interrupt mode oneshot */
-                       cfg-params
-                       {
-                               ti,qm-queue = <663>;
-                       };
-               };
-
-               uio_qpend2: qpend2 {
-                       compatible = "ti,uio-module-drv";
-                       interrupts = <0 46 0xf04>;
-                       interrupt-mode = <1>; /* Interrupt mode oneshot */
-                       cfg-params
-                       {
-                               ti,qm-queue = <664>;
-                       };
-               };
-
-               uio_qpend3: qpend3 {
-                       compatible = "ti,uio-module-drv";
-                       interrupts = <0 47 0xf04>;
-                       interrupt-mode = <1>; /* Interrupt mode oneshot */
-                       cfg-params
-                       {
-                               ti,qm-queue = <665>;
-                       };
-               };
-
-               /* The following uio cic2 entries allow access to interupt 
output
-                * by the cic2 controller: The actual input event triggering the
-                * interrupt is assumed to be programmed other drivers
-                */
-               uio_cic2_out32: cic2_out32 {
-                       compatible = "ti,uio-module-drv";
-                       interrupts = <0 451 0xf01>;
-               };
-
-               uio_cic2_out33: cic2_out33 {
-                       compatible = "ti,uio-module-drv";
-                       interrupts = <0 452 0xf01>;
-               };
-
-               uio_cic2_out34: cic2_out34 {
-                       compatible = "ti,uio-module-drv";
-                       interrupts = <0 453 0xf01>;
-               };
-
-               uio_cic2_out35: cic2_out35 {
-                       compatible = "ti,uio-module-drv";
-                       interrupts = <0 454 0xf01>;
-               };
-
-               uio_cic2_out36: cic2_out36 {
-                       compatible = "ti,uio-module-drv";
-                       interrupts = <0 455 0xf01>;
-               };
-
-               uio_cic2_out37: cic2_out37 {
-                       compatible = "ti,uio-module-drv";
-                       interrupts = <0 456 0xf01>;
-               };
-
-               uio_cic2_out38: cic2_out38 {
-                       compatible = "ti,uio-module-drv";
-                       interrupts = <0 457 0xf01>;
-               };
-
-               uio_cic2_out39: cic2_out39 {
-                       compatible = "ti,uio-module-drv";
-                       interrupts = <0 458 0xf01>;
-               };
-
-               uio_cic2_out40: cic2_out40 {
-                       compatible = "ti,uio-module-drv";
-                       interrupts = <0 459 0xf01>;
-               };
-
-               uio_cic2_out41: cic2_out41 {
-                       compatible = "ti,uio-module-drv";
-                       interrupts = <0 460 0xf01>;
-               };
-
-               uio_cic2_out42: cic2_out42 {
-                       compatible = "ti,uio-module-drv";
-                       interrupts = <0 461 0xf01>;
-               };
-
-               uio_cic2_out43: cic2_out43 {
-                       compatible = "ti,uio-module-drv";
-                       interrupts = <0 462 0xf01>;
-               };
-
-               uio_cic2_out44: cic2_out44 {
-                       compatible = "ti,uio-module-drv";
-                       interrupts = <0 463 0xf01>;
-               };
-
-               uio_cic2_out45: cic2_out45 {
-                       compatible = "ti,uio-module-drv";
-                       interrupts = <0 464 0xf01>;
-               };
-
-               uio_cic2_out46: cic2_out46 {
-                       compatible = "ti,uio-module-drv";
-                       interrupts = <0 465 0xf01>;
-               };
-
-               uio_cic2_out47: cic2_out47 {
-                       compatible = "ti,uio-module-drv";
-                       interrupts = <0 466 0xf01>;
-               };
-
-               uio_cic2_out18: cic2_out18 {
-                       compatible = "ti,uio-module-drv";
-                       interrupts = <0 467 0xf01>;
-               };
-
-               uio_cic2_out19: cic2_out19 {
-                       compatible = "ti,uio-module-drv";
-                       interrupts = <0 468 0xf01>;
-               };
-
-               uio_cic2_out22: cic2_out22 {
-                       compatible = "ti,uio-module-drv";
-                       interrupts = <0 469 0xf01>;
-               };
-
-               uio_cic2_out23: cic2_out23 {
-                       compatible = "ti,uio-module-drv";
-                       interrupts = <0 470 0xf01>;
-               };
-
-               uio_cic2_out50: cic2_out50 {
-                       compatible = "ti,uio-module-drv";
-                       interrupts = <0 471 0xf01>;
-               };
-
-               uio_cic2_out51: cic2_out51 {
-                       compatible = "ti,uio-module-drv";
-                       interrupts = <0 472 0xf01>;
-               };
-
-               uio_cic2_out66: cic2_out66 {
-                       compatible = "ti,uio-module-drv";
-                       interrupts = <0 473 0xf01>;
-               };
-
-               uio_cic2_out67: cic2_out67 {
-                       compatible = "ti,uio-module-drv";
-                       interrupts = <0 474 0xf01>;
-               };
-       };
-};
diff --git a/recipes-kernel/linux/kernel-rdepends.inc 
b/recipes-kernel/linux/kernel-rdepends.inc
index 41200c5..0425c78 100644
--- a/recipes-kernel/linux/kernel-rdepends.inc
+++ b/recipes-kernel/linux/kernel-rdepends.inc
@@ -11,23 +11,6 @@ RDEPENDS:${KERNEL_PACKAGE_NAME}-base:append:dra7xx = " 
vpdma-fw"
 # Add run-time dependency for Goodix firmware to the rootfs
 RDEPENDS:${KERNEL_PACKAGE_NAME}-base:append:dra7xx = " goodix-fw"
 
-# Install boot-monitor skern file into /boot dir of rootfs
-RDEPENDS:${KERNEL_PACKAGE_NAME}-base:append:keystone = " boot-monitor"
-
-# Install ti-sci-fw into /boot dir of rootfs
-RDEPENDS:${KERNEL_PACKAGE_NAME}-base:append:k2g = " ti-sci-fw"
-
-# Add run-time dependency for SerDes firmware to the rootfs
-RDEPENDS:${KERNEL_PACKAGE_NAME}-base:append:keystone = " serdes-fw"
-
-# Add run-time dependency for QMSS PDSP firmware to the rootfs
-RDEPENDS:${KERNEL_PACKAGE_NAME}-base:append:keystone = " qmss-pdsp-fw"
-
-# Add run-time dependency for NETCP PA firmware to the rootfs
-RDEPENDS:${KERNEL_PACKAGE_NAME}-base:append:k2hk = " netcp-pa-fw"
-RDEPENDS:${KERNEL_PACKAGE_NAME}-base:append:k2e = " netcp-pa-fw"
-RDEPENDS:${KERNEL_PACKAGE_NAME}-base:append:k2l = " netcp-pa-fw"
-
 # Add run-time dependency for PRU Ethernet firmware to the rootfs
 RDEPENDS:${KERNEL_PACKAGE_NAME}-base:append:am57xx-evm = " prueth-fw prusw-fw 
pruhsr-fw pruprp-fw"
 RDEPENDS:${KERNEL_PACKAGE_NAME}-base:append:am57xx-hs-evm = " prueth-fw 
prusw-fw pruhsr-fw pruprp-fw"
diff --git a/recipes-kernel/linux/linux-ti-mainline/k2g/defconfig 
b/recipes-kernel/linux/linux-ti-mainline/k2g/defconfig
deleted file mode 100644
index 316b04b..0000000
--- a/recipes-kernel/linux/linux-ti-mainline/k2g/defconfig
+++ /dev/null
@@ -1 +0,0 @@
-use-tisdk-config=ti_sdk_k2g_release
diff --git a/recipes-kernel/linux/linux-ti-mainline/keystone/defconfig 
b/recipes-kernel/linux/linux-ti-mainline/keystone/defconfig
deleted file mode 100644
index 5a40b93..0000000
--- a/recipes-kernel/linux/linux-ti-mainline/keystone/defconfig
+++ /dev/null
@@ -1 +0,0 @@
-use-tisdk-config=ti_sdk_keystone_release
diff --git a/recipes-kernel/linux/linux-ti-staging-5.10/k2g/defconfig 
b/recipes-kernel/linux/linux-ti-staging-5.10/k2g/defconfig
deleted file mode 100644
index 316b04b..0000000
--- a/recipes-kernel/linux/linux-ti-staging-5.10/k2g/defconfig
+++ /dev/null
@@ -1 +0,0 @@
-use-tisdk-config=ti_sdk_k2g_release
diff --git a/recipes-kernel/linux/linux-ti-staging-5.10/keystone/defconfig 
b/recipes-kernel/linux/linux-ti-staging-5.10/keystone/defconfig
deleted file mode 100644
index 5a40b93..0000000
--- a/recipes-kernel/linux/linux-ti-staging-5.10/keystone/defconfig
+++ /dev/null
@@ -1 +0,0 @@
-use-tisdk-config=ti_sdk_keystone_release
diff --git a/recipes-kernel/linux/linux-ti-staging-5.4/k2g/defconfig 
b/recipes-kernel/linux/linux-ti-staging-5.4/k2g/defconfig
deleted file mode 100644
index 316b04b..0000000
--- a/recipes-kernel/linux/linux-ti-staging-5.4/k2g/defconfig
+++ /dev/null
@@ -1 +0,0 @@
-use-tisdk-config=ti_sdk_k2g_release
diff --git a/recipes-kernel/linux/linux-ti-staging-5.4/keystone/defconfig 
b/recipes-kernel/linux/linux-ti-staging-5.4/keystone/defconfig
deleted file mode 100644
index 5a40b93..0000000
--- a/recipes-kernel/linux/linux-ti-staging-5.4/keystone/defconfig
+++ /dev/null
@@ -1 +0,0 @@
-use-tisdk-config=ti_sdk_keystone_release
diff --git a/recipes-kernel/linux/linux-ti-staging-rt-5.10/k2g/defconfig 
b/recipes-kernel/linux/linux-ti-staging-rt-5.10/k2g/defconfig
deleted file mode 100644
index a9c24f2..0000000
--- a/recipes-kernel/linux/linux-ti-staging-rt-5.10/k2g/defconfig
+++ /dev/null
@@ -1 +0,0 @@
-use-tisdk-config=ti_sdk_k2g_rt_release
diff --git a/recipes-kernel/linux/linux-ti-staging-rt-5.10/keystone/defconfig 
b/recipes-kernel/linux/linux-ti-staging-rt-5.10/keystone/defconfig
deleted file mode 100644
index fc68085..0000000
--- a/recipes-kernel/linux/linux-ti-staging-rt-5.10/keystone/defconfig
+++ /dev/null
@@ -1 +0,0 @@
-use-tisdk-config=ti_sdk_keystone_rt_release
diff --git a/recipes-kernel/linux/linux-ti-staging-rt-5.4/k2g/defconfig 
b/recipes-kernel/linux/linux-ti-staging-rt-5.4/k2g/defconfig
deleted file mode 100644
index a9c24f2..0000000
--- a/recipes-kernel/linux/linux-ti-staging-rt-5.4/k2g/defconfig
+++ /dev/null
@@ -1 +0,0 @@
-use-tisdk-config=ti_sdk_k2g_rt_release
diff --git a/recipes-kernel/linux/linux-ti-staging-rt-5.4/keystone/defconfig 
b/recipes-kernel/linux/linux-ti-staging-rt-5.4/keystone/defconfig
deleted file mode 100644
index fc68085..0000000
--- a/recipes-kernel/linux/linux-ti-staging-rt-5.4/keystone/defconfig
+++ /dev/null
@@ -1 +0,0 @@
-use-tisdk-config=ti_sdk_keystone_rt_release
diff --git a/recipes-kernel/linux/linux-ti-staging-systest-5.10/k2g/defconfig 
b/recipes-kernel/linux/linux-ti-staging-systest-5.10/k2g/defconfig
deleted file mode 100644
index abfb330..0000000
--- a/recipes-kernel/linux/linux-ti-staging-systest-5.10/k2g/defconfig
+++ /dev/null
@@ -1 +0,0 @@
-use-tisdk-config=ti_sdk_k2g_debug
diff --git 
a/recipes-kernel/linux/linux-ti-staging-systest-5.10/keystone/defconfig 
b/recipes-kernel/linux/linux-ti-staging-systest-5.10/keystone/defconfig
deleted file mode 100644
index e95bcf9..0000000
--- a/recipes-kernel/linux/linux-ti-staging-systest-5.10/keystone/defconfig
+++ /dev/null
@@ -1 +0,0 @@
-use-tisdk-config=ti_sdk_keystone_debug
diff --git a/recipes-kernel/linux/linux-ti-staging-systest-5.4/k2g/defconfig 
b/recipes-kernel/linux/linux-ti-staging-systest-5.4/k2g/defconfig
deleted file mode 100644
index abfb330..0000000
--- a/recipes-kernel/linux/linux-ti-staging-systest-5.4/k2g/defconfig
+++ /dev/null
@@ -1 +0,0 @@
-use-tisdk-config=ti_sdk_k2g_debug
diff --git 
a/recipes-kernel/linux/linux-ti-staging-systest-5.4/keystone/defconfig 
b/recipes-kernel/linux/linux-ti-staging-systest-5.4/keystone/defconfig
deleted file mode 100644
index e95bcf9..0000000
--- a/recipes-kernel/linux/linux-ti-staging-systest-5.4/keystone/defconfig
+++ /dev/null
@@ -1 +0,0 @@
-use-tisdk-config=ti_sdk_keystone_debug
diff --git a/recipes-kernel/linux/ti-uio.inc b/recipes-kernel/linux/ti-uio.inc
index 55d3597..eea7866 100644
--- a/recipes-kernel/linux/ti-uio.inc
+++ b/recipes-kernel/linux/ti-uio.inc
@@ -1,8 +1,3 @@
-SRC_URI:append:keystone = " file://keystone-uio.dtsi"
-SRC_URI:append:k2hk = " file://k2hk-uio.dtsi"
-SRC_URI:append:k2l = " file://k2l-uio.dtsi"
-SRC_URI:append:k2e = " file://k2e-uio.dtsi"
-SRC_URI:append:k2g = " file://keystone-k2g-pru-uio.dtsi"
 SRC_URI:append:dra7xx = " file://am57xx-pru-uio.dtsi \
                           file://am571x-pru-uio.dtsi \
 "
@@ -10,10 +5,6 @@ SRC_URI:append:ti33x = " file://am335x-pru-uio.dtsi"
 SRC_URI:append:ti43x = " file://am437x-pru-uio.dtsi"
 
 DTSI_LIST = ""
-DTSI_LIST:append:keystone = " keystone-uio.dtsi"
-DTSI_LIST:append:k2hk = " k2hk-uio.dtsi"
-DTSI_LIST:append:k2l = " k2l-uio.dtsi"
-DTSI_LIST:append:k2e = " k2e-uio.dtsi"
 
 do_setup_uio() {
     if [ "${ENABLE_TI_UIO_DEVICES}" == "1" ]
@@ -77,16 +68,4 @@ do_setup_uio:append:ti43x() {
     fi
 }
 
-do_setup_uio:append:k2g() {
-
-    if [ "${ENABLE_TI_UIO_DEVICES}" == "1" ]
-    then
-        dts="keystone-k2g-ice-pru-excl-uio.dts"
-        dtsi="keystone-k2g-pru-uio.dtsi"
-        cp ${S}/arch/arm/boot/dts/keystone-k2g-ice.dts 
${S}/arch/arm/boot/dts/$dts
-        cp ${WORKDIR}/${dtsi} ${S}/arch/arm/boot/dts/
-        echo "#include \"${dtsi}\"" >> ${S}/arch/arm/boot/dts/$dts
-    fi
-}
-
 do_patch[postfuncs] += "do_setup_uio"
diff --git a/recipes-ti/ctoolslib/libaet_git.bb 
b/recipes-ti/ctoolslib/libaet_git.bb
index 6d6680f..c15ab22 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 82fea28..ab5cbdb 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 1879a3f..4962a3e 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 a43d693..56667ad 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 3439cab..abef319 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 ed712ba..01b857c 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 119c070..59a9635 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 b5186e0..59576da 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 9ab9c50..460964b 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";
 
-- 
2.7.4

-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#14329): 
https://lists.yoctoproject.org/g/meta-ti/message/14329
Mute This Topic: https://lists.yoctoproject.org/mt/88709639/21656
Group Owner: meta-ti+ow...@lists.yoctoproject.org
Unsubscribe: https://lists.yoctoproject.org/g/meta-ti/unsub 
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-

Reply via email to