linux-ti-staging: update ti2018.02-rc4 tag

Signed-off-by: Dan Murphy <dmurphy@ti.com> Signed-off-by: Denys Dmytriyenko <denys@ti.com>
u-boot-ti-staging: update to ti2018.02-rc4 tag
2026-01-12 09:30:21 +00:00 · 2018-07-11 16:19:09 +00:00 · 2018-07-11 16:19:04 +00:00 · 2018-07-10 05:50:44 +00:00 · 2018-07-10 05:50:40 +00:00 · 2018-07-09 19:27:02 +00:00
339 changed files with 4119 additions and 4129 deletions
--- a/4
+++ b/4
@@ -8,7 +8,7 @@ This layer depends on:

 URI: git://git.openembedded.org/openembedded-core
 layers: meta
-branch: zeus
+branch: rocko


 The base BSP part of meta-ti should work with different OpenEmbedded/Yocto
@@ -20,6 +20,6 @@ Please follow the recommended setup procedures of your OE distribution.

 Send pull requests, patches, comments or questions to meta-ti@yoctoproject.org
 Please note - meta-ti mailing list requires subscription for posting:
-https://lists.yoctoproject.org/g/meta-ti
+https://lists.yoctoproject.org/listinfo/meta-ti

 Maintainers: Denys Dmytriyenko <denys@ti.com>
--- a/classes/ti-pdk-fetch.bbclass
+++ b/classes/ti-pdk-fetch.bbclass
@@ -1,46 +0,0 @@
-TI_PDK_GIT_URI ?= "git://git.ti.com/processor-sdk/pdk.git"
-TI_PDK_GIT_BRANCH ?= "master"
-TI_PDK_GIT_PROTOCOL ?= "git"
-TI_PDK_SRCREV ?= "9c04a8f4ac2ed95100ee50163b3189d28b9680f1"
-
-TI_PDK_VERSION ?= "2020.4.16"
-
-PV = "${TI_PDK_VERSION}"
-
-TI_PDK_COMP ?= ""
-TI_PDK_COMP_PATH = "${@'${TI_PDK_COMP}'.replace('.','/')}"
-
-TI_PDK_SOURCE_PN = "ti-pdk-source"
-TI_PDK_SOURCE_WORKDIR = "${TMPDIR}/work-shared/ti-pdk-${PV}"
-TI_PDK_SOURCE = "${TI_PDK_SOURCE_WORKDIR}/git"
-
-S = "${WORKDIR}/git/${TI_PDK_COMP_PATH}"
-
-# Hard-link only required sources from PDK
-python do_unpack_append() {
-    if len(d.getVar('TI_PDK_COMP') or '') > 0:
-        import shutil
-
-        # Get src/dst paths
-        src = os.path.join(d.getVar('TI_PDK_SOURCE'),'packages',d.getVar('TI_PDK_COMP_PATH'))
-        s = d.getVar('S')
-
-        # Set up the directory structure, except for the root of the sources
-        # hard-linked.
-        bb.utils.mkdirhier(s)
-        os.rmdir(s)
-
-        # Recursively hard-link the sources
-        shutil.copytree(src, s, copy_function=os.link)
-
-        # Recursively hard-link the git directory
-        shutil.copytree(os.path.join(d.getVar('TI_PDK_SOURCE'),'.git'), os.path.join(s,'.git'), copy_function=os.link)
-}
-
-# Make sure that ti-pdk-source is unpacked before we set up the hardlinks.
-python __anonymous () {
-    pn = d.getVar('PN')
-    pdk_src_pn = d.getVar('TI_PDK_SOURCE_PN')
-    if pn != pdk_src_pn:
-        d.appendVarFlag('do_unpack', 'depends', ' ${TI_PDK_SOURCE_PN}:do_unpack')
-}
--- a/classes/ti-pdk.bbclass
+++ b/classes/ti-pdk.bbclass
@@ -9,10 +9,6 @@ DEPENDS_append_omap-a15 = " ti-cgt-arm-native"
 DEPENDS_remove_ti33x = "ti-cgt6x-native"
 DEPENDS_remove_ti43x = "ti-cgt6x-native"
 DEPENDS_append_omapl1 = " ti-cgt-arm-native"
-DEPENDS_remove_am65xx = "gcc-arm-none-eabi-native ti-cgt6x-native"
-DEPENDS_append_am65xx = " ti-cgt-arm-native gcc-linaro-baremetal-aarch64-native"
-DEPENDS_remove_j7-evm = "gcc-arm-none-eabi-native"
-DEPENDS_append_j7-evm = " ti-cgt-arm-native gcc-linaro-baremetal-aarch64-native ti-cgt7x-native"

 S = "${WORKDIR}/git"
 B = "${WORKDIR}/build"
@@ -45,11 +41,7 @@ export TOOLCHAIN_PATH_A15 = "${GCC_ARM_NONE_TOOLCHAIN}"
 export TOOLCHAIN_PATH_M4 = "${M4_TOOLCHAIN_INSTALL_DIR}"
 export TOOLCHAIN_PATH_Arm9 = "${M4_TOOLCHAIN_INSTALL_DIR}"
 export C6X_GEN_INSTALL_PATH = "${STAGING_DIR_NATIVE}/usr/share/ti/cgt-c6x"
-export C7X_GEN_INSTALL_PATH = "${STAGING_DIR_NATIVE}/usr/share/ti/cgt-c7x"
-export TOOLCHAIN_PATH_EVE = "${STAGING_DIR_NATIVE}/usr/share/ti/cgt-arp32"
 export CL_PRU_INSTALL_PATH = "${TI_CGT_PRU_INSTALL_DIR}"
-export TOOLCHAIN_PATH_GCC_ARCH64 = "${GCC_LINARO_BAREMETAL_AARCH64_TOOLCHAIN}"
-export TOOLCHAIN_PATH_R5 = "${M4_TOOLCHAIN_INSTALL_DIR}"

 export ROOTDIR = "${B}"
 export BIOS_INSTALL_PATH = "${SYSBIOS_INSTALL_DIR}"
@@ -62,7 +54,7 @@ export SECTTI="perl ${CG_XML_INSTALL_DIR}/ofd/sectti.pl"
 TI_PDK_XDCMAKE ?= "1"

 # By default, only build the cores with available toolchains
-TI_PDK_LIMIT_CORES ?= "a15_0 ipu1_0 ipu1_1 ipu2_0 ipu2_1 mpu1_0 mcu1_0 mcu1_1 mcu2_0 mcu2_1 mcu3_0 mcu3_1 c66x c66xdsp_1 c66xdsp_2 c7x_1 arm9_0 c674x a9host a8host pru_0 pru_1"
+TI_PDK_LIMIT_CORES ?= "a15_0 ipu1_0 ipu1_1 ipu2_0 ipu2_1 c66x c66xdsp_1 c66xdsp_2 arm9_0 c674x a9host a8host pru_0 pru_1"
 TI_PDK_LIMIT_SOCS ?= ""
 TI_PDK_LIMIT_BOARDS ?= ""
 TI_PDK_MAKE_TARGET ?= "release"
@@ -71,7 +63,7 @@ TI_PDK_DOXYGEN_SUPPORT ?= "1"

 TI_PDK_XDC_ARGS ?= "${TI_PDK_LIMIT_SOCS}"

-PARALLEL_XDC = "${@oe.utils.parallel_make_argument(d, '--jobs=%d')}"
+PARALLEL_XDC = "--jobs=${BB_NUMBER_THREADS}"
 PARALLEL_MAKE = ""

 def get_doxygen_support(d):
--- a/conf/layer.conf
+++ b/conf/layer.conf
@@ -8,8 +8,6 @@ BBFILE_COLLECTIONS += "meta-ti"
 BBFILE_PATTERN_meta-ti := "^${LAYERDIR}/"
 BBFILE_PRIORITY_meta-ti = "6"

-LAYERSERIES_COMPAT_meta-ti = "sumo thud warrior zeus"
-
 LICENSE_PATH += "${LAYERDIR}/licenses"

 LAYERDEPENDS_meta-ti = "core"
@@ -17,6 +15,8 @@ LAYERDEPENDS_meta-ti = "core"
 SIGGEN_EXCLUDERECIPES_ABISAFE += " \
    ti-sgx-ddk-km \
    ti-sgx-ddk-um \
+    ti-ipc \
+    ti-ipc-rtos \
    cmem-mod \
    hplib-mod \
    gdbserverproxy-module-drv \
--- a/conf/machine/am335x-evm.conf
+++ b/conf/machine/am335x-evm.conf
@@ -7,9 +7,10 @@ require conf/machine/include/ti33x.inc
 MACHINE_GUI_CLASS = "smallscreen"
 MACHINE_FEATURES += "touchscreen"

-IMAGE_FSTYPES += "ubifs ubi"
+IMAGE_FSTYPES += "ubifs ubi tar.xz"

 # Normally AM335 boards use ttyS0, but ICE uses ttyS3, so try both
+SERIAL_CONSOLE = ""
 SERIAL_CONSOLES = "115200;ttyS0 115200;ttyS3"
 SERIAL_CONSOLES_CHECK = "${SERIAL_CONSOLES}"

@@ -24,7 +25,7 @@ SERIAL_CONSOLES_CHECK = "${SERIAL_CONSOLES}"
 # UBI: logical eraseblock size:    126976 bytes
 # from ubiattach stdout:
 # UBI device number 0, total 1988 LEBs
-MKUBIFS_ARGS ?= "-F -m 2048 -e 126976 -c 9900"
+MKUBIFS_ARGS = "-F -m 2048 -e 126976 -c 8000"

 # do ubiattach /dev/ubi_ctrl -m 7 -O 2048
 # from dmesg:
@@ -32,4 +33,4 @@ MKUBIFS_ARGS ?= "-F -m 2048 -e 126976 -c 9900"
 # UBI: physical eraseblock size:   131072 bytes (128 KiB)
 # UBI: sub-page size:              512
 # UBI: VID header offset:          2048 (aligned 2048)
-UBINIZE_ARGS ?= "-m 2048 -p 128KiB -s 512 -O 2048"
+UBINIZE_ARGS = "-m 2048 -p 128KiB -s 512 -O 2048"
--- a/conf/machine/am335x-hs-evm.conf
+++ b/conf/machine/am335x-hs-evm.conf
@@ -1,6 +1,6 @@
 #@TYPE: Machine
 #@NAME: AM335x HS EVM
-#@DESCRIPTION: Machine configuration for the TI AM335x HS EVM
+#@DESCRIPTION: Machine configuration for the TI AM435x HS EVM

 require conf/machine/am335x-evm.conf

--- a/conf/machine/am3517-evm.conf
+++ b/conf/machine/am3517-evm.conf
@@ -7,10 +7,10 @@ require conf/machine/include/omap3.inc
 MACHINE_GUI_CLASS = "smallscreen"
 MACHINE_FEATURES += "touchscreen ethernet"

-IMAGE_FSTYPES += "ubi tar.xz"
+IMAGE_FSTYPES += "ubi tar.gz"
 EXTRA_IMAGECMD_jffs2 = "-lnp -e 0x20000 -s 2048"

-SERIAL_CONSOLES = "115200;ttyS2"
+SERIAL_CONSOLE = "115200 ttyS2"
 USE_VT = "2"

 KERNEL_DEVICETREE = "am3517-evm.dtb"
--- a/conf/machine/am37x-evm.conf
+++ b/conf/machine/am37x-evm.conf
@@ -7,12 +7,12 @@ require conf/machine/include/omap3.inc
 MACHINE_GUI_CLASS = "smallscreen"
 MACHINE_FEATURES += "touchscreen ethernet"

-IMAGE_FSTYPES += "ubi tar.xz"
+IMAGE_FSTYPES += "ubi tar.gz"
 EXTRA_IMAGECMD_jffs2 = "-lnp -e 0x20000 -s 2048"

 KERNEL_DEVICETREE = "omap3-evm-37xx.dtb"

-SERIAL_CONSOLES = "115200;ttyS0"
+SERIAL_CONSOLE = "115200 ttyS0"

 # NOTE: there are NAND and OneNAND versions of this board...
 # do ubiattach /dev/ubi_ctrl -m 4
--- a/conf/machine/am437x-evm.conf
+++ b/conf/machine/am437x-evm.conf
@@ -7,9 +7,9 @@ require conf/machine/include/ti43x.inc
 MACHINE_GUI_CLASS = "smallscreen"
 MACHINE_FEATURES += "touchscreen"

-IMAGE_FSTYPES += "ubifs ubi"
+IMAGE_FSTYPES += "ubifs ubi tar.xz"

-SERIAL_CONSOLES = "115200;ttyS0"
+SERIAL_CONSOLE = "115200 ttyS0"

 # UBI information.  Note that this is board and kernel specific.  Changes
 # in your kernel port may require changes in these variables.  For more
@@ -22,7 +22,7 @@ SERIAL_CONSOLES = "115200;ttyS0"
 # UBI: logical eraseblock size:    253952 bytes
 # from ubiattach stdout:
 # UBI device number 0, total 994 LEBs
-MKUBIFS_ARGS = "-F -m 4096 -e 253952 -c 4800"
+MKUBIFS_ARGS = "-F -m 4096 -e 253952 -c 4000"

 # do ubiattach /dev/ubi_ctrl -m 11 -O 4096
 # from dmesg:
--- a/conf/machine/am57xx-evm.conf
+++ b/conf/machine/am57xx-evm.conf
@@ -6,28 +6,18 @@ require conf/machine/include/dra7xx.inc

 MACHINE_FEATURES += "touchscreen"

-SERIAL_CONSOLES = "115200;ttyS2"
+IMAGE_FSTYPES += "tar.xz"

-KERNEL_DEVICETREE = " \
-    am57xx-beagle-x15.dtb \
-    am57xx-beagle-x15-revb1.dtb \
-    am57xx-beagle-x15-revc.dtb \
-    am5729-beagleboneai.dtb \
-    am57xx-evm.dtb \
-    am57xx-evm-cam-ov10635.dtb \
-    am57xx-evm-reva3.dtb \
-    am57xx-evm-reva3-cam-ov10635.dtb \
-    am571x-idk.dtb \
-    am571x-idk-lcd-osd101t2045.dtb \
-    am571x-idk-lcd-osd101t2587.dtb \
-    am572x-idk.dtb \
-    am572x-idk-lcd-osd101t2045.dtb \
-    am572x-idk-lcd-osd101t2587.dtb \
-    am574x-idk.dtb \
-    am574x-idk-lcd-osd101t2587.dtb \
-"
+SERIAL_CONSOLE = "115200 ttyS2"

-KERNEL_DEVICETREE += "${@oe.utils.conditional('ENABLE_TI_UIO_DEVICES', '1', 'am574x-idk-pru-excl-uio.dtb am572x-idk-pru-excl-uio.dtb am571x-idk-pru-excl-uio.dtb', '', d)}"
+KERNEL_DEVICETREE = "am57xx-beagle-x15.dtb am57xx-beagle-x15-revb1.dtb am57xx-beagle-x15-revc.dtb \
+                    am57xx-evm.dtb am57xx-evm-cam-mt9t111.dtb am57xx-evm-cam-ov10635.dtb \
+                    am57xx-evm-reva3.dtb am57xx-evm-reva3-cam-mt9t111.dtb am57xx-evm-reva3-cam-ov10635.dtb \
+                    am571x-idk.dtb am571x-idk-lcd-osd101t2045.dtb am571x-idk-lcd-osd101t2587.dtb \
+                    am572x-idk.dtb am572x-idk-lcd-osd101t2045.dtb am572x-idk-lcd-osd101t2587.dtb \
+                    am574x-idk.dtb am574x-idk-lcd-osd101t2587.dtb"
+
+KERNEL_DEVICETREE += "${@base_conditional('ENABLE_TI_UIO_DEVICES', '1', 'am574x-idk-pru-excl-uio.dtb am572x-idk-pru-excl-uio.dtb am571x-idk-pru-excl-uio.dtb', '', d)}"

 UBOOT_MACHINE = "am57xx_evm_config"

--- a/conf/machine/am65xx-evm.conf
+++ b/conf/machine/am65xx-evm.conf
@@ -2,24 +2,26 @@
 #@NAME: AM65xx EVM
 #@DESCRIPTION: Machine configuration for the TI AM65xx EVM

-require conf/machine/include/am65xx.inc
+require conf/machine/include/k3.inc

 MACHINE_FEATURES += "touchscreen"

-SERIAL_CONSOLES = "115200;ttyS2 115200;ttyS1"
-SERIAL_CONSOLES_CHECK = "${SERIAL_CONSOLES}"
+IMAGE_FSTYPES += "tar.xz cpio cpio.xz wic.xz"
+
+SERIAL_CONSOLE = "115200 ttyS2"

 KERNEL_DEVICETREE = " \
-    ti/k3-am654-base-board.dtb ti/k3-am654-gp.dtbo \
-    ti/k3-am654-evm-hdmi.dtbo ti/k3-am654-idk.dtbo \
-    ti/k3-am654-evm-oldi-lcd1evm.dtbo ti/k3-am654-evm-tc358876.dtbo \
-    ti/k3-am654-pcie-usb2.dtbo ti/k3-am654-pcie-usb3.dtbo \
-    ti/k3-am654-base-board-jailhouse.dtbo \
-    ti/k3-am654-evm-prupwm.dtbo \
-"
+    ti/k3-am654-base-board.dtb \
+    ti/k3-am654-evm-csi2-ov490.dtbo ti/k3-am654-evm-oldi-lcd1evm.dtbo \
+    ti/k3-am654-idk.dtbo ti/k3-am654-pcie-usb2.dtbo ti/k3-am654-pcie-usb3.dtbo"

 UBOOT_MACHINE = "am65x_evm_a53_defconfig"

 OPTEEMACHINE = "k3"
 OPTEEFLAVOR = "am65x"
 OPTEEOUTPUTMACHINE = "k3"
+
+WKS_FILE = "sdimage-bootpart.wks"
+IMAGE_BOOT_FILES = "u-boot.img"
+
+do_image_wic[depends] += "mtools-native:do_populate_sysroot dosfstools-native:do_populate_sysroot"
--- a/conf/machine/am65xx-hs-evm.conf
+++ b/conf/machine/am65xx-hs-evm.conf
@@ -1,26 +0,0 @@
-#@TYPE: Machine
-#@NAME: AM65xx HS EVM
-#@DESCRIPTION: Machine configuration for the TI AM65xx HS EVM
-
-require conf/machine/am65xx-evm.conf
-
-UBOOT_MACHINE = "am65x_hs_evm_a53_defconfig"
-
-UBOOT_ENTRYPOINT =       "0x80080000"
-UBOOT_LOADADDRESS =      "0x80080000"
-UBOOT_RD_LOADADDRESS =   "0x84000000"
-UBOOT_RD_ENTRYPOINT =    "0x84000000"
-UBOOT_DTB_LOADADDRESS =  "0x83000000"
-UBOOT_DTBO_LOADADDRESS = "0x83080000"
-UBOOT_DTBO_OFFSET =      "0x00010000"
-
-SPL_BINARY = "tispl.bin_HS"
-SPL_BINARYNAME = "tispl.bin"
-UBOOT_BINARY = "u-boot.img_HS"
-IMAGE_BOOT_FILES = "${UBOOT_BINARY}"
-
-TI_SECURE_DEV_PKG = "${TI_SECURE_DEV_PKG_K3}"
-
-OPTEEMACHINE = "k3"
-OPTEEFLAVOR = "am65x"
-OPTEEOUTPUTMACHINE = "k3"
--- a/conf/machine/beagle-x15.conf
+++ b/conf/machine/beagle-x15.conf
@@ -8,6 +8,33 @@ KERNEL_DEVICETREE = "am57xx-beagle-x15.dtb am57xx-beagle-x15-revb1.dtb am57xx-be

 MACHINE_GUI_CLASS = "bigscreen"

-SERIAL_CONSOLES = "115200;ttyS2"
+SERIAL_CONSOLE = "115200 ttyS2"

 UBOOT_MACHINE = "am57xx_evm_config"
+
+WKS_FILE = "sdimage-bootpart.wks"
+IMAGE_BOOT_FILES = "MLO u-boot.img"
+IMAGE_FSTYPES += "tar.xz wic.xz"
+
+do_image_wic[depends] += "mtools-native:do_populate_sysroot dosfstools-native:do_populate_sysroot"
+
+# UBI information.  Note that this is board and kernel specific.  Changes
+# in your kernel port may require changes in these variables.  For more
+# details about this board please see
+# http://processors.wiki.ti.com/index.php/UBIFS_Support
+
+# do ubiattach /dev/ubi_ctrl -m 7 -O 2048
+# From dmesg:
+# UBI: smallest flash I/O unit:    2048
+# UBI: logical eraseblock size:    126976 bytes
+# from ubiattach stdout:
+# UBI device number 0, total 1988 LEBs
+MKUBIFS_ARGS = "-F -m 2048 -e 126976 -c 8192"
+
+# do ubiattach /dev/ubi_ctrl -m 7 -O 2048
+# from dmesg:
+# UBI: smallest flash I/O unit:    2048
+# UBI: physical eraseblock size:   131072 bytes (128 KiB)
+# UBI: sub-page size:              512
+# UBI: VID header offset:          2048 (aligned 2048)
+UBINIZE_ARGS = "-m 2048 -p 128KiB -s 512 -O 2048"
--- a/conf/machine/beagleboard.conf
+++ b/conf/machine/beagleboard.conf
@@ -7,12 +7,12 @@ require conf/machine/include/omap3.inc
 # Only has DVI connector for external screen
 MACHINE_GUI_CLASS = "bigscreen"

-IMAGE_FSTYPES += "tar.xz ubi"
+IMAGE_FSTYPES += "tar.gz ubi"
 EXTRA_IMAGECMD_jffs2 = "-lnp"

 KERNEL_DEVICETREE = "omap3-beagle.dtb omap3-beagle-xm.dtb omap3-beagle-xm-ab.dtb"

-SERIAL_CONSOLES = "115200;ttyS2"
+SERIAL_CONSOLE = "115200 ttyS2"

 UBOOT_MACHINE = "omap3_beagle_config"

--- a/conf/machine/beaglebone.conf
+++ b/conf/machine/beaglebone.conf
@@ -1,8 +1,9 @@
 #@TYPE: Machine
 #@NAME: BeagleBone machine
-#@DESCRIPTION: Machine configuration for the http://beagleboard.org/bone board
+#@DESCRIPTION: Machine configuration for the http://beagleboard.org/bone board 

 require conf/machine/include/ti33x.inc
+require conf/machine/include/beaglebone.inc

 KERNEL_DEVICETREE = "am335x-bone.dtb am335x-boneblue.dtb \
                    am335x-boneblack.dtb am335x-boneblack-wireless.dtb \
@@ -11,9 +12,15 @@ KERNEL_DEVICETREE = "am335x-bone.dtb am335x-boneblue.dtb \
 # Only has DVI connector for external screen
 MACHINE_GUI_CLASS = "bigscreen"

-SERIAL_CONSOLES = "115200;ttyS0"
+SERIAL_CONSOLE = "115200 ttyS0"

-IMAGE_INSTALL_append = " kernel-devicetree kernel-image-zimage"
+UBOOT_MACHINE = "am335x_boneblack_config"
+
+WKS_FILE = "sdimage-bootpart.wks"
+IMAGE_BOOT_FILES = "MLO u-boot.img"
+IMAGE_FSTYPES += "tar.xz wic.xz"
+
+do_image_wic[depends] += "mtools-native:do_populate_sysroot dosfstools-native:do_populate_sysroot"

 # Refine the list of device targets for ti-pdk class recipes
 TI_PDK_LIMIT_BOARDS = "bbbAM335x"
--- a/conf/machine/dra7xx-evm.conf
+++ b/conf/machine/dra7xx-evm.conf
@@ -6,24 +6,15 @@ require conf/machine/include/dra7xx.inc

 MACHINE_FEATURES += "touchscreen"

-SERIAL_CONSOLES = "115200;ttyS0"
+IMAGE_FSTYPES += "tar.xz"

-KERNEL_DEVICETREE = " \
-    dra7-evm.dtb \
-    dra7-evm-lcd-osd101t2045.dtb \
-    dra7-evm-lcd-osd101t2587.dtb \
-    dra71-evm.dtb \
-    dra71-evm-nand.dtb \
-    dra71-evm-lcd-auo-g101evn01.0.dtb \
-    dra72-evm.dtb \
-    dra72-evm-lcd-osd101t2045.dtb \
-    dra72-evm-lcd-osd101t2587.dtb \
-    dra72-evm-revc.dtb \
-    dra72-evm-revc-lcd-osd101t2045.dtb \
-    dra72-evm-revc-lcd-osd101t2587.dtb \
-    dra76-evm.dtb \
-    dra76-evm-tfp410.dtb \
-"
+SERIAL_CONSOLE = "115200 ttyS0"
+
+KERNEL_DEVICETREE = "dra7-evm.dtb dra7-evm-lcd-osd101t2045.dtb dra7-evm-lcd-osd101t2587.dtb \
+                    dra72-evm.dtb dra72-evm-lcd-osd101t2045.dtb dra72-evm-lcd-osd101t2587.dtb \
+                    dra72-evm-revc.dtb dra72-evm-revc-lcd-osd101t2045.dtb dra72-evm-revc-lcd-osd101t2587.dtb \
+                    dra71-evm.dtb dra71-evm-nand.dtb dra71-evm-lcd-auo-g101evn01.0.dtb dra71-lcard.dtb \
+                    dra76-evm.dtb dra76-evm-tfp410.dtb"

 UBOOT_MACHINE = "dra7xx_evm_config"

--- a/conf/machine/include/am65xx.inc
+++ b/conf/machine/include/am65xx.inc
@@ -1,7 +0,0 @@
-require conf/machine/include/k3.inc
-SOC_FAMILY_append = ":am65xx"
-
-# Set the list of device targets for ti-pdk class recipes
-TI_PDK_LIMIT_SOCS = "am65xx"
-TI_PDK_LIMIT_BOARDS = "am65xx_evm am65xx_idk"
-TI_PDK_LIMIT_CORES = "mcu1_0 mpu1_0"
--- a/conf/machine/include/beaglebone.inc
+++ b/conf/machine/include/beaglebone.inc
@@ -0,0 +1,12 @@
+python () {
+    layers = d.getVar("BBFILE_COLLECTIONS")
+    if not layers:
+        return
+    if "yoctobsp" in layers:
+        bb.fatal("\nmeta-yocto-bsp has been detected in bblayers.conf, which provides basic reference BSP for beaglebone platform. " \
+                "\nSince meta-ti provides official comprehensive BSP for TI SoCs, including beaglebone, there could be potential conflicts " \
+                "\nbetween beaglebone machine definitions available in meta-yocto-bsp and meta-ti layers. It is recommended to remove " \
+                "\nor disable meta-yocto-bsp in bblayers.conf, when using meta-ti and building for beaglebone platform. Alternatively, " \
+                "\nit is possible to build for am335x-evm with meta-ti, which is a more generic platform for Sitara AM335x SoC and " \
+                "\nalso covers beaglebone variants.")
+}
--- a/conf/machine/include/davinci.inc
+++ b/conf/machine/include/davinci.inc
@@ -16,7 +16,7 @@ UBOOT_LOADADDRESS = "0x80008000"

 EXTRA_IMAGEDEPENDS += "u-boot"

-SERIAL_CONSOLES ?= "115200;ttyS0"
+SERIAL_CONSOLE ?= "115200 ttyS0"
 EXTRA_IMAGECMD_jffs2 = "--pad --little-endian --eraseblock=0x20000 -n"

 MACHINE_FEATURES = "kernel26 serial ethernet usbhost usbgadget mmc alsa"
--- a/conf/machine/include/k3.inc
+++ b/conf/machine/include/k3.inc
@@ -17,10 +17,9 @@ UBOOT_ARCH = "arm"
 UBOOT_ENTRYPOINT = "0x80008000"
 UBOOT_LOADADDRESS = "0x80008000"

-SPL_BINARY = "tispl.bin"
-UBOOT_SUFFIX = "img"
-
-EXTRA_IMAGEDEPENDS += "virtual/bootloader"
+EXTRA_IMAGEDEPENDS += " \
+    virtual/bootloader \
+"

 MACHINE_GUI_CLASS = "smallscreen"

@@ -29,14 +28,5 @@ MACHINE_GUI_CLASS = "smallscreen"
 UBI_VOLNAME = "rootfs"

 # List common SoC features, may need to add touchscreen for specific machines
-MACHINE_FEATURES = "kernel26 apm usbgadget usbhost vfat ext2 screen alsa ethernet pci gpu"
-# Not ready yet - dsp mmip
-
-IMAGE_FSTYPES += "tar.xz wic.xz"
-
-# Please note that booting K3 platform also requires
-# tiboot3.bin and sysfw.itb, which are provided by meta-arago
-# u-boot-k3-r5 and ti-sci-fw recipes
-IMAGE_BOOT_FILES ?= "${SPL_BINARY} u-boot.${UBOOT_SUFFIX}"
-WKS_FILE ?= "sdimage-bootpart.wks"
-do_image_wic[depends] += "u-boot:do_deploy"
+MACHINE_FEATURES = "kernel26 apm usbgadget usbhost vfat ext2 screen alsa ethernet pci"
+# Not ready yet - sgx dsp mmip
--- a/conf/machine/include/keystone.inc
+++ b/conf/machine/include/keystone.inc
@@ -16,9 +16,6 @@ KERNEL_IMAGETYPE = "zImage"
 UBOOT_ENTRYPOINT = "0x80008000"
 UBOOT_LOADADDRESS = "0x80008000"

-SPL_BINARY = "MLO"
-UBOOT_SUFFIX = "bin"
-
 # Use the expected value of the ubifs filesystem's volume name in the kernel
 # and u-boot.
 UBI_VOLNAME = "rootfs"
--- a/conf/machine/include/omap-a15.inc
+++ b/conf/machine/include/omap-a15.inc
@@ -19,9 +19,6 @@ UBOOT_ARCH = "arm"
 UBOOT_ENTRYPOINT = "0x80008000"
 UBOOT_LOADADDRESS = "0x80008000"

-SPL_BINARY = "MLO"
-UBOOT_SUFFIX = "img"
-
 EXTRA_IMAGEDEPENDS += "virtual/bootloader"

 PREFERRED_PROVIDER_virtual/xserver = "xserver-xorg"
@@ -36,9 +33,4 @@ MACHINE_GUI_CLASS = "smallscreen"
 UBI_VOLNAME = "rootfs"

 # List common SoC features, may need to add touchscreen for specific machines
-MACHINE_FEATURES = "kernel26 apm usbgadget usbhost vfat ext2 screen alsa ethernet gpu mmip dsp gc320"
-
-IMAGE_FSTYPES += "tar.xz wic.xz"
-WKS_FILE ?= "sdimage-bootpart.wks"
-IMAGE_BOOT_FILES ?= "${SPL_BINARY} u-boot.${UBOOT_SUFFIX}"
-do_image_wic[depends] += "u-boot:do_deploy"
+MACHINE_FEATURES = "kernel26 apm usbgadget usbhost vfat ext2 screen alsa ethernet sgx mmip dsp"
--- a/conf/machine/include/omap3.inc
+++ b/conf/machine/include/omap3.inc
@@ -10,7 +10,7 @@ PREFERRED_PROVIDER_virtual/xserver = "xserver-xorg"
 XSERVER = "xserver-xorg \
           xf86-input-evdev \
           xf86-input-mouse \
-           xf86-video-fbdev \
+           xf86-video-omapfb \
           xf86-input-keyboard"

 # Default to external video, change to smallscreen for built-in LCD
@@ -39,4 +39,4 @@ UBOOT_LOADADDRESS = "0x80008000"
 EXTRA_IMAGEDEPENDS += "u-boot"

 # List common SoC features, may need to add touchscreen/ethernet for specific machines
-MACHINE_FEATURES = "kernel26 apm usbgadget usbhost vfat ext2 screen alsa gpu"
+MACHINE_FEATURES = "kernel26 apm usbgadget usbhost vfat ext2 screen alsa sgx"
--- a/conf/machine/include/omap4.inc
+++ b/conf/machine/include/omap4.inc
@@ -10,8 +10,9 @@ PREFERRED_PROVIDER_u-boot = "u-boot-ti-staging"

 PREFERRED_PROVIDER_virtual/xserver = "xserver-xorg"
 XSERVER = "xserver-xorg \
+           xserver-xorg-module-exa \
           xf86-input-evdev \
-           xf86-video-fbdev"
+           xf86-video-omap"

 # Increase this everytime you change something in the kernel
 MACHINE_KERNEL_PR = "r4"
--- a/conf/machine/include/ti33x.inc
+++ b/conf/machine/include/ti33x.inc
@@ -26,17 +26,13 @@ PREFERRED_PROVIDER_u-boot = "u-boot-ti-staging"

 KERNEL_IMAGETYPE = "zImage"

-KERNEL_DEVICETREE = " \
-    am335x-evm.dtb am335x-evmsk.dtb \
-    am335x-icev2.dtb \
-    am335x-icev2-prueth.dtb \
-    am335x-pocketbeagle.dtb am335x-bone.dtb am335x-boneblue.dtb \
-    am335x-bonegreen.dtb am335x-bonegreen-wireless.dtb \
-    am335x-boneblack.dtb am335x-boneblack-wireless.dtb \
-    am335x-sancloud-bbe.dtb \
-"
+KERNEL_DEVICETREE = "am335x-evm.dtb am335x-evmsk.dtb \
+                    am335x-icev2.dtb am335x-icev2-prueth.dtb \
+                    am335x-bone.dtb am335x-boneblue.dtb \
+                    am335x-boneblack.dtb am335x-boneblack-wireless.dtb \
+                    am335x-bonegreen.dtb am335x-bonegreen-wireless.dtb"

-KERNEL_DEVICETREE += "${@oe.utils.conditional('ENABLE_TI_UIO_DEVICES', '1', 'am335x-icev2-pru-excl-uio.dtb', '', d)}"
+KERNEL_DEVICETREE += "${@base_conditional('ENABLE_TI_UIO_DEVICES', '1', 'am335x-icev2-pru-excl-uio.dtb', '', d)}"

 UBOOT_ARCH = "arm"
 UBOOT_MACHINE = "am335x_evm_config"
@@ -44,9 +40,6 @@ UBOOT_MACHINE = "am335x_evm_config"
 UBOOT_ENTRYPOINT = "0x80008000"
 UBOOT_LOADADDRESS = "0x80008000"

-SPL_BINARY = "MLO"
-UBOOT_SUFFIX = "img"
-
 # Use the expected value of the ubifs filesystem's volume name in the kernel
 # and u-boot.
 UBI_VOLNAME = "rootfs"
@@ -54,13 +47,8 @@ UBI_VOLNAME = "rootfs"
 EXTRA_IMAGEDEPENDS += "u-boot"

 # List common SoC features, may need to add touchscreen for specific machines
-MACHINE_FEATURES = "kernel26 apm usbgadget usbhost vfat ext2 screen alsa ethernet gpu"
+MACHINE_FEATURES = "kernel26 apm usbgadget usbhost vfat ext2 screen alsa ethernet sgx"

 # Set the list of device targets for ti-pdk class recipes
 TI_PDK_LIMIT_SOCS = "am335x"
 TI_PDK_LIMIT_BOARDS = "evmAM335x icev2AM335x iceAMIC110 bbbAM335x skAM335x"
-
-IMAGE_FSTYPES += "tar.xz wic.xz"
-WKS_FILE ?= "sdimage-bootpart.wks"
-IMAGE_BOOT_FILES ?= "${SPL_BINARY} u-boot.${UBOOT_SUFFIX}"
-do_image_wic[depends] += "u-boot:do_deploy"
--- a/conf/machine/include/ti43x.inc
+++ b/conf/machine/include/ti43x.inc
@@ -26,13 +26,11 @@ PREFERRED_PROVIDER_u-boot = "u-boot-ti-staging"

 KERNEL_IMAGETYPE = "zImage"

-KERNEL_DEVICETREE = " \
-    am437x-gp-evm.dtb am437x-gp-evm-hdmi.dtb \
-    am437x-sk-evm.dtb am437x-idk-evm.dtb \
-    am43x-epos-evm.dtb am43x-epos-evm-hdmi.dtb \
-"
+KERNEL_DEVICETREE = "am437x-gp-evm.dtb am437x-gp-evm-hdmi.dtb \
+                    am437x-sk-evm.dtb am437x-idk-evm.dtb \
+                    am43x-epos-evm.dtb am43x-epos-evm-hdmi.dtb"

-KERNEL_DEVICETREE += "${@oe.utils.conditional('ENABLE_TI_UIO_DEVICES', '1', 'am437x-idk-pru-excl-uio.dtb', '', d)}"
+KERNEL_DEVICETREE += "${@base_conditional('ENABLE_TI_UIO_DEVICES', '1', 'am437x-idk-pru-excl-uio.dtb', '', d)}"

 UBOOT_ARCH = "arm"
 UBOOT_MACHINE = "am43xx_evm_config"
@@ -40,9 +38,6 @@ UBOOT_MACHINE = "am43xx_evm_config"
 UBOOT_ENTRYPOINT = "0x80008000"
 UBOOT_LOADADDRESS = "0x80008000"

-SPL_BINARY = "MLO"
-UBOOT_SUFFIX = "img"
-
 # Use the expected value of the ubifs filesystem's volume name in the kernel
 # and u-boot.
 UBI_VOLNAME = "rootfs"
@@ -50,13 +45,8 @@ UBI_VOLNAME = "rootfs"
 EXTRA_IMAGEDEPENDS += "u-boot"

 # List common SoC features, may need to add touchscreen for specific machines
-MACHINE_FEATURES = "kernel26 apm usbgadget usbhost vfat ext2 screen alsa ethernet gpu"
+MACHINE_FEATURES = "kernel26 apm usbgadget usbhost vfat ext2 screen alsa ethernet sgx"

 # Set the list of device targets for ti-pdk class recipes
 TI_PDK_LIMIT_SOCS = "am437x"
 TI_PDK_LIMIT_BOARDS = "evmAM437x idkAM437x skAM437x"
-
-IMAGE_FSTYPES += "tar.xz wic.xz"
-WKS_FILE ?= "sdimage-bootpart.wks"
-IMAGE_BOOT_FILES ?= "${SPL_BINARY} u-boot.${UBOOT_SUFFIX}"
-do_image_wic[depends] += "u-boot:do_deploy"
--- a/conf/machine/j7-evm.conf
+++ b/conf/machine/j7-evm.conf
@@ -1,27 +0,0 @@
-#@TYPE: Machine
-#@NAME: J7 EVM
-#@DESCRIPTION: Machine configuration for the TI J7 EVM
-
-require conf/machine/include/k3.inc
-
-SERIAL_CONSOLES = "115200;ttyS2 115200;ttyS3"
-SERIAL_CONSOLES_CHECK = "${SERIAL_CONSOLES}"
-
-KERNEL_DEVICETREE = " \
-    ti/k3-j721e-common-proc-board.dtb \
-    ti/k3-j721e-proc-board-tps65917.dtb \
-    ti/k3-j721e-common-proc-board-infotainment.dtbo \
-    ti/k3-j721e-pcie-backplane.dtbo \
-    ti/k3-j721e-common-proc-board-jailhouse.dtbo \
-"
-
-UBOOT_MACHINE = "j721e_evm_a72_config"
-
-OPTEEMACHINE = "k3"
-OPTEEFLAVOR = "j7"
-OPTEEOUTPUTMACHINE = "k3"
-
-# Set the list of device targets for ti-pdk class recipes
-TI_PDK_LIMIT_SOCS = "j721e j7200"
-TI_PDK_LIMIT_BOARDS = "j721e_evm j7200_evm"
-TI_PDK_LIMIT_CORES = "mpu1_0 mcu1_0 mcu1_1 mcu2_0 mcu2_1 mcu3_0 mcu3_1 c66xdsp_1 c66xdsp_2 c7x_1"
--- a/conf/machine/k2e-evm.conf
+++ b/conf/machine/k2e-evm.conf
@@ -12,7 +12,7 @@ BOOT_MONITOR_MAKE_TARGET = "k2e"

 IMAGE_FSTYPES += "ubifs ubi tar.xz"

-SERIAL_CONSOLES = "115200;ttyS0"
+SERIAL_CONSOLE = "115200 ttyS0"

 SYSVINIT_ENABLED_GETTYS = ""

@@ -22,7 +22,7 @@ SYSVINIT_ENABLED_GETTYS = ""
 # UBI: logical eraseblock size:    126976 bytes
 # from ubiattach stdout:
 # UBI device number 0, total 3856 LEBs
-MKUBIFS_ARGS = "-F -m 2048 -e 126976 -c 3856"
+MKUBIFS_ARGS = "-F -m 2048 -e 126976 -c 4000"

 # do ubiattach /dev/ubi_ctrl -m 4
 # from dmesg:
--- a/conf/machine/k2e-hs-evm.conf
+++ b/conf/machine/k2e-hs-evm.conf
@@ -5,7 +5,6 @@
 require conf/machine/k2e-evm.conf

 UBOOT_MACHINE = "k2e_hs_evm_config"
-SPL_BINARY = ""

 UBOOT_ENTRYPOINT = "0x82000000"
 UBOOT_LOADADDRESS = "0x82000000"
--- a/conf/machine/k2g-evm.conf
+++ b/conf/machine/k2g-evm.conf
@@ -7,7 +7,7 @@ require conf/machine/include/k2g.inc
 MACHINE_FEATURES += "alsa"

 KERNEL_DEVICETREE = "keystone-k2g-evm.dtb keystone-k2g-evm-lcd.dtb keystone-k2g-ice.dtb \
-                     ${@oe.utils.conditional('ENABLE_TI_UIO_DEVICES', '1', 'keystone-k2g-ice-pru-excl-uio.dtb', '', d)}"
+                     ${@base_conditional('ENABLE_TI_UIO_DEVICES', '1', 'keystone-k2g-ice-pru-excl-uio.dtb', '', d)}"

 UBOOT_MACHINE = "k2g_evm_config"

@@ -15,7 +15,7 @@ BOOT_MONITOR_MAKE_TARGET = "k2g"

 IMAGE_FSTYPES += "ubifs ubi tar.xz"

-SERIAL_CONSOLES = "115200;ttyS0"
+SERIAL_CONSOLE = "115200 ttyS0"

 SYSVINIT_ENABLED_GETTYS = ""

@@ -25,7 +25,7 @@ SYSVINIT_ENABLED_GETTYS = ""
 # UBI: logical eraseblock size:    253952 bytes
 # from ubiattach stdout:
 # UBI device number 0, total 1926 LEBs
-MKUBIFS_ARGS = "-F -m 4096 -e 253952 -c 1926"
+MKUBIFS_ARGS = "-F -m 4096 -e 253952 -c 2000"

 # do ubiattach /dev/ubi_ctrl -m 4
 # from dmesg:
--- a/conf/machine/k2g-hs-evm.conf
+++ b/conf/machine/k2g-hs-evm.conf
@@ -5,7 +5,6 @@
 require conf/machine/k2g-evm.conf

 UBOOT_MACHINE = "k2g_hs_evm_config"
-SPL_BINARY = ""

 UBOOT_ENTRYPOINT = "0x82000000"
 UBOOT_LOADADDRESS = "0x82000000"
--- a/conf/machine/k2hk-evm.conf
+++ b/conf/machine/k2hk-evm.conf
@@ -12,7 +12,7 @@ BOOT_MONITOR_MAKE_TARGET = "k2hk"

 IMAGE_FSTYPES += "ubifs ubi tar.xz"

-SERIAL_CONSOLES = "115200;ttyS0"
+SERIAL_CONSOLE = "115200 ttyS0"

 SYSVINIT_ENABLED_GETTYS = ""

@@ -22,7 +22,7 @@ SYSVINIT_ENABLED_GETTYS = ""
 # UBI: logical eraseblock size:    126976 bytes
 # from ubiattach stdout:
 # UBI device number 0, total 3856 LEBs
-MKUBIFS_ARGS = "-F -m 2048 -e 126976 -c 3856"
+MKUBIFS_ARGS = "-F -m 2048 -e 126976 -c 4000"

 # do ubiattach /dev/ubi_ctrl -m 4
 # from dmesg:
--- a/conf/machine/k2hk-hs-evm.conf
+++ b/conf/machine/k2hk-hs-evm.conf
@@ -5,7 +5,6 @@
 require conf/machine/k2hk-evm.conf

 UBOOT_MACHINE = "k2hk_hs_evm_config"
-SPL_BINARY = ""

 UBOOT_ENTRYPOINT = "0x82000000"
 UBOOT_LOADADDRESS = "0x82000000"
--- a/conf/machine/k2l-evm.conf
+++ b/conf/machine/k2l-evm.conf
@@ -12,7 +12,7 @@ BOOT_MONITOR_MAKE_TARGET = "k2l"

 IMAGE_FSTYPES += "ubifs ubi tar.xz"

-SERIAL_CONSOLES = "115200;ttyS0"
+SERIAL_CONSOLE = "115200 ttyS0"

 SYSVINIT_ENABLED_GETTYS = ""

@@ -22,7 +22,7 @@ SYSVINIT_ENABLED_GETTYS = ""
 # UBI: logical eraseblock size:    253952 bytes
 # from ubiattach stdout:
 # UBI device number 0, total 1926 LEBs
-MKUBIFS_ARGS = "-F -m 4096 -e 253952 -c 1926"
+MKUBIFS_ARGS = "-F -m 4096 -e 253952 -c 2000"

 # do ubiattach /dev/ubi_ctrl -m 4
 # from dmesg:
--- a/conf/machine/k2l-hs-evm.conf
+++ b/conf/machine/k2l-hs-evm.conf
@@ -5,7 +5,6 @@
 require conf/machine/k2l-evm.conf

 UBOOT_MACHINE = "k2l_hs_evm_config"
-SPL_BINARY = ""

 UBOOT_ENTRYPOINT = "0x82000000"
 UBOOT_LOADADDRESS = "0x82000000"
--- a/conf/machine/lego-ev3.conf
+++ b/conf/machine/lego-ev3.conf
@@ -1,22 +0,0 @@
-#@TYPE: Machine
-#@NAME: LEGO Mindstorms EV3
-#@DESCRIPTION: Machine configuration for the LEGO Mindstorms EV3
-
-require conf/machine/include/davinci.inc
-require conf/machine/include/omapl138.inc
-
-UBOOT_MACHINE = "legoev3_config"
-UBOOT_SUFFIX = "bin"
-UBOOT_ENTRYPOINT = "0xC0008000"
-UBOOT_LOADADDRESS = "0xC0008000"
-SPL_BINARY = ""
-
-KERNEL_DEVICETREE = "da850-lego-ev3.dtb"
-KERNEL_IMAGETYPES = "uImage"
-KERNEL_DEVICETREE_BUNDLE = "1"
-SERIAL_CONSOLES = "115200;ttyS1"
-
-IMAGE_FSTYPES += " wic"
-WKS_FILE ?= "sdimage-bootpart.wks"
-WIC_CREATE_EXTRA_ARGS += " --no-fstab-update"
-IMAGE_BOOT_FILES = "${KERNEL_IMAGETYPES}"
--- a/conf/machine/omap3evm.conf
+++ b/conf/machine/omap3evm.conf
@@ -7,10 +7,10 @@ require conf/machine/include/omap3.inc
 MACHINE_GUI_CLASS = "smallscreen"
 MACHINE_FEATURES += "touchscreen ethernet"

-IMAGE_FSTYPES += "jffs2 tar.xz"
+IMAGE_FSTYPES += "jffs2 tar.gz"
 EXTRA_IMAGECMD_jffs2 = "-lnp -e 0x20000 -s 2048"

-SERIAL_CONSOLES = "115200;ttyS0"
+SERIAL_CONSOLE = "115200 ttyS0"
 USE_VT = "0"

 EXTRA_IMAGEDEPENDS += "x-load"
--- a/conf/machine/omap5-evm.conf
+++ b/conf/machine/omap5-evm.conf
@@ -4,11 +4,11 @@

 require conf/machine/include/omap-a15.inc

-IMAGE_FSTYPES += "ubi tar.xz"
+IMAGE_FSTYPES += "ubi tar.gz"

 KERNEL_DEVICETREE = "omap5-uevm.dtb"

-SERIAL_CONSOLES = "115200;ttyS2"
+SERIAL_CONSOLE = "115200 ttyS2"

 # UBI information.  Note that this is board and kernel specific.  Changes
 # in your kernel port may require changes in these variables.  For more
--- a/conf/machine/omapl138-lcdk.conf
+++ b/conf/machine/omapl138-lcdk.conf
@@ -7,14 +7,13 @@ require conf/machine/include/omapl138.inc

 UBOOT_MACHINE = "omapl138_lcdk_config"
 UBOOT_SUFFIX = "ais"
-SPL_BINARY = ""

 UBOOT_ENTRYPOINT = "0xc0008000"
 UBOOT_LOADADDRESS = "0xc0008000"

 IMAGE_FSTYPES += "tar.xz"

-SERIAL_CONSOLES = "115200;ttyS2"
+SERIAL_CONSOLE = "115200 ttyS2"

 KERNEL_DEVICETREE = "da850-evm.dtb da850-lcdk.dtb"

--- a/conf/machine/pandaboard.conf
+++ b/conf/machine/pandaboard.conf
@@ -6,11 +6,11 @@ require conf/machine/include/omap4.inc

 MACHINE_GUI_CLASS = "bigscreen"

-IMAGE_FSTYPES += "tar.xz"
+IMAGE_FSTYPES += "tar.gz"

 KERNEL_DEVICETREE = "omap4-panda.dtb omap4-panda-a4.dtb omap4-panda-es.dtb"

-SERIAL_CONSOLES = "115200;ttyS2"
+SERIAL_CONSOLE = "115200 ttyS2"

 MACHINE_EXTRA_RRECOMMENDS = " kernel-modules"
-MACHINE_FEATURES = "kernel26 wifi bluetooth alsa apm ext2 screen usbgadget usbhost vfat gpu"
+MACHINE_FEATURES = "kernel26 wifi bluetooth alsa apm ext2 screen usbgadget usbhost vfat sgx"
--- a/licenses/Hewlett-Packard
+++ b/licenses/Hewlett-Packard
@@ -1,13 +0,0 @@
-/*
- * Copyright (c) 1994
- * Hewlett-Packard Company
- *
- * Permission to use, copy, modify, distribute and sell this software
- * and its documentation for any purpose is hereby granted without fee,
- * provided that the above copyright notice appear in all copies and
- * that both that copyright notice and this permission notice appear
- * in supporting documentation.  Hewlett-Packard Company makes no
- * representations about the suitability of this software for any
- * purpose.  It is provided "as is" without express or implied warranty.
- *
- */
--- a/licenses/Patrick-Powell
+++ b/licenses/Patrick-Powell
@@ -1,4 +0,0 @@
-Copyright Patrick Powell 1995
-This code is based on code written by Patrick Powell (papowell@astart.com)
-It may be used for any purpose as long as this notice remains intact
-on all source code distributions
--- a/recipes-bsp/aif2-lld/aif2-lld.inc
+++ b/recipes-bsp/aif2-lld/aif2-lld.inc
@@ -2,13 +2,21 @@ LICENSE = "BSD-3-Clause"

 LIC_FILES_CHKSUM = "file://COPYING.txt;md5=5bdceac872dffdec915b819654ee23ea"

-inherit ti-pdk-fetch
+AIF2_LLD_GIT_URI = "git://git.ti.com/keystone-rtos/aif2-lld.git"
+AIF2_LLD_GIT_PROTOCOL = "git"
+AIF2_LLD_GIT_BRANCH = "master"
+AIF2_LLD_GIT_DESTSUFFIX = "git/ti/drv/aif2"

-TI_PDK_COMP = "ti.drv.aif2"
+# The following commit correspond to DEV.AIF2LLD.01.02.00.01
+AIF2_LLD_SRCREV = "a701bbb5ed2976d5723c955c87a685f7517cffa3"

-PE = "1"
+BRANCH = "${AIF2_LLD_GIT_BRANCH}"
+SRC_URI = "${AIF2_LLD_GIT_URI};destsuffix=${AIF2_LLD_GIT_DESTSUFFIX};protocol=${AIF2_LLD_GIT_PROTOCOL};branch=${BRANCH}"
+SRCREV = "${AIF2_LLD_SRCREV}"

+PV = "1.2.0.1"
 INC_PR = "r0"

 COMPATIBLE_MACHINE = "k2hk"

+S = "${WORKDIR}/${AIF2_LLD_GIT_DESTSUFFIX}"
--- a/recipes-bsp/aif2-lld/aif2-lld_git.bb
+++ b/recipes-bsp/aif2-lld/aif2-lld_git.bb
@@ -14,5 +14,4 @@ do_compile () {

 do_install () {
    oe_runmake install INSTALL_INC_BASE_DIR=${D}/${includedir} INSTALL_LIB_BASE_DIR=${D}${libdir}
-    chown -R root:root ${D}
 }
--- a/recipes-bsp/arm-trusted-firmware/arm-trusted-firmware_1.5.bb
+++ b/recipes-bsp/arm-trusted-firmware/arm-trusted-firmware_1.5.bb
@@ -7,11 +7,11 @@ Power State Coordination Interface (PSCI), Trusted Board Boot Requirements \
 HOMEPAGE = "http://infocenter.arm.com/help/topic/com.arm.doc.dui0928e/CJHIDGJF.html"

 LICENSE = "BSD"
-LIC_FILES_CHKSUM = "file://docs/license.rst;md5=189505435dbcdcc8caa63c46fe93fa89"
+LIC_FILES_CHKSUM = "file://license.rst;md5=e927e02bca647e14efd87e9e914b2443"

 inherit deploy

-DEPENDS += "dtc-native openssl-native"
+DEPENDS += "dtc-native"

 PACKAGE_ARCH = "${MACHINE_ARCH}"

@@ -22,7 +22,7 @@ PV_append = "+git${SRCPV}"
 BRANCH = "ti-atf"
 SRC_URI = "git://git.ti.com/atf/arm-trusted-firmware.git;branch=${BRANCH}"

-SRCREV ?= "e516a389ac12fbe1597f61fea80ed3f230b9c5fd"
+SRCREV ?= "5a0daebab6bf72b27cc74151d4e596247f804e44"

 # Make ATF "aware" of OPTEE, no build dependency
 PACKAGECONFIG[optee] = "SPD=opteed"
@@ -46,14 +46,6 @@ do_compile() {
 	oe_runmake all
 }

-do_compile_append_am65xx-hs-evm() {
-	export TI_SECURE_DEV_PKG=${TI_SECURE_DEV_PKG}
-	( cd ${S}/build/${ATFPLATFORM}/${ATFBOARD}/release/; \
-		mv bl31.bin bl31.bin.unsigned; \
-		${TI_SECURE_DEV_PKG}/scripts/secure-binary-image.sh bl31.bin.unsigned bl31.bin; \
-	)
-}
-
 do_install() {
 	install -d ${D}/boot
 	install -m 0644 ${S}/build/${ATFPLATFORM}/${ATFBOARD}/release/bl31.bin ${D}/boot/
--- a/recipes-bsp/bcp-lld/bcp-lld-rtos_git.bb
+++ b/recipes-bsp/bcp-lld/bcp-lld-rtos_git.bb
@@ -1,10 +1,6 @@
 SUMMARY = "TI Bit Coprocessor (BCP) low level driver"

-inherit ti-pdk ti-pdk-fetch
-
-TI_PDK_COMP = "ti.drv.bcp"
-
-PE = "1"
+inherit ti-pdk

 LICENSE = "BSD-3-Clause"
 LIC_FILES_CHKSUM = "file://bcp.h;beginline=1;endline=40;md5=4f6e6128dd075a89548c0287a39b8896"
@@ -12,8 +8,22 @@ LIC_FILES_CHKSUM = "file://bcp.h;beginline=1;endline=40;md5=4f6e6128dd075a89548c
 COMPATIBLE_MACHINE = "k2hk|k2l|c667x-evm"
 PACKAGE_ARCH = "${MACHINE_ARCH}"

+BCP_LLD_GIT_URI = "git://git.ti.com/keystone-rtos/bcp-lld.git"
+BCP_LLD_GIT_PROTOCOL = "git"
+BCP_LLD_GIT_BRANCH = "master"
+BCP_LLD_GIT_DESTSUFFIX = "git/ti/drv/bcp"
+
+# Below commit ID corresponds to "DEV.BCP_LLD.02.01.00.06"
+BCP_LLD_SRCREV = "44e2ffcb6fd236c41f7ea8f9a1684833f5361daa"
+
+BRANCH = "${BCP_LLD_GIT_BRANCH}"
+SRC_URI = "${BCP_LLD_GIT_URI};destsuffix=${BCP_LLD_GIT_DESTSUFFIX};protocol=${BCP_LLD_GIT_PROTOCOL};branch=${BRANCH}"
+
+SRCREV = "${BCP_LLD_SRCREV}"
+PV = "02.01.00.06"
 PR = "r0"

+S = "${WORKDIR}/${BCP_LLD_GIT_DESTSUFFIX}"

 DEPENDS_append = " qmss-lld-rtos \
                   cppi-lld-rtos \
--- a/recipes-bsp/board-rtos/board-rtos_git.bb
+++ b/recipes-bsp/board-rtos/board-rtos_git.bb
@@ -1,28 +1,34 @@
 SUMMARY = "TI RTOS Board Library"

-inherit ti-pdk ti-pdk-fetch
-
-TI_PDK_COMP = "ti.board"
-
-PE = "1"
+inherit ti-pdk

 LICENSE = "BSD-3-Clause"
-LIC_FILES_CHKSUM = "file://board.h;beginline=1;endline=32;md5=9bed8e4ac2fb37fc627cefe49eb1c919"
+LIC_FILES_CHKSUM = "file://board.h;beginline=1;endline=32;md5=0e3182ba6a963da159c37eafa9752ade"

-COMPATIBLE_MACHINE = "ti33x|ti43x|omap-a15|keystone|omapl1|c66x|k3"
+COMPATIBLE_MACHINE = "ti33x|ti43x|omap-a15|keystone|omapl1|c66x"
 PACKAGE_ARCH = "${MACHINE_ARCH}"

+BOARD_GIT_URI = "git://git.ti.com/keystone-rtos/board.git"
+BOARD_GIT_PROTOCOL = "git"
+BOARD_GIT_BRANCH = "master"

+# Below commit ID corresponds to "DEV.BOARD.01.00.10.00A"
+BOARD_SRCREV = "14636b1363383167abb8d2b8ed6297d0b1c64930"

+BRANCH ="${BOARD_GIT_BRANCH}"
+SRC_URI = "${BOARD_GIT_URI};protocol=${BOARD_GIT_PROTOCOL};branch=${BRANCH}"
+
+SRCREV = "${BOARD_SRCREV}"
+PV = "01.00.10.00A"
 PR = "r0"

 DEPENDS_append = " i2c-lld-rtos \
                   spi-lld-rtos \
                   uart-lld-rtos \
-                   osal-rtos \
 "

-DEPENDS_append_omap-a15 = " ti-ndk \
+DEPENDS_append_omap-a15 = " osal-rtos \
+                            ti-ndk \
                            mmcsd-lld-rtos \
                            pm-lld-rtos \
 "
@@ -37,6 +43,7 @@ DEPENDS_append_ti33x = " gpio-lld-rtos \
                         gpmc-lld-rtos \
                         icss-emac-lld-rtos \
                         mmcsd-lld-rtos \
+                         osal-rtos \
                         pruss-lld-rtos \
                         starterware-rtos \
                         ti-ndk \
@@ -46,6 +53,7 @@ DEPENDS_append_ti43x = " gpio-lld-rtos \
                         gpmc-lld-rtos \
                         icss-emac-lld-rtos \
                         mmcsd-lld-rtos \
+                         osal-rtos \
                         pruss-lld-rtos \
                         starterware-rtos \
                         ti-ndk \
@@ -55,13 +63,6 @@ DEPENDS_append_dra7xx = " pm-lld-rtos \
                          mmcsd-lld-rtos \
 "

-DEPENDS_append_am65xx = " sciclient-rtos \
-"
-DEPENDS_append_j7-evm = " udma-lld-rtos \
-                          sciclient-rtos \
-                          mmcsd-lld-rtos \
-"
-
 # Build with make instead of XDC
 TI_PDK_XDCMAKE = "0"

--- a/recipes-bsp/cadence-mhdp-fw/cadence-mhdp-fw_git.bb
+++ b/recipes-bsp/cadence-mhdp-fw/cadence-mhdp-fw_git.bb
@@ -1,28 +0,0 @@
-SUMMARY = "Cadence MHDP DP bridge firmware"
-
-LICENSE = "BSD-3-Clause | Apache-2.0"
-LIC_FILES_CHKSUM = "file://LICENCE.cadence;md5=009f46816f6956cfb75ede13d3e1cee0"
-
-PV = "1.2.17"
-PR = "r0"
-
-CLEANBROKEN = "1"
-
-COMPATIBLE_MACHINE = "j7-evm"
-
-PACKAGE_ARCH = "${MACHINE_ARCH}"
-
-SRCREV = "7bad9a69a343e01056ece5ce6da4d4060c42f6bc"
-BRANCH ?= "ti-linux-firmware"
-
-SRC_URI = "git://git.ti.com/processor-firmware/ti-linux-firmware.git;protocol=git;branch=${BRANCH}"
-
-S = "${WORKDIR}/git"
-TARGET = "mhdp8546.bin"
-
-do_install() {
-	install -d ${D}${base_libdir}/firmware/cadence
-	install -m 0644 ${S}/cadence/${TARGET} ${D}${base_libdir}/firmware/cadence/${TARGET}
-}
-
-FILES_${PN} = "${base_libdir}/firmware"
--- a/recipes-bsp/cal-lld/cal-lld-rtos_git.bb
+++ b/recipes-bsp/cal-lld/cal-lld-rtos_git.bb
@@ -1,76 +0,0 @@
-SUMMARY = "TI RTOS low level driver for CAL"
-
-inherit ti-pdk ti-pdk-fetch
-
-TI_PDK_COMP = "ti.drv.cal"
-
-PE = "1"
-
-LICENSE = "BSD-3-Clause"
-LIC_FILES_CHKSUM = "file://cal.h;beginline=1;endline=31;md5=83d177cf3df55c16b27ae4102b6ade9a"
-
-COMPATIBLE_MACHINE = "k3"
-PACKAGE_ARCH = "${MACHINE_ARCH}"
-
-
-PR = "r0"
-
-DEPENDS_append = " osal-rtos \
-                   fvid2-rtos \
-"
-
-# Build with make instead of XDC
-TI_PDK_XDCMAKE = "0"
-
-CAL_PACKAGE_BASE   = "${WORKDIR}/cal_base"
-CAL_LLD_ROOTPATH = "${CAL_PACKAGE_BASE}/package/all/pdk_/packages/ti/drv/cal"
-
-export PDK_INSTALL_PATH = "${PDK_INSTALL_DIR}/packages"
-export PDK_CAL_ROOT_PATH = "${CAL_PACKAGE_BASE}/package/all/pdk_/packages"
-
-LIMSOCS = ""
-LIMSOCS_am65xx-evm = "am65xx"
-LIMSOCS_am65xx-hs-evm = "am65xx"
-
-LIMBOARDS = ""
-LIMBOARDS_am65xx-evm = "am65xx_evm"
-LIMBOARDS_am65xx-hs-evm = "am65xx_evm"
-
-BOARD_PACKAGE = ""
-BOARD_PACKAGE_am65xx-evm = "am65xx_evm"
-BOARD_PACKAGE_am65xx-hs-evm = "am65xx_evm"
-
-# HTML doc link params
-PDK_COMP_LINK_TEXT = "CAL"
-
-do_configure() {
-    rm -rf ${CAL_PACKAGE_BASE}
-    cd ${S}
-
-    # remove any previous package
-    rm -f ${CAL_PACKAGE_BASE}
-
-    # make the release package before building it
-    make package BOARD=${BOARD_PACKAGE} DEST_ROOT=${CAL_PACKAGE_BASE} PDK_CAL_COMP_PATH=${S}
-}
-
-do_compile() {
-    echo "cal lld root path is ${CAL_LLD_ROOTPATH}"
-    cd ${CAL_LLD_ROOTPATH}
-
-    # Build am65xx libraries
-    make clean lib xdc_meta doxygen LIMIT_SOCS="${LIMSOCS}" LIMIT_BOARDS="${LIMBOARDS}"
-
-    #archive
-    tar -cf cal_lld.tar --exclude='*.tar' ./*
-}
-
-do_install() {
-    cd ${CAL_LLD_ROOTPATH}
-    install -d ${D}${PDK_INSTALL_DIR_RECIPE}/packages/ti/drv/cal
-    find -name "*.tar" -exec tar xf {} --no-same-owner -C ${D}${PDK_INSTALL_DIR_RECIPE}/packages/ti/drv/cal \;
-}
-
-FILES_${PN} += "${PDK_INSTALL_DIR_RECIPE}/packages"
-
-INSANE_SKIP_${PN} = "arch ldflags"
--- a/recipes-bsp/cm3-pm-firmware/amx3-cm3_git.bb
+++ b/recipes-bsp/cm3-pm-firmware/amx3-cm3_git.bb
@@ -6,15 +6,17 @@ LIC_FILES_CHKSUM = "file://License.txt;md5=7bdc54a749ab7a7dea999d25d99a41b8"
 PV = "1.9.2"
 PR = "r0"

-SRCREV = "fb484c5e54f2e31cf0a338d2927a06a2870bcc2c"
+SRCREV = "7eb9c0856a9e8b3b42bf64f761da135852b8eea7"
 BRANCH ?= "ti-v4.1.y"

 SRC_URI = "git://git.ti.com/processor-firmware/ti-amx3-cm3-pm-firmware.git;protocol=git;branch=${BRANCH}"

 S = "${WORKDIR}/git"

+FLOATABI = "${@bb.utils.contains("TUNE_FEATURES", "vfp", bb.utils.contains("TUNE_FEATURES", "callconvention-hard", " -mfloat-abi=hard", " -mfloat-abi=softfp", d), "" ,d)}"
+
 do_compile() {
-	make CROSS_COMPILE="${TARGET_PREFIX}" CC="${TARGET_PREFIX}gcc ${TOOLCHAIN_OPTIONS} ${SECURITY_NOPIE_CFLAGS}"
+	make CROSS_COMPILE="${TARGET_PREFIX}" CC="${TARGET_PREFIX}gcc ${TOOLCHAIN_OPTIONS} ${FLOATABI}"
 }

 do_install() {
@@ -24,6 +26,3 @@ do_install() {
 }

 FILES_${PN} += "${base_libdir}/firmware"
-
-COMPATIBLE_MACHINE = "(ti-soc)"
-TOOLCHAIN = "gcc"
--- a/recipes-bsp/cmb-addon/cmb-addon-rtos_git.bb
+++ b/recipes-bsp/cmb-addon/cmb-addon-rtos_git.bb
@@ -14,11 +14,11 @@ CMB_ADDON_GIT_PROTOCOL = "git"
 CMB_ADDON_GIT_BRANCH = "master"
 CMB_ADDON_GIT_DESTSUFFIX = "git/ti/addon"

-# Below commit ID corresponds to "DEV.CMB.01.01.00.03A"
-CMB_ADDON_SRCREV = "3655aad07f17d3a167ec7dcecb52450c1d2fe8be"
+# Below commit ID corresponds to "DEV.CMB.01.01.00.00"
+CMB_ADDON_SRCREV = "29c05572b82251bac73cd685afcffdb8549eaaaf"

 SRCREV = "${CMB_ADDON_SRCREV}"
-PV = "01.01.00.03A"
+PV = "01.01.00.00"
 PR = "r0"

 BRANCH = "${CMB_ADDON_GIT_BRANCH}"
--- a/recipes-bsp/cmem/cmem.inc
+++ b/recipes-bsp/cmem/cmem.inc
@@ -4,13 +4,11 @@ LICENSE = "GPLv2"
 LIC_FILES_CHKSUM = "file://include/ti/cmem.h;beginline=1;endline=30;md5=26be509e4bb413905bda8309e338e2b1"

 BRANCH = "master"
-# This corresponds to version 4.16.00.00
-SRCREV = "4f970f053b42e8d2a6f1a8cd4b14786196468fd3"
+# This corresponds to version 4.15.00.01
+SRCREV = "000038a65af9428b559de5e00e4a7588892ad7b0"

-PV = "4.16.00.00+git${SRCPV}"
+PV = "4.15.00.01+git${SRCPV}"

 SRC_URI = "git://git.ti.com/ipc/ludev.git;protocol=git;branch=${BRANCH}"

 S = "${WORKDIR}/git"
-COMPATIBLE_HOST ?= "null"
-COMPATIBLE_HOST_ti-soc = "(.*)"
--- a/recipes-bsp/common-csl-ip/common-csl-ip-rtos_git.bb
+++ b/recipes-bsp/common-csl-ip/common-csl-ip-rtos_git.bb
@@ -2,7 +2,7 @@ require common-csl-ip.inc
 PR = "${INC_PR}.6"

 PACKAGE_ARCH = "${MACHINE_ARCH}"
-COMPATIBLE_MACHINE_append = "|c66x|k3"
+COMPATIBLE_MACHINE_append = "|c66x"

 inherit ti-pdk

@@ -19,4 +19,3 @@ PDK_COMP_LINK_TEXT = "CSL-Chip Support Library"

 # Workaround: dra7xx build requires am57xx CSL libraries for opencl-monitor
 TI_PDK_LIMIT_SOCS_append_dra7xx = " am571x am572x am574x"
-TI_PDK_LIMIT_BOARDS_append_dra7xx = " evmAM571x evmAM572x idkAM574x"
--- a/recipes-bsp/common-csl-ip/common-csl-ip.inc
+++ b/recipes-bsp/common-csl-ip/common-csl-ip.inc
@@ -4,17 +4,16 @@ LIC_FILES_CHKSUM = "file://COPYING.txt;md5=5857833e20836213677fac33f9aded21"

 COMPATIBLE_MACHINE = "keystone|dra7xx|ti33x|ti43x|omapl1"

-PV = "03.03.00.17B"
+PV = "03.03.00.10"
 INC_PR = "r0"
-PE = "1"

 CSL_GIT_URI = "git://git.ti.com/keystone-rtos/common-csl-ip.git"
 CSL_GIT_PROTOCOL ="git"
-CSL_GIT_BRANCH = "release"
+CSL_GIT_BRANCH = "master"
 CSL_GIT_DESTSUFFIX = "git"

-# Below commit ID corresponding to "DEV.CSL_PROCESSOR-SDK.03.03.00.17B"
-CSL_SRCREV = "a5a9200fe11575a4eff965d87cb968c5f3377e9f"
+# Below commit ID corresponding to "DEV.CSL_PROCESSOR-SDK.03.03.00.10"
+CSL_SRCREV = "b252ed25443938ff59a6622aee2de7bc36304787"

 BRANCH="${CSL_GIT_BRANCH}"
 SRC_URI = "${CSL_GIT_URI};protocol=${CSL_GIT_PROTOCOL};branch=${BRANCH};destsuffix=${CSL_GIT_DESTSUFFIX}"
--- a/recipes-bsp/common-csl-ip/csl-rti-dwwdtest-fw_git.bb
+++ b/recipes-bsp/common-csl-ip/csl-rti-dwwdtest-fw_git.bb
@@ -1,77 +0,0 @@
-SUMMARY = "MCU Watchdog test firmware"
-DESCRIPTION = "Firmware for the R5F core to test the detection of watchdog timeout events to trigger SOC reset though DMSC."
-
-require recipes-bsp/common-csl-ip/common-csl-ip.inc
-require recipes-ti/includes/ti-paths.inc
-
-LIC_FILES_CHKSUM = "file://../../../COPYING.txt;md5=5857833e20836213677fac33f9aded21"
-
-S = "${WORKDIR}/${CSL_GIT_DESTSUFFIX}/example/rti/rti_dwwdtest_app"
-
-COMPATIBLE_MACHINE = "am65xx"
-PACKAGE_ARCH = "${MACHINE_ARCH}"
-
-DEPENDS = "ti-cgt-arm-native \
-           ti-pdk-build-rtos \
-           uart-lld-rtos \
-           board-rtos \
-           sciclient-rtos \
-           udma-lld-rtos"
-
-export PDK_INSTALL_PATH = "${PDK_INSTALL_DIR}/packages"
-export TOOLCHAIN_PATH_R5 = "${M4_TOOLCHAIN_INSTALL_DIR}"
-
-EXTRA_OEMAKE = "WDT_RESET=enable DEST_ROOT=${S}"
-
-do_compile() {
-    for soc in ${TI_PDK_LIMIT_SOCS}
-    do
-        for board in ${TI_PDK_LIMIT_BOARDS}
-        do
-            oe_runmake SOC=$soc BOARD=$board
-        done
-    done
-}
-
-do_install() {
-    install -d ${D}${base_libdir}/firmware/rti_dwwdtest
-
-    for board in ${TI_PDK_LIMIT_BOARDS}
-    do
-        install -d ${D}${base_libdir}/firmware/rti_dwwdtest/$board
-        install -m 0644 csl_rti_dwwd_test_app/bin/$board/csl_rti_dwwd_test_app_mcu1_0_release.xer5f \
-                        ${D}${base_libdir}/firmware/rti_dwwdtest/$board
-    done
-}
-
-# Create separate package for each firmware so we can utilize
-# update-alternatives.
-PACKAGES =+ "${PN}-evm ${PN}-idk"
-RDEPENDS_${PN} = "${PN}-evm ${PN}-idk"
-ALLOW_EMPTY_${PN} = "1"
-
-FILES_${PN}-evm = "${base_libdir}/firmware/rti_dwwdtest/am65xx_evm"
-FILES_${PN}-idk = "${base_libdir}/firmware/rti_dwwdtest/am65xx_idk"
-
-# We are packaging R5 firmware
-INSANE_SKIP_${PN}-evm = "arch"
-INSANE_SKIP_${PN}-idk = "arch"
-
-# Configure update-alternatives as there may be other firmwares provided in an
-# image.
-inherit update-alternatives
-
-# It might be nice to dynamically declare the following based on
-# TI_PDK_LIMIT_BOARDS, but that is probably overkill.
-ALTERNATIVE_${PN}-evm = "am65x-mcu-r5f0_0-fw"
-ALTERNATIVE_${PN}-idk = "am65x-mcu-r5f0_0-fw"
-
-ALTERNATIVE_LINK_NAME[am65x-mcu-r5f0_0-fw] = "${base_libdir}/firmware/am65x-mcu-r5f0_0-fw"
-
-ALTERNATIVE_TARGET_${PN}-evm = "${base_libdir}/firmware/rti_dwwdtest/am65xx_evm/csl_rti_dwwd_test_app_mcu1_0_release.xer5f"
-ALTERNATIVE_TARGET_${PN}-idk = "${base_libdir}/firmware/rti_dwwdtest/am65xx_idk/csl_rti_dwwd_test_app_mcu1_0_release.xer5f"
-
-# Use a lesser priority than ipc example fw
-# See meta-ti/recipes-ti/ipc/ti-ipc-rtos_git.bb
-ALTERNATIVE_PRIORITY_${PN}-evm = "4"
-ALTERNATIVE_PRIORITY_${PN}-idk = "3"
--- a/recipes-bsp/cppi-lld/cppi-lld.inc
+++ b/recipes-bsp/cppi-lld/cppi-lld.inc
@@ -4,16 +4,24 @@ LIC_FILES_CHKSUM = "file://${WORKDIR}/git/ti/drv/cppi/COPYING.txt;md5=e8f6789acd
 COMPATIBLE_MACHINE = "keystone"
 PACKAGE_ARCH = "${MACHINE_ARCH}"

-inherit ti-pdk-fetch
+CPPI_LLD_GIT_URI = "git://git.ti.com/keystone-rtos/cppi-lld.git"
+CPPI_LLD_GIT_PROTOCOL = "git"
+CPPI_LLD_GIT_BRANCH = "master"
+CPPI_LLD_GIT_DESTSUFFIX = "git/ti/drv/cppi"

-TI_PDK_COMP = "ti.drv.cppi"
+# Below Commit ID corresponds to "DEV.CPPI_LLD.02.01.00.12A"
+CPPI_LLD_SRCREV = "6a1d2891b3de9891dea71a069a261c6368209413"

-PE = "1"
+BRANCH = "${CPPI_LLD_GIT_BRANCH}"
+SRC_URI = "${CPPI_LLD_GIT_URI};destsuffix=${CPPI_LLD_GIT_DESTSUFFIX};protocol=${CPPI_LLD_GIT_PROTOCOL};branch=${BRANCH}"

-INC_PR = "r0"
+SRCREV = "${CPPI_LLD_SRCREV}"
+PV = "02.01.00.12"
+INC_PR = "r1"

 DEVICELIST = "k2h k2k k2l k2e"
 DEVICELIST_k2hk = "k2h k2k"
 DEVICELIST_k2l  = "k2l"
 DEVICELIST_k2e  = "k2e"

+S = "${WORKDIR}/${CPPI_LLD_GIT_DESTSUFFIX}"
--- a/recipes-bsp/cpsw9g-eth-fw/cpsw9g-eth-fw_git.bb
+++ b/recipes-bsp/cpsw9g-eth-fw/cpsw9g-eth-fw_git.bb
@@ -1,43 +0,0 @@
-SUMMARY = "R5 PSDK CPSW9G Ethernet Switch Firmware"
-
-LICENSE = "TI-TFL"
-LIC_FILES_CHKSUM = "file://LICENSE.ti;md5=04ad0a015d4bb63c2b9e7b112debf3db"
-
-PV = "6.2+git${SRCPV}"
-PACKAGE_ARCH = "${MACHINE_ARCH}"
-
-inherit deploy
-inherit update-alternatives
-
-PROTOCOL = "git"
-BRANCH = "master"
-SRCREV = "4da71504488450f34d65459c1de949da1f984471"
-
-SRC_URI = "git://git.ti.com/glsdk/ti-eth-fw.git;protocol=${PROTOCOL};branch=${BRANCH}"
-
-S = "${WORKDIR}/git"
-
-CPSW9G_FW_DIR = "${S}/ethfw"
-CPSW9G_FW_FILENAME = "app_remoteswitchcfg_server_pdk_mem_map_strip.xer5f"
-
-# make sure that lib/firmware, and all its contents are part of the package
-FILES_${PN} += "${base_libdir}/firmware"
-
-do_install() {
-  install -d ${D}${base_libdir}/firmware
-# Ethernet firmware to be loaded on Main R5 core(needs read permission)
-  install -m 0644 ${CPSW9G_FW_DIR}/${CPSW9G_FW_FILENAME} ${D}${base_libdir}/firmware
-}
-
-TARGET_MAIN_R5FSS0_0 = "j7-main-r5f0_0-fw"
-ALTERNATIVE_${PN} = "j7-main-r5f0_0-fw"
-ALTERNATIVE_LINK_NAME[j7-main-r5f0_0-fw] = "${base_libdir}/firmware/${TARGET_MAIN_R5FSS0_0}"
-ALTERNATIVE_TARGET[j7-main-r5f0_0-fw] = "${base_libdir}/firmware/${CPSW9G_FW_FILENAME}"
-ALTERNATIVE_PRIORITY = "17"
-
-INHIBIT_PACKAGE_STRIP = "1"
-INHIBIT_PACKAGE_DEBUG_SPLIT = "1"
-INSANE_SKIP_${PN} += "arch"
-
-do_compile[noexec] = "1"
-do_configure[noexec] = "1"
--- a/recipes-bsp/cuia/cuia_1.0.0.13.bb
+++ b/recipes-bsp/cuia/cuia_1.0.0.13.bb
@@ -23,8 +23,3 @@ do_install() {
 	cd ${S}
 	oe_runmake DESTDIR=${D} libdir=${libdir} includedir=${includedir} install
 }
-
-COMPATIBLE_HOST ?= "null"
-COMPATIBLE_HOST_ti-soc = "(.*)"
-
-INSANE_SKIP_${PN} += "textrel"
--- a/recipes-bsp/dfe-lld/dfe-lld.inc
+++ b/recipes-bsp/dfe-lld/dfe-lld.inc
@@ -2,13 +2,21 @@ LICENSE = "BSD-3-Clause"

 LIC_FILES_CHKSUM = "file://COPYING.txt;md5=1f4217b705bf98762a302fd720649dcc"

-inherit ti-pdk-fetch
+DFE_LLD_GIT_URI = "git://git.ti.com/keystone-rtos/dfe-lld.git"
+DFE_LLD_GIT_PROTOCOL = "git"
+DFE_LLD_GIT_BRANCH = "master"
+DFE_LLD_GIT_DESTSUFFIX = "git/ti/drv/dfe"

-TI_PDK_COMP = "ti.drv.dfe"
+# Below commit ID corresponds to "DEV.DFE_LLD.01.00.00.08"
+DFE_LLD_SRCREV = "d51482ef18889bbbd8e9cdc207c6fe9e27b1ab03"

-PE = "1"
+BRANCH = "${DFE_LLD_GIT_BRANCH}"
+SRC_URI = "${DFE_LLD_GIT_URI};destsuffix=${DFE_LLD_GIT_DESTSUFFIX};protocol=${DFE_LLD_GIT_PROTOCOL};branch=${BRANCH}"
+SRCREV = "${DFE_LLD_SRCREV}"

+PV = "1.0.0.8"
 INC_PR = "r0"

 COMPATIBLE_MACHINE = "k2l"

+S = "${WORKDIR}/${DFE_LLD_GIT_DESTSUFFIX}"
--- a/recipes-bsp/dsptop/dsptop.inc
+++ b/recipes-bsp/dsptop/dsptop.inc
@@ -1,7 +1,7 @@
 # This corresponds to version 1.4.0
-SRCREV = "25e823b04e62af224dce97b90359b7569ce3fbb5"
+SRCREV = "0aedcabdbbcbfc7558f70fc50afc95583302a087"
 PV = "1.4.0"
-INC_PR = "r1"
+INC_PR = "r0"

 SRC_URI = "git://git.ti.com/sdo-emu/dsptop.git;protocol=git;branch=${BRANCH}"

--- a/recipes-bsp/edma3-lld/edma3-lld.inc
+++ b/recipes-bsp/edma3-lld/edma3-lld.inc
@@ -6,12 +6,12 @@ EDMA3_LLD_GIT_URI = "git://git.ti.com/keystone-rtos/edma3_lld.git"
 EDMA3_LLD_GIT_PROTOCOL = "git"
 EDMA3_LLD_GIT_BRANCH = "master"

-# Below commit ID corresponds to version 2.12.05.30E
-EDMA3_LLD_SRCREV = "ce5ced2ac5eb1e0f1515288d279f5690813b5413"
+# Below commit ID corresponds to version 2.12.05.30C
+EDMA3_LLD_SRCREV = "a52b8f2a4bd4ca584bbd5bebba30563add353c5a"

 BRANCH = "${EDMA3_LLD_GIT_BRANCH}"
 SRC_URI = "${EDMA3_LLD_GIT_URI};protocol=${EDMA3_LLD_GIT_PROTOCOL};branch=${BRANCH}"
 SRCREV = "${EDMA3_LLD_SRCREV}"

-PV = "2.12.05.30E"
-INC_PR = "r1"
+PV = "2.12.05.30C"
+INC_PR = "r0"
--- a/recipes-bsp/emac-lld/emac-lld-rtos_git.bb
+++ b/recipes-bsp/emac-lld/emac-lld-rtos_git.bb
@@ -2,24 +2,31 @@ SUMMARY = "TI RTOS low level driver for Ethernet MAC (EMAC) peripheral"

 inherit ti-pdk

-require emac-lld.inc
-
-PR = "r0"
-
 LICENSE = "BSD-3-Clause"
 LIC_FILES_CHKSUM = "file://emacver.h;beginline=1;endline=47;md5=f66bb3695972ca2a85d990a390f45d88"

-COMPATIBLE_MACHINE = "ti33x|ti43x|omap-a15|k2g|omapl1|c665x-evm|k3"
+COMPATIBLE_MACHINE = "ti33x|ti43x|omap-a15|k2g|omapl1|c665x-evm"
 PACKAGE_ARCH = "${MACHINE_ARCH}"

+EMAC_LLD_GIT_URI = "git://git.ti.com/keystone-rtos/emac-lld.git"
+EMAC_LLD_GIT_PROTOCOL = "git"
+EMAC_LLD_GIT_BRANCH = "master"
+
+# Below commit ID corresponds to "DEV.EMAC_LLD.01.00.03.10A"
+EMAC_LLD_SRCREV = "a2b663fcdfb485806f5a547336b343e73ebbae86"
+
+BRANCH ="${EMAC_LLD_GIT_BRANCH}"
+SRC_URI = "${EMAC_LLD_GIT_URI};protocol=${EMAC_LLD_GIT_PROTOCOL};branch=${BRANCH}"
+
+SRCREV = "${EMAC_LLD_SRCREV}"
+PV = "01.00.03.10A"
+PR = "r0"
+
 DEPENDS_append = " board-rtos osal-rtos"
 DEPENDS_append_ti33x = " starterware-rtos"
 DEPENDS_append_ti43x = " starterware-rtos"
 DEPENDS_append_k2g  = " cppi-lld-rtos qmss-lld-rtos"

-DEPENDS_remove_k3 = "board-rtos "
-DEPENDS_append_k3 = " udma-lld-rtos trace-rtos"
-
 # Build with make instead of XDC
 TI_PDK_XDCMAKE = "0"

--- a/recipes-bsp/emac-lld/emac-lld.inc
+++ b/recipes-bsp/emac-lld/emac-lld.inc
@@ -1,7 +0,0 @@
-inherit ti-pdk-fetch
-
-TI_PDK_COMP = "ti.drv.emac"
-
-PE = "1"
-
-# The LLD version
--- a/recipes-bsp/fatfs-rtos/fatfs-rtos_git.bb
+++ b/recipes-bsp/fatfs-rtos/fatfs-rtos_git.bb
@@ -1,22 +1,28 @@
 SUMMARY = "TI RTOS driver for FAT filesystem"

-inherit ti-pdk ti-pdk-fetch
-
-TI_PDK_COMP = "ti.fs.fatfs"
-
-PE = "1"
+inherit ti-pdk

 LICENSE = "BSD-3-Clause"
 LIC_FILES_CHKSUM = "file://FATFS.h;beginline=1;endline=32;md5=6619832755598d1cc2b01f2e6a1801d6"

-COMPATIBLE_MACHINE = "ti33x|ti43x|omap-a15|k2g|omapl1|k3"
+COMPATIBLE_MACHINE = "ti33x|ti43x|omap-a15|k2g|omapl1"
 PACKAGE_ARCH = "${MACHINE_ARCH}"

+FATFS_GIT_URI = "git://git.ti.com/keystone-rtos/fatfs.git"
+FATFS_GIT_PROTOCOL = "git"
+FATFS_GIT_BRANCH = "master"
+
+# Below commit ID corresponds to "DEV.FATFS_LLD.01.00.00.09"
+FATFS_SRCREV = "a5652991a9dd9a9b9b9c5c2cf35d1417f8272b00"
+
+BRANCH = "${FATFS_GIT_BRANCH}"
+SRC_URI = "${FATFS_GIT_URI};protocol=${FATFS_GIT_PROTOCOL};branch=${BRANCH}"
+
+SRCREV = "${FATFS_SRCREV}"
+PV = "01.00.00.09"
 PR = "r0"

-DEPENDS_append = " mmcsd-lld-rtos \
-                   osal-rtos \
-"
+DEPENDS_append = " mmcsd-lld-rtos"

 # Build with make instead of XDC
 TI_PDK_XDCMAKE = "0"
--- a/recipes-bsp/faultmanagement/faultmanagement-rtos_git.bb
+++ b/recipes-bsp/faultmanagement/faultmanagement-rtos_git.bb
@@ -13,14 +13,14 @@ FAULT_MANAGEMENT_GIT_PROTOCOL = "git"
 FAULT_MANAGEMENT_GIT_BRANCH = "master"
 FAULT_MANAGEMENT_GIT_DESTSUFFIX = "git/ti/instrumentation/fault_mgmt"

-# Below commit ID corresponds to "DEV.FAULT_MGMT.01.00.01.04A"
-FAULT_MANAGEMENT_SRCREV = "67becdff0e3d181ab7b8fada226f5737517c1c52"
+# Below commit ID corresponds to "DEV.FAULT_MGMT.01.00.01.03"
+FAULT_MANAGEMENT_SRCREV = "a300e7d1f262bdfa48c92851bad0da228a41acc3"

 BRANCH = "${FAULT_MANAGEMENT_GIT_BRANCH}"
 SRC_URI = "${FAULT_MANAGEMENT_GIT_URI};destsuffix=${FAULT_MANAGEMENT_GIT_DESTSUFFIX};protocol=${FAULT_MANAGEMENT_GIT_PROTOCOL};branch=${BRANCH}"

 SRCREV = "${FAULT_MANAGEMENT_SRCREV}"
-PV = "01.00.01.04A"
+PV = "01.00.01.03"
 PR = "r0"

 S = "${WORKDIR}/${FAULT_MANAGEMENT_GIT_DESTSUFFIX}"
--- a/recipes-bsp/fftc-lld/fftc-lld-rtos_git.bb
+++ b/recipes-bsp/fftc-lld/fftc-lld-rtos_git.bb
@@ -1,10 +1,6 @@
 SUMMARY = "TI FFT Coprocessor (FFTC) low level driver "

-inherit ti-pdk ti-pdk-fetch
-
-TI_PDK_COMP = "ti.drv.fftc"
-
-PE = "1"
+inherit ti-pdk

 LICENSE = "BSD-3-Clause"
 LIC_FILES_CHKSUM = "file://fftc.h;beginline=1;endline=39;md5=2f1010c47d364414644caf6d30a2b7df"
@@ -12,8 +8,24 @@ LIC_FILES_CHKSUM = "file://fftc.h;beginline=1;endline=39;md5=2f1010c47d364414644
 COMPATIBLE_MACHINE = "k2hk|k2l"
 PACKAGE_ARCH = "${MACHINE_ARCH}"

+FFTC_LLD_GIT_URI = "git://git.ti.com/keystone-rtos/fftc-lld.git"
+FFTC_LLD_GIT_PROTOCOL = "git"
+FFTC_LLD_GIT_BRANCH = "master"
+FFTC_LLD_GIT_DESTSUFFIX = "git/ti/drv/fftc"
+
+# Below commit ID corresponds to "DEV.FFTC_LLD.02.02.00.06A"
+FFTC_LLD_SRCREV = "96e8839a2de5f15ba8765f4a6a4fd499689c496d"
+
+BRANCH = "${FFTC_LLD_GIT_BRANCH}"
+SRC_URI = "${FFTC_LLD_GIT_URI};destsuffix=${FFTC_LLD_GIT_DESTSUFFIX};protocol=${FFTC_LLD_GIT_PROTOCOL};branch=${BRANCH}"
+
+SRCREV = "${FFTC_LLD_SRCREV}"
+PV = "02.02.00.06A"
 PR = "r0"

+S = "${WORKDIR}/${FFTC_LLD_GIT_DESTSUFFIX}"
+
+
 DEPENDS_append= " qmss-lld-rtos \
                  cppi-lld-rtos \
 "
--- a/recipes-bsp/fvid2/fvid2-rtos_git.bb
+++ b/recipes-bsp/fvid2/fvid2-rtos_git.bb
@@ -1,68 +0,0 @@
-SUMMARY = "TI RTOS Video Driver Interface"
-
-inherit ti-pdk ti-pdk-fetch
-
-TI_PDK_COMP = "ti.drv.fvid2"
-
-PE = "1"
-
-LICENSE = "BSD-3-Clause"
-LIC_FILES_CHKSUM = "file://fvid2.h;beginline=1;endline=31;md5=83d177cf3df55c16b27ae4102b6ade9a"
-
-COMPATIBLE_MACHINE = "k3"
-PACKAGE_ARCH = "${MACHINE_ARCH}"
-
-PR = "r0"
-
-DEPENDS_append = " osal-rtos \
-"
-
-# Build with make instead of XDC
-TI_PDK_XDCMAKE = "0"
-
-FVID2_PACKAGE_BASE   = "${WORKDIR}/fvid2_base"
-FVID2_ROOTPATH = "${FVID2_PACKAGE_BASE}/package/all/pdk_/packages/ti/drv/fvid2"
-
-export PDK_INSTALL_PATH = "${PDK_INSTALL_DIR}/packages"
-export PDK_FVID2_ROOT_PATH = "${FVID2_PACKAGE_BASE}/package/all/pdk_/packages"
-
-
-BOARD_PACKAGE = ""
-BOARD_PACKAGE_am65xx-evm = "am65xx_evm"
-BOARD_PACKAGE_am65xx-hs-evm = "am65xx_evm"
-BOARD_PACKAGE_j7-evm = "j721e_evm"
-
-# HTML doc link params
-PDK_COMP_LINK_TEXT = "FVID2"
-
-do_configure() {
-    rm -rf ${FVID2_PACKAGE_BASE}
-    cd ${S}
-
-    # remove any previous package
-    rm -f ${FVID2_PACKAGE_BASE}
-
-    # make the release package before building it
-    make package BOARD=${BOARD_PACKAGE} DEST_ROOT=${FVID2_PACKAGE_BASE} PDK_FVID2_COMP_PATH=${S}
-}
-
-do_compile() {
-    echo "fvid2 root path is ${FVID2_ROOTPATH}"
-    cd ${FVID2_ROOTPATH}
-
-    # Build am65xx libraries
-    make clean lib xdc_meta LIMIT_SOCS="${TI_PDK_LIMIT_SOCS}" LIMIT_BOARDS="${TI_PDK_LIMIT_BOARDS}"  LIMIT_CORES="${TI_PDK_LIMIT_CORES}"
-
-    #archive
-    tar -cf fvid2.tar --exclude='*.tar' ./*
-}
-
-do_install() {
-    cd ${FVID2_ROOTPATH}
-    install -d ${D}${PDK_INSTALL_DIR_RECIPE}/packages/ti/drv/fvid2
-    find -name "*.tar" -exec tar xf {} --no-same-owner -C ${D}${PDK_INSTALL_DIR_RECIPE}/packages/ti/drv/fvid2 \;
-}
-
-FILES_${PN} += "${PDK_INSTALL_DIR_RECIPE}/packages"
-
-INSANE_SKIP_${PN} = "arch ldflags"
--- a/recipes-bsp/gc320-drivers/ti-gc320-driver_5.0.11.p7.bb
+++ b/recipes-bsp/gc320-drivers/ti-gc320-driver_5.0.11.p7.bb
@@ -5,16 +5,15 @@ LIC_FILES_CHKSUM = "file://../LICENSE;md5=78d9818a51b9a8e9bb89dea418bac297"

 inherit module

-MACHINE_KERNEL_PR_append = "h"
+MACHINE_KERNEL_PR_append = "e"
 PR = "${MACHINE_KERNEL_PR}"

 # Need to branch out with ${PV} var
-BRANCH = "ti-${PV}-k5.4"
+BRANCH = "ti-${PV}-k4.14"

-SRCREV = "2a4fbe8353fa56011a613aeeaf69e274cd07a825"
+SRCREV = "a36799d9329efcfff19e30e690156d5ebf7e0c55"

 SRC_URI = "git://git.ti.com/graphics/ti-gc320-driver.git;protocol=git;branch=${BRANCH}"
-
 S = "${WORKDIR}/git/src"

 EXTRA_OEMAKE += "-f Kbuild AQROOT=${S} KERNEL_DIR=${STAGING_KERNEL_DIR} TOOLCHAIN_PATH=${TOOLCHAIN_PATH} CROSS_COMPILE=${TARGET_PREFIX} ARCH_TYPE=${TARGET_ARCH}"
@@ -23,6 +22,3 @@ do_install() {
    install -d ${D}/${base_libdir}/modules/${KERNEL_VERSION}/extra
    install -m 644 ${S}/galcore.ko ${D}/${base_libdir}/modules/${KERNEL_VERSION}/extra
 }
-
-COMPATIBLE_HOST ?= "null"
-COMPATIBLE_HOST_ti-soc = "(.*)"
--- a/recipes-bsp/goodix-fw/goodix-fw_git.bb
+++ b/recipes-bsp/goodix-fw/goodix-fw_git.bb
@@ -13,7 +13,7 @@ COMPATIBLE_MACHINE = "dra7xx"
 PACKAGE_ARCH = "${MACHINE_ARCH}"

 SRCREV = "f1a8d1d0131f83bd1a775cde7075eb67c070892c"
-BRANCH ?= "ti-linux-firmware"
+BRANCH ?= "ti-linux-firmware-4.1.y"

 SRC_URI = "git://git.ti.com/processor-firmware/ti-linux-firmware.git;protocol=git;branch=${BRANCH}"

--- a/recipes-bsp/gpio-lld/gpio-lld-rtos_git.bb
+++ b/recipes-bsp/gpio-lld/gpio-lld-rtos_git.bb
@@ -1,19 +1,29 @@
 SUMMARY = "TI RTOS driver for General Purpose IO (GPIO)"

-inherit ti-pdk ti-pdk-fetch
-
-TI_PDK_COMP = "ti.drv.gpio"
-
-PE = "1"
+inherit ti-pdk

 LICENSE = "BSD-3-Clause"
 LIC_FILES_CHKSUM = "file://GPIO.h;beginline=1;endline=31;md5=8580f9c5c0de8d5d13518cf18a0122b8"

-COMPATIBLE_MACHINE = "ti33x|ti43x|omap-a15|keystone|omapl1|c667x-evm|c665x-evm|k3"
+COMPATIBLE_MACHINE = "ti33x|ti43x|omap-a15|keystone|omapl1|c667x-evm|c665x-evm"
 PACKAGE_ARCH = "${MACHINE_ARCH}"

+GPIO_LLD_GIT_URI = "git://git.ti.com/keystone-rtos/gpio-lld.git"
+GPIO_LLD_GIT_PROTOCOL = "git"
+GPIO_LLD_GIT_BRANCH = "master"
+GPIO_LLD_GIT_DESTSUFFIX = "git/ti/drv/gpio"
+
+# Below commit ID corresponds to "DEV.GPIO_LLD.01.00.00.10"
+GPIO_LLD_SRCREV = "2661a410e5bc00b4769db6ef2692f680a7a42feb"
+
+BRANCH = "${GPIO_LLD_GIT_BRANCH}"
+SRC_URI = "${GPIO_LLD_GIT_URI};destsuffix=${GPIO_LLD_GIT_DESTSUFFIX};protocol=${GPIO_LLD_GIT_PROTOCOL};branch=${BRANCH}"
+
+SRCREV = "${GPIO_LLD_SRCREV}"
+PV = "01.00.00.10"
 PR = "r0"

+S = "${WORKDIR}/${GPIO_LLD_GIT_DESTSUFFIX}"

 DEPENDS_append = " osal-rtos \
 "
@@ -21,8 +31,6 @@ DEPENDS_append_ti33x = " starterware-rtos \
 "
 DEPENDS_append_ti43x = " starterware-rtos \
 "
-DEPENDS_append_k3 = " sciclient-rtos \
-"

 # Build with make instead of XDC
 TI_PDK_XDCMAKE = "0"
--- a/recipes-bsp/gpmc-lld/gpmc-lld-rtos_git.bb
+++ b/recipes-bsp/gpmc-lld/gpmc-lld-rtos_git.bb
@@ -1,10 +1,6 @@
 SUMMARY = "TI RTOS low level driver for General Purpose Memory Controller (GPMC)"

-inherit ti-pdk ti-pdk-fetch
-
-TI_PDK_COMP = "ti.drv.gpmc"
-
-PE = "1"
+inherit ti-pdk

 LICENSE = "BSD-3-Clause"
 LIC_FILES_CHKSUM = "file://GPMC.h;beginline=1;endline=31;md5=485ec97c36f809bf92323fde3e988c72"
@@ -12,7 +8,18 @@ LIC_FILES_CHKSUM = "file://GPMC.h;beginline=1;endline=31;md5=485ec97c36f809bf923
 COMPATIBLE_MACHINE = "ti33x|ti43x"
 PACKAGE_ARCH = "${MACHINE_ARCH}"

+GPMC_LLD_GIT_URI = "git://git.ti.com/keystone-rtos/gpmc-lld.git"
+GPMC_LLD_GIT_PROTOCOL = "git"
+GPMC_LLD_GIT_BRANCH = "master"

+# Below commit ID corresponds to "DEV.GPMC_LLD.01.00.00.01"
+GPMC_LLD_SRCREV = "86df4c099ad9c84f4b92d515ba64c343c75cf44d"
+
+BRANCH = "${GPMC_LLD_GIT_BRANCH}"
+SRC_URI = "${GPMC_LLD_GIT_URI};protocol=${GPMC_LLD_GIT_PROTOCOL};branch=${BRANCH}"
+
+SRCREV = "${GPMC_LLD_SRCREV}"
+PV = "01.00.00.01"
 PR = "r0"

 DEPENDS_append = " osal-rtos \
--- a/recipes-bsp/hyplnk-lld/hyplnk-lld.inc
+++ b/recipes-bsp/hyplnk-lld/hyplnk-lld.inc
@@ -6,16 +6,24 @@ PACKAGE_ARCH = "${MACHINE_ARCH}"

 LLDNAME="hyplnk"

-LIC_FILES_CHKSUM = "file://COPYING.txt;md5=623325cc19e613a4e770fbb749922592"
+LIC_FILES_CHKSUM = "file://${WORKDIR}/${HYPLNK_GIT_DESTSUFFIX}/COPYING.txt;md5=623325cc19e613a4e770fbb749922592"

-inherit ti-pdk-fetch
+HYPLNK_GIT_URI = "git://git.ti.com/keystone-rtos/hyplnk-lld.git"
+HYPLNK_GIT_PROTOCOL = "git"
+HYPLNK_GIT_BRANCH = "master"
+HYPLNK_GIT_DESTSUFFIX = "git/ti/drv/${LLDNAME}"

-TI_PDK_COMP = "ti.drv.hyplnk"
+# Following commit corresponds to tag DEV.HYPLNK_LLD.02.01.00.07
+HYPLNK_SRCREV = "7799dd3b1ef425494bf52534adebb915f6566885"

-PE = "1"
+BRANCH="${HYPLNK_GIT_BRANCH}"
+SRC_URI = "${HYPLNK_GIT_URI};destsuffix=${HYPLNK_GIT_DESTSUFFIX};protocol=${HYPLNK_GIT_PROTOCOL};branch=${BRANCH}"
+SRCREV = "${HYPLNK_SRCREV}"

+PV = "2.1.0.7"
 INC_PR = "r0"

 DEVICELIST_k2hk = "k2h k2k"
 DEVICELIST_k2e  = "k2e"

+S = "${WORKDIR}/${HYPLNK_GIT_DESTSUFFIX}"
--- a/recipes-bsp/hyplnk-lld/hyplnk-lld_git.bb
+++ b/recipes-bsp/hyplnk-lld/hyplnk-lld_git.bb
@@ -18,7 +18,6 @@ do_install () {
 	make -f makefile_armv7 install PDK_INSTALL_PATH="${STAGING_INCDIR}" \
 		INSTALL_INC_BASE_DIR="${D}/${includedir}" \
 		INSTALL_LIB_BASE_DIR="${D}${libdir}" HYPLNK_SRC_DIR="${S}"
-	chown -R root:root ${D}

 	# Set the generic device library symbolic link to default k2h
 	cd ${D}${libdir}
--- a/recipes-bsp/i2c-lld/i2c-lld-rtos_git.bb
+++ b/recipes-bsp/i2c-lld/i2c-lld-rtos_git.bb
@@ -1,18 +1,26 @@
 SUMMARY = "TI RTOS low level driver for Inter-IC module (I2C)"

-inherit ti-pdk ti-pdk-fetch
-
-TI_PDK_COMP = "ti.drv.i2c"
-
-PE = "1"
+inherit ti-pdk

 LICENSE = "BSD-3-Clause"
 LIC_FILES_CHKSUM = "file://I2C.h;beginline=1;endline=32;md5=50084375278c1a2779571be134f98f7c"

-COMPATIBLE_MACHINE = "ti33x|ti43x|omap-a15|keystone|omapl1|c66x|k3"
+COMPATIBLE_MACHINE = "ti33x|ti43x|omap-a15|keystone|omapl1|c66x"
 PACKAGE_ARCH = "${MACHINE_ARCH}"

+I2C_LLD_GIT_URI = "git://git.ti.com/keystone-rtos/i2c-lld.git"
+I2C_LLD_GIT_PROTOCOL = "git"
+I2C_LLD_GIT_BRANCH = "master"
+I2C_LLD_GIT_DESTSUFFIX = "git/ti/drv/i2c"

+# Below commit ID corresponds to "DEV.I2C_LLD.01.00.00.10"
+I2C_LLD_SRCREV = "631a38ad7245b68bfac40a417bdc9d3a0b7ca724"
+
+BRANCH = "${I2C_LLD_GIT_BRANCH}"
+SRC_URI = "${I2C_LLD_GIT_URI};destsuffix=${I2C_LLD_GIT_DESTSUFFIX};protocol=${I2C_LLD_GIT_PROTOCOL};branch=${BRANCH}"
+
+SRCREV = "${I2C_LLD_SRCREV}"
+PV = "01.00.00.10"
 PR = "r0"

 DEPENDS_append = " osal-rtos \
@@ -26,15 +34,10 @@ DEPENDS_append_ti43x = " starterware-rtos \
 DEPENDS_append_am57xx-evm = " pruss-lld-rtos \
 "

-DEPENDS_append_k2g = " pruss-lld-rtos \
-"
-
-DEPENDS_append_j7-evm = " sciclient-rtos \
-"
-
 # Build with make instead of XDC
 TI_PDK_XDCMAKE = "0"

+S = "${WORKDIR}/${I2C_LLD_GIT_DESTSUFFIX}"

 export PDK_I2C_ROOT_PATH ="${WORKDIR}/build"
 export DEST_ROOT="${S}"
--- a/recipes-bsp/ibl-boot/ibl-boot-rtos_git.bb
+++ b/recipes-bsp/ibl-boot/ibl-boot-rtos_git.bb
@@ -9,27 +9,15 @@ LIC_FILES_CHKSUM = "file://src/ibl.h;beginline=1;endline=34;md5=ee7d7a3305d1e524

 require recipes-ti/includes/ti-paths.inc

-DEPENDS = " ti-cgt6x-7-native \
-            bison-native \
-            flex-native \
-"
+DEPENDS = "ti-cgt6x-7-native"

 PACKAGE_ARCH = "${MACHINE_ARCH}"
 COMPATIBLE_MACHINE = "c66x"

-CLEANBROKEN = "1"
-
-IBL_BOOT_GIT_URI = "git://git.ti.com/keystone-rtos/ibl.git"
-IBL_BOOT_GIT_PROTOCOL = "git"
-IBL_BOOT_GIT_BRANCH = "master"
-IBL_BOOT_SRCREV = "ed3f0989d8cdc813b7ca1ed899c4d84b63de3a75"
-
-BRANCH = "${IBL_BOOT_GIT_BRANCH}"
-SRC_URI = "${IBL_BOOT_GIT_URI};protocol=${IBL_BOOT_GIT_PROTOCOL};branch=${BRANCH}"
-SRCREV = "${IBL_BOOT_SRCREV}"
-
-
-PR = "r2"
+BRANCH = "master"
+SRC_URI = "git://git.ti.com/keystone-rtos/ibl.git;protocol=git;branch=${BRANCH}"
+SRCREV = "f7ed32cc8911e3353dd01080da9b725b44a12285"
+PR = "r0"

 S = "${WORKDIR}/git"

@@ -40,8 +28,8 @@ IBLTARGETS_c665x-evm = "evm_c6657_i2c"
 IBLTARGETS_c667x-evm = "evm_c6678_i2c"

 IBLENDIAN = ""
-IBLENDIAN_c665x-evm = "little"
-IBLENDIAN_c667x-evm = "little"
+IBLENDIAN_c665x-evm = "little big"
+IBLENDIAN_c667x-evm = "little big"

 export C6X_BASE_DIR="${TI_CGT6X_7_INSTALL_DIR}"
 export TOOLSC6X="${C6X_BASE_DIR}"
--- a/recipes-bsp/icss-emac-lld/icss-emac-lld.inc
+++ b/recipes-bsp/icss-emac-lld/icss-emac-lld.inc
@@ -1,14 +1,22 @@
 LICENSE = "BSD-3-Clause"
+LIC_FILES_CHKSUM = "file://icss_emacDrv.h;beginline=1;endline=40;md5=88d270788c1d8516511304f11a28586d"

-LIC_FILES_CHKSUM = "file://COPYING.txt;md5=76cafd87d8495b42c2355f7681de15a2"
-COMPATIBLE_MACHINE = "ti33x|ti43x|omap-a15|k2g|k3"
+COMPATIBLE_MACHINE = "ti33x|ti43x|omap-a15|k2g"
 PACKAGE_ARCH = "${MACHINE_ARCH}"

-inherit ti-pdk-fetch
+ICSS_EMAC_LLD_GIT_URI = "git://git.ti.com/keystone-rtos/icss-emac.git"
+ICSS_EMAC_LLD_GIT_PROTOCOL = "git"
+ICSS_EMAC_LLD_GIT_BRANCH = "master"
+ICSS_EMAC_LLD_GIT_DESTSUFFIX = "git/ti/drv/icss_emac"

-TI_PDK_COMP = "ti.drv.icss_emac"
+# Below commit ID corresponds to "DEV.ICSS_EMAC_LLD.01.00.00.11B"
+ICSS_EMAC_LLD_SRCREV = "bd643d75a0322b6ca769d8ecbee310d859c0f761"

-PE = "1"
+BRANCH = "${ICSS_EMAC_LLD_GIT_BRANCH}"
+SRC_URI = "${ICSS_EMAC_LLD_GIT_URI};destsuffix=${ICSS_EMAC_LLD_GIT_DESTSUFFIX};protocol=${ICSS_EMAC_LLD_GIT_PROTOCOL};branch=${BRANCH}"

-INC_PR = "r1"
+SRCREV = "${ICSS_EMAC_LLD_SRCREV}"
+PV = "01.00.00.11B"
+INC_PR = "r0"

+S = "${WORKDIR}/${ICSS_EMAC_LLD_GIT_DESTSUFFIX}"
--- a/recipes-bsp/iolink-lld/iolink-lld-rtos_git.bb
+++ b/recipes-bsp/iolink-lld/iolink-lld-rtos_git.bb
@@ -1,33 +0,0 @@
-SUMMARY = "TI RTOS low level driver for IO-Link Master"
-
-inherit ti-pdk ti-pdk-fetch
-
-TI_PDK_COMP = "ti.drv.iolink"
-
-PE = "1"
-
-LICENSE = "BSD-3-Clause"
-LIC_FILES_CHKSUM = "file://IOLINK.h;beginline=1;endline=32;md5=da669339a4b8594ed3edbe7ca30c726e"
-
-COMPATIBLE_MACHINE = "ti43x"
-PACKAGE_ARCH = "${MACHINE_ARCH}"
-
-PR = "r2"
-
-DEPENDS_append = " osal-rtos \
-"
-DEPENDS_append_ti43x = " starterware-rtos \
-                         pruss-lld-rtos \
-"
-
-# Build with make instead of XDC
-TI_PDK_XDCMAKE = "0"
-
-
-export PDK_IOLINK_ROOT_PATH ="${WORKDIR}/build"
-export DEST_ROOT="${S}"
-
-INSANE_SKIP_${PN} = "arch"
-
-# HTML doc link params
-PDK_COMP_LINK_TEXT = "IOLINK LLD"
--- a/recipes-bsp/ipc-lld/ipc-lld-examples-rtos_git.bb
+++ b/recipes-bsp/ipc-lld/ipc-lld-examples-rtos_git.bb
@@ -1,162 +0,0 @@
-SUMMARY = "echo_test for IPC-LLD"
-
-require ipc-lld.inc
-
-inherit update-alternatives
-
-DEPENDS += " ipc-lld-rtos common-csl-ip-rtos sciclient-rtos board-rtos"
-
-REMOTE_FW_DIR = "${S}/examples/yocto_bin"
-REMOTE_FW_BIN_DIR = "${REMOTE_FW_DIR}/ipc_echo_test/bin"
-REMOTE_FWB_BIN_DIR = "${REMOTE_FW_DIR}/ipc_echo_testb/bin"
-RTOS_ALL_CORES_BIN_DIR = "${REMOTE_FW_DIR}/ex02_bios_multicore_echo_test/bin"
-RTOS_2_CORES_BIN_DIR = "${REMOTE_FW_DIR}/ex01_bios_2core_echo_test/bin"
-LINUX_2_CORES_BIN_DIR = "${REMOTE_FW_DIR}/ex03_linux_bios_2core_echo_test/bin"
-LINUX_2_CORES_BAREMETAL_BIN_DIR = "${REMOTE_FW_DIR}/ex04_linux_baremetal_2core_echo_test/bin"
-
-DST_BIN_PATH = "${base_libdir}/firmware/pdk-ipc"
-
-TI_PDK_LIMIT_BOARDS_j7-evm = "j721e_evm"
-
-do_configure[noexec] = "1"
-
-do_compile() {
-    cd "${PDK_INSTALL_PATH}/ti/build"
-
-    for board in ${TI_PDK_LIMIT_BOARDS}
-    do
-        for core in ${TI_PDK_LIMIT_CORES}
-        do
-            oe_runmake ipc_echo_test BOARD="$board" CORE="$core" DEST_ROOT=${REMOTE_FW_DIR}
-            oe_runmake ex02_bios_multicore_echo_test BOARD="$board" CORE="$core" DEST_ROOT=${REMOTE_FW_DIR}
-            oe_runmake ex01_bios_2core_echo_test BOARD="$board" CORE="$core" DEST_ROOT=${REMOTE_FW_DIR}
-            oe_runmake ex03_linux_bios_2core_echo_test BOARD="$board" CORE="$core" DEST_ROOT=${REMOTE_FW_DIR}
-            oe_runmake ex04_linux_baremetal_2core_echo_test BOARD="$board" CORE="$core" DEST_ROOT=${REMOTE_FW_DIR}
-            oe_runmake ipc_echo_testb BOARD="$board" CORE="$core" DEST_ROOT=${REMOTE_FW_DIR}
-        done
-
-    done
-}
-
-do_install() {
-    CP_ARGS="-Prf --preserve=mode,timestamps --no-preserve=ownership"
-    install -d ${D}${DST_BIN_PATH}
-
-    cp ${CP_ARGS} ${REMOTE_FW_DIR}/ex02_bios_multicore_echo_test/bin -d ${D}/ex02_bios_multicore_echo_test
-    cp ${CP_ARGS} ${REMOTE_FW_DIR}/ex01_bios_2core_echo_test/bin -d ${D}/ex01_bios_2core_echo_test
-    cp ${CP_ARGS} ${REMOTE_FW_DIR}/ex03_linux_bios_2core_echo_test/bin -d ${D}/ex03_linux_bios_2core_echo_test
-
-    for board in ${TI_PDK_LIMIT_BOARDS}
-    do
-        for core in ${TI_PDK_LIMIT_CORES}
-        do
-            install -m 0644 ${REMOTE_FW_BIN_DIR}/$board/ipc_echo_test_${core}_release* ${D}${DST_BIN_PATH}
-
-            #removing map files copied in previous line
-            rm ${D}${DST_BIN_PATH}/*.map
-        done
-
-        #remove mpu binarires
-        rm ${D}${DST_BIN_PATH}/ipc_echo_test_mpu1_0_release.xa*
-
-    done
-}
-
-do_install_append_j7-evm() {
-    #copy ipc_echo_testb binaries for J721
-    install -m 0644 ${REMOTE_FWB_BIN_DIR}/$board/ipc_echo_testb_mcu1_0_release.xer5f ${D}${DST_BIN_PATH}
-    install -m 0644 ${REMOTE_FWB_BIN_DIR}/$board/ipc_echo_testb_mcu1_1_release.xer5f ${D}${DST_BIN_PATH}
-    install -m 0644 ${REMOTE_FWB_BIN_DIR}/$board/ipc_echo_testb_mcu2_0_release.xer5f ${D}${DST_BIN_PATH}
-    install -m 0644 ${REMOTE_FWB_BIN_DIR}/$board/ipc_echo_testb_mcu2_1_release.xer5f ${D}${DST_BIN_PATH}
-    install -m 0644 ${REMOTE_FWB_BIN_DIR}/$board/ipc_echo_testb_mcu3_0_release.xer5f ${D}${DST_BIN_PATH}
-    install -m 0644 ${REMOTE_FWB_BIN_DIR}/$board/ipc_echo_testb_mcu3_1_release.xer5f ${D}${DST_BIN_PATH}
-
-    install -m 0644 ${REMOTE_FWB_BIN_DIR}/$board/ipc_echo_testb_mcu1_0_release_strip.xer5f ${D}${DST_BIN_PATH}
-    install -m 0644 ${REMOTE_FWB_BIN_DIR}/$board/ipc_echo_testb_mcu1_1_release_strip.xer5f ${D}${DST_BIN_PATH}
-    install -m 0644 ${REMOTE_FWB_BIN_DIR}/$board/ipc_echo_testb_mcu2_0_release_strip.xer5f ${D}${DST_BIN_PATH}
-    install -m 0644 ${REMOTE_FWB_BIN_DIR}/$board/ipc_echo_testb_mcu2_1_release_strip.xer5f ${D}${DST_BIN_PATH}
-    install -m 0644 ${REMOTE_FWB_BIN_DIR}/$board/ipc_echo_testb_mcu3_0_release_strip.xer5f ${D}${DST_BIN_PATH}
-    install -m 0644 ${REMOTE_FWB_BIN_DIR}/$board/ipc_echo_testb_mcu3_1_release_strip.xer5f ${D}${DST_BIN_PATH}
-}
-
-do_install_append_am65xx-evm() {
-    cp ${CP_ARGS} ${REMOTE_FW_DIR}/ex04_linux_baremetal_2core_echo_test/bin -d ${D}/ex04_linux_baremetal_2core_echo_test
-}
-
-# Set up names for the firmwares
-ALTERNATIVE_${PN}_am65xx = "\
-                    am65x-mcu-r5f0_0-fw \
-                    am65x-mcu-r5f0_1-fw \
-                    "
-ALTERNATIVE_${PN}_j7-evm = "\
-                    j7-mcu-r5f0_0-fw \
-                    j7-mcu-r5f0_1-fw \
-                    j7-main-r5f0_0-fw \
-                    j7-main-r5f0_1-fw \
-                    j7-main-r5f1_0-fw \
-                    j7-main-r5f1_1-fw \
-                    j7-c66_0-fw \
-                    j7-c66_1-fw \
-                    j7-c71_0-fw\
-                    "
-
-# Set up link names for the firmwares
-
-TARGET_MCU_R5FSS0_0_am65xx = "am65x-mcu-r5f0_0-fw"
-TARGET_MCU_R5FSS0_1_am65xx = "am65x-mcu-r5f0_1-fw"
-
-TARGET_MCU_R5FSS0_0_j7-evm = "j7-mcu-r5f0_0-fw"
-TARGET_MCU_R5FSS0_1_j7-evm = "j7-mcu-r5f0_1-fw"
-TARGET_MAIN_R5FSS0_0_j7-evm = "j7-main-r5f0_0-fw"
-TARGET_MAIN_R5FSS0_1_j7-evm = "j7-main-r5f0_1-fw"
-TARGET_MAIN_R5FSS1_0_j7-evm = "j7-main-r5f1_0-fw"
-TARGET_MAIN_R5FSS1_1_j7-evm = "j7-main-r5f1_1-fw"
-TARGET_C66_0_j7-evm = "j7-c66_0-fw"
-TARGET_C66_1_j7-evm = "j7-c66_1-fw"
-TARGET_C7X_j7-evm = "j7-c71_0-fw"
-
-ALTERNATIVE_LINK_NAME[am65x-mcu-r5f0_0-fw] = "${base_libdir}/firmware/${TARGET_MCU_R5FSS0_0}"
-ALTERNATIVE_LINK_NAME[am65x-mcu-r5f0_1-fw] = "${base_libdir}/firmware/${TARGET_MCU_R5FSS0_1}"
-
-ALTERNATIVE_LINK_NAME[j7-mcu-r5f0_0-fw] = "${base_libdir}/firmware/${TARGET_MCU_R5FSS0_0}"
-ALTERNATIVE_LINK_NAME[j7-mcu-r5f0_1-fw] = "${base_libdir}/firmware/${TARGET_MCU_R5FSS0_1}"
-ALTERNATIVE_LINK_NAME[j7-main-r5f0_0-fw] = "${base_libdir}/firmware/${TARGET_MAIN_R5FSS0_0}"
-ALTERNATIVE_LINK_NAME[j7-main-r5f0_1-fw] = "${base_libdir}/firmware/${TARGET_MAIN_R5FSS0_1}"
-ALTERNATIVE_LINK_NAME[j7-main-r5f1_0-fw] = "${base_libdir}/firmware/${TARGET_MAIN_R5FSS1_0}"
-ALTERNATIVE_LINK_NAME[j7-main-r5f1_1-fw] = "${base_libdir}/firmware/${TARGET_MAIN_R5FSS1_1}"
-ALTERNATIVE_LINK_NAME[j7-c66_0-fw] = "${base_libdir}/firmware/${TARGET_C66_0}"
-ALTERNATIVE_LINK_NAME[j7-c66_1-fw] = "${base_libdir}/firmware/${TARGET_C66_1}"
-ALTERNATIVE_LINK_NAME[j7-c71_0-fw] = "${base_libdir}/firmware/${TARGET_C7X}"
-
-# Create the firmware alternatives
-
-ALTERNATIVE_TARGET[am65x-mcu-r5f0_0-fw] = "${base_libdir}/firmware/pdk-ipc/ipc_echo_test_mcu1_0_release_strip.xer5f"
-ALTERNATIVE_TARGET[am65x-mcu-r5f0_1-fw] = "${base_libdir}/firmware/pdk-ipc/ipc_echo_test_mcu1_1_release_strip.xer5f"
-
-ALTERNATIVE_TARGET[j7-mcu-r5f0_0-fw] = "${base_libdir}/firmware/pdk-ipc/ipc_echo_testb_mcu1_0_release_strip.xer5f"
-ALTERNATIVE_TARGET[j7-mcu-r5f0_1-fw] = "${base_libdir}/firmware/pdk-ipc/ipc_echo_test_mcu1_1_release_strip.xer5f"
-ALTERNATIVE_TARGET[j7-main-r5f0_0-fw] = "${base_libdir}/firmware/pdk-ipc/ipc_echo_test_mcu2_0_release_strip.xer5f"
-ALTERNATIVE_TARGET[j7-main-r5f0_1-fw] = "${base_libdir}/firmware/pdk-ipc/ipc_echo_test_mcu2_1_release_strip.xer5f"
-ALTERNATIVE_TARGET[j7-main-r5f1_0-fw] = "${base_libdir}/firmware/pdk-ipc/ipc_echo_test_mcu3_0_release_strip.xer5f"
-ALTERNATIVE_TARGET[j7-main-r5f1_1-fw] = "${base_libdir}/firmware/pdk-ipc/ipc_echo_test_mcu3_1_release_strip.xer5f"
-ALTERNATIVE_TARGET[j7-c66_0-fw] = "${base_libdir}/firmware/pdk-ipc/ipc_echo_test_c66xdsp_1_release_strip.xe66"
-ALTERNATIVE_TARGET[j7-c66_1-fw] = "${base_libdir}/firmware/pdk-ipc/ipc_echo_test_c66xdsp_2_release_strip.xe66"
-ALTERNATIVE_TARGET[j7-c71_0-fw] = "${base_libdir}/firmware/pdk-ipc/ipc_echo_test_c7x_1_release_strip.xe71"
-
-ALTERNATIVE_PRIORITY = "10"
-
-#add source and all rtos binaries package
-PACKAGES =+ "${PN}-rtos"
-
-# make sure that lib/firmware, and all its contents are part of the package
-FILES_${PN} += "${base_libdir}/firmware"
-
-FILES_${PN}-rtos += "ex02_bios_multicore_echo_test"
-FILES_${PN}-rtos += "ex01_bios_2core_echo_test"
-FILES_${PN}-rtos += "ex03_linux_bios_2core_echo_test"
-FILES_${PN}-rtos += "ex04_linux_baremetal_2core_echo_test"
-
-INSANE_SKIP_${PN} = "arch ldflags file-rdeps"
-INSANE_SKIP_${PN}-rtos = "arch ldflags file-rdeps"
-
-INSANE_SKIP_${PN}-dbg = "arch"
--- a/recipes-bsp/ipc-lld/ipc-lld-fw_git.bb
+++ b/recipes-bsp/ipc-lld/ipc-lld-fw_git.bb
@@ -1,196 +0,0 @@
-SUMMARY = "R5 and DSP IPC Echo Test Firmware Binaries"
-
-LICENSE = "TI-TFL"
-LIC_FILES_CHKSUM = "file://LICENSE;md5=7eae093f2b09fd39307f30028a068b91"
-
-inherit deploy
-inherit update-alternatives
-
-COMPATIBLE_MACHINE = "k3"
-
-PV = "1.0-git${SRCPV}"
-PACKAGE_ARCH = "${MACHINE_ARCH}"
-
-PROTOCOL = "git"
-BRANCH = "master"
-SRCREV = "c9f7cfe61b67998a053fe145344ce0c9b5bb22aa"
-
-SRC_URI = "git://git.ti.com/keystone-rtos/ipc-lld.git;protocol=${PROTOCOL};branch=${BRANCH}"
-
-S = "${WORKDIR}/git"
-
-AM65X_R5_FW_DIR = "${S}/examples/echo_test/binaries/am65xx"
-J721E_R5_DSP_FW_DIR = "${S}/examples/echo_test/binaries/j721e"
-
-PLATFORM_am65xx = "am65xx"
-PLATFORM_j7-evm = "j7-evm"
-
-# make sure that lib/firmware, and all its contents are part of the package
-FILES_${PN} += "${base_libdir}/firmware"
-
-# install all R5 & DSP ipc echo test binaries in lib/firmware/pdk-ipc, with softlinks up a level
-do_install() {
-    install -d ${D}${base_libdir}/firmware/pdk-ipc
-}
-
-do_install_append_am65xx() {
-    install -m 0644 ${AM65X_R5_FW_DIR}/ipc_echo_test_mcu1_0_release.xer5f ${D}${base_libdir}/firmware/pdk-ipc/
-    install -m 0644 ${AM65X_R5_FW_DIR}/ipc_echo_test_mcu1_0_release.strip.xer5f ${D}${base_libdir}/firmware/pdk-ipc/
-    install -m 0644 ${AM65X_R5_FW_DIR}/ipc_echo_test_mcu1_1_release.xer5f ${D}${base_libdir}/firmware/pdk-ipc/
-    install -m 0644 ${AM65X_R5_FW_DIR}/ipc_echo_test_mcu1_1_release.strip.xer5f ${D}${base_libdir}/firmware/pdk-ipc/
-}
-
-do_install_append_j7-evm() {
-    install -m 0644 ${J721E_R5_DSP_FW_DIR}/ipc_echo_test_mcu1_0_release.xer5f ${D}${base_libdir}/firmware/pdk-ipc/
-    install -m 0644 ${J721E_R5_DSP_FW_DIR}/ipc_echo_test_mcu1_0_release.strip.xer5f ${D}${base_libdir}/firmware/pdk-ipc/
-    install -m 0644 ${J721E_R5_DSP_FW_DIR}/ipc_echo_testb_mcu1_0_release.xer5f ${D}${base_libdir}/firmware/pdk-ipc/
-    install -m 0644 ${J721E_R5_DSP_FW_DIR}/ipc_echo_testb_mcu1_0_release.strip.xer5f ${D}${base_libdir}/firmware/pdk-ipc/
-    install -m 0644 ${J721E_R5_DSP_FW_DIR}/ipc_echo_test_mcu1_1_release.xer5f ${D}${base_libdir}/firmware/pdk-ipc/
-    install -m 0644 ${J721E_R5_DSP_FW_DIR}/ipc_echo_test_mcu1_1_release.strip.xer5f ${D}${base_libdir}/firmware/pdk-ipc/
-    install -m 0644 ${J721E_R5_DSP_FW_DIR}/ipc_echo_testb_mcu1_1_release.xer5f ${D}${base_libdir}/firmware/pdk-ipc/
-    install -m 0644 ${J721E_R5_DSP_FW_DIR}/ipc_echo_testb_mcu1_1_release.strip.xer5f ${D}${base_libdir}/firmware/pdk-ipc/
-    install -m 0644 ${J721E_R5_DSP_FW_DIR}/ipc_echo_test_mcu2_0_release.xer5f ${D}${base_libdir}/firmware/pdk-ipc/
-    install -m 0644 ${J721E_R5_DSP_FW_DIR}/ipc_echo_test_mcu2_0_release.strip.xer5f ${D}${base_libdir}/firmware/pdk-ipc/
-    install -m 0644 ${J721E_R5_DSP_FW_DIR}/ipc_echo_testb_mcu2_0_release.xer5f ${D}${base_libdir}/firmware/pdk-ipc/
-    install -m 0644 ${J721E_R5_DSP_FW_DIR}/ipc_echo_testb_mcu2_0_release.strip.xer5f ${D}${base_libdir}/firmware/pdk-ipc/
-    install -m 0644 ${J721E_R5_DSP_FW_DIR}/ipc_echo_test_mcu2_1_release.xer5f ${D}${base_libdir}/firmware/pdk-ipc/
-    install -m 0644 ${J721E_R5_DSP_FW_DIR}/ipc_echo_test_mcu2_1_release.strip.xer5f ${D}${base_libdir}/firmware/pdk-ipc/
-    install -m 0644 ${J721E_R5_DSP_FW_DIR}/ipc_echo_testb_mcu2_1_release.xer5f ${D}${base_libdir}/firmware/pdk-ipc/
-    install -m 0644 ${J721E_R5_DSP_FW_DIR}/ipc_echo_testb_mcu2_1_release.strip.xer5f ${D}${base_libdir}/firmware/pdk-ipc/
-    install -m 0644 ${J721E_R5_DSP_FW_DIR}/ipc_echo_test_mcu3_0_release.xer5f ${D}${base_libdir}/firmware/pdk-ipc/
-    install -m 0644 ${J721E_R5_DSP_FW_DIR}/ipc_echo_test_mcu3_0_release.strip.xer5f ${D}${base_libdir}/firmware/pdk-ipc/
-    install -m 0644 ${J721E_R5_DSP_FW_DIR}/ipc_echo_testb_mcu3_0_release.xer5f ${D}${base_libdir}/firmware/pdk-ipc/
-    install -m 0644 ${J721E_R5_DSP_FW_DIR}/ipc_echo_testb_mcu3_0_release.strip.xer5f ${D}${base_libdir}/firmware/pdk-ipc/
-    install -m 0644 ${J721E_R5_DSP_FW_DIR}/ipc_echo_test_mcu3_1_release.xer5f ${D}${base_libdir}/firmware/pdk-ipc/
-    install -m 0644 ${J721E_R5_DSP_FW_DIR}/ipc_echo_test_mcu3_1_release.strip.xer5f ${D}${base_libdir}/firmware/pdk-ipc/
-    install -m 0644 ${J721E_R5_DSP_FW_DIR}/ipc_echo_testb_mcu3_1_release.xer5f ${D}${base_libdir}/firmware/pdk-ipc/
-    install -m 0644 ${J721E_R5_DSP_FW_DIR}/ipc_echo_testb_mcu3_1_release.strip.xer5f ${D}${base_libdir}/firmware/pdk-ipc/
-    install -m 0644 ${J721E_R5_DSP_FW_DIR}/ipc_echo_test_c66xdsp_1_release.xe66 ${D}${base_libdir}/firmware/pdk-ipc/
-    install -m 0644 ${J721E_R5_DSP_FW_DIR}/ipc_echo_test_c66xdsp_1_release.strip.xe66 ${D}${base_libdir}/firmware/pdk-ipc/
-    install -m 0644 ${J721E_R5_DSP_FW_DIR}/ipc_echo_test_c66xdsp_2_release.xe66 ${D}${base_libdir}/firmware/pdk-ipc/
-    install -m 0644 ${J721E_R5_DSP_FW_DIR}/ipc_echo_test_c66xdsp_2_release.strip.xe66 ${D}${base_libdir}/firmware/pdk-ipc/
-    install -m 0644 ${J721E_R5_DSP_FW_DIR}/ipc_echo_test_c7x_1_release.xe71 ${D}${base_libdir}/firmware/pdk-ipc/
-    install -m 0644 ${J721E_R5_DSP_FW_DIR}/ipc_echo_test_c7x_1_release.strip.xe71 ${D}${base_libdir}/firmware/pdk-ipc/
-}
-
-# Set up names for the firmwares
-ALTERNATIVE_${PN}_am65xx = "\
-                    am65x-mcu-r5f0_0-fw \
-                    am65x-mcu-r5f0_1-fw \
-                    "
-ALTERNATIVE_${PN}_j7-evm = "\
-                    j7-mcu-r5f0_0-fw \
-                    j7-mcu-r5f0_1-fw \
-                    j7-main-r5f0_0-fw \
-                    j7-main-r5f0_1-fw \
-                    j7-main-r5f1_0-fw \
-                    j7-main-r5f1_1-fw \
-                    j7-c66_0-fw \
-                    j7-c66_1-fw \
-                    j7-c71_0-fw\
-                    "
-
-# Set up link names for the firmwares
-
-TARGET_MCU_R5FSS0_0_am65xx = "am65x-mcu-r5f0_0-fw"
-TARGET_MCU_R5FSS0_1_am65xx = "am65x-mcu-r5f0_1-fw"
-
-TARGET_MCU_R5FSS0_0_j7-evm = "j7-mcu-r5f0_0-fw"
-TARGET_MCU_R5FSS0_1_j7-evm = "j7-mcu-r5f0_1-fw"
-TARGET_MAIN_R5FSS0_0_j7-evm = "j7-main-r5f0_0-fw"
-TARGET_MAIN_R5FSS0_1_j7-evm = "j7-main-r5f0_1-fw"
-TARGET_MAIN_R5FSS1_0_j7-evm = "j7-main-r5f1_0-fw"
-TARGET_MAIN_R5FSS1_1_j7-evm = "j7-main-r5f1_1-fw"
-TARGET_C66_0_j7-evm = "j7-c66_0-fw"
-TARGET_C66_1_j7-evm = "j7-c66_1-fw"
-TARGET_C7X_j7-evm = "j7-c71_0-fw"
-
-ALTERNATIVE_LINK_NAME[am65x-mcu-r5f0_0-fw] = "${base_libdir}/firmware/${TARGET_MCU_R5FSS0_0}"
-ALTERNATIVE_LINK_NAME[am65x-mcu-r5f0_1-fw] = "${base_libdir}/firmware/${TARGET_MCU_R5FSS0_1}"
-
-ALTERNATIVE_LINK_NAME[j7-mcu-r5f0_0-fw] = "${base_libdir}/firmware/${TARGET_MCU_R5FSS0_0}"
-ALTERNATIVE_LINK_NAME[j7-mcu-r5f0_1-fw] = "${base_libdir}/firmware/${TARGET_MCU_R5FSS0_1}"
-ALTERNATIVE_LINK_NAME[j7-main-r5f0_0-fw] = "${base_libdir}/firmware/${TARGET_MAIN_R5FSS0_0}"
-ALTERNATIVE_LINK_NAME[j7-main-r5f0_1-fw] = "${base_libdir}/firmware/${TARGET_MAIN_R5FSS0_1}"
-ALTERNATIVE_LINK_NAME[j7-main-r5f1_0-fw] = "${base_libdir}/firmware/${TARGET_MAIN_R5FSS1_0}"
-ALTERNATIVE_LINK_NAME[j7-main-r5f1_1-fw] = "${base_libdir}/firmware/${TARGET_MAIN_R5FSS1_1}"
-ALTERNATIVE_LINK_NAME[j7-c66_0-fw] = "${base_libdir}/firmware/${TARGET_C66_0}"
-ALTERNATIVE_LINK_NAME[j7-c66_1-fw] = "${base_libdir}/firmware/${TARGET_C66_1}"
-ALTERNATIVE_LINK_NAME[j7-c71_0-fw] = "${base_libdir}/firmware/${TARGET_C7X}"
-
-# Create the firmware alternatives
-
-ALTERNATIVE_TARGET[am65x-mcu-r5f0_0-fw] = "${base_libdir}/firmware/pdk-ipc/ipc_echo_test_mcu1_0_release.strip.xer5f"
-ALTERNATIVE_TARGET[am65x-mcu-r5f0_1-fw] = "${base_libdir}/firmware/pdk-ipc/ipc_echo_test_mcu1_1_release.strip.xer5f"
-
-ALTERNATIVE_TARGET[j7-mcu-r5f0_0-fw] = "${base_libdir}/firmware/pdk-ipc/ipc_echo_testb_mcu1_0_release.strip.xer5f"
-ALTERNATIVE_TARGET[j7-mcu-r5f0_1-fw] = "${base_libdir}/firmware/pdk-ipc/ipc_echo_test_mcu1_1_release.strip.xer5f"
-ALTERNATIVE_TARGET[j7-main-r5f0_0-fw] = "${base_libdir}/firmware/pdk-ipc/ipc_echo_test_mcu2_0_release.strip.xer5f"
-ALTERNATIVE_TARGET[j7-main-r5f0_1-fw] = "${base_libdir}/firmware/pdk-ipc/ipc_echo_test_mcu2_1_release.strip.xer5f"
-ALTERNATIVE_TARGET[j7-main-r5f1_0-fw] = "${base_libdir}/firmware/pdk-ipc/ipc_echo_test_mcu3_0_release.strip.xer5f"
-ALTERNATIVE_TARGET[j7-main-r5f1_1-fw] = "${base_libdir}/firmware/pdk-ipc/ipc_echo_test_mcu3_1_release.strip.xer5f"
-ALTERNATIVE_TARGET[j7-c66_0-fw] = "${base_libdir}/firmware/pdk-ipc/ipc_echo_test_c66xdsp_1_release.strip.xe66"
-ALTERNATIVE_TARGET[j7-c66_1-fw] = "${base_libdir}/firmware/pdk-ipc/ipc_echo_test_c66xdsp_2_release.strip.xe66"
-ALTERNATIVE_TARGET[j7-c71_0-fw] = "${base_libdir}/firmware/pdk-ipc/ipc_echo_test_c7x_1_release.strip.xe71"
-
-ALTERNATIVE_PRIORITY = "10"
-
-# copy the executables into the deploy directory
-
-do_deploy() {
-    :
-}
-
-do_deploy_am65xx() {
-    install ${AM65X_R5_FW_DIR}/ipc_echo_test_mcu1_0_release.xer5f ${DEPLOYDIR}/
-    install ${AM65X_R5_FW_DIR}/ipc_echo_test_mcu1_0_release.strip.xer5f ${DEPLOYDIR}/
-    install ${AM65X_R5_FW_DIR}/ipc_echo_test_mcu1_1_release.xer5f ${DEPLOYDIR}/
-    install ${AM65X_R5_FW_DIR}/ipc_echo_test_mcu1_1_release.strip.xer5f ${DEPLOYDIR}/
-}
-
-do_deploy_j7-evm() {
-    install ${J721E_R5_DSP_FW_DIR}/ipc_echo_test_mcu1_0_release.xer5f ${DEPLOYDIR}/
-    install ${J721E_R5_DSP_FW_DIR}/ipc_echo_test_mcu1_0_release.strip.xer5f ${DEPLOYDIR}/
-    install ${J721E_R5_DSP_FW_DIR}/ipc_echo_testb_mcu1_0_release.xer5f ${DEPLOYDIR}/
-    install ${J721E_R5_DSP_FW_DIR}/ipc_echo_testb_mcu1_0_release.strip.xer5f ${DEPLOYDIR}/
-    install ${J721E_R5_DSP_FW_DIR}/ipc_echo_test_mcu1_1_release.xer5f ${DEPLOYDIR}/
-    install ${J721E_R5_DSP_FW_DIR}/ipc_echo_test_mcu1_1_release.strip.xer5f ${DEPLOYDIR}/
-    install ${J721E_R5_DSP_FW_DIR}/ipc_echo_testb_mcu1_1_release.xer5f ${DEPLOYDIR}/
-    install ${J721E_R5_DSP_FW_DIR}/ipc_echo_testb_mcu1_1_release.strip.xer5f ${DEPLOYDIR}/
-    install ${J721E_R5_DSP_FW_DIR}/ipc_echo_test_mcu2_0_release.xer5f ${DEPLOYDIR}/
-    install ${J721E_R5_DSP_FW_DIR}/ipc_echo_test_mcu2_0_release.strip.xer5f ${DEPLOYDIR}/
-    install ${J721E_R5_DSP_FW_DIR}/ipc_echo_testb_mcu2_0_release.xer5f ${DEPLOYDIR}/
-    install ${J721E_R5_DSP_FW_DIR}/ipc_echo_testb_mcu2_0_release.strip.xer5f ${DEPLOYDIR}/
-    install ${J721E_R5_DSP_FW_DIR}/ipc_echo_test_mcu2_1_release.xer5f ${DEPLOYDIR}/
-    install ${J721E_R5_DSP_FW_DIR}/ipc_echo_test_mcu2_1_release.strip.xer5f ${DEPLOYDIR}/
-    install ${J721E_R5_DSP_FW_DIR}/ipc_echo_testb_mcu2_1_release.xer5f ${DEPLOYDIR}/
-    install ${J721E_R5_DSP_FW_DIR}/ipc_echo_testb_mcu2_1_release.strip.xer5f ${DEPLOYDIR}/
-    install ${J721E_R5_DSP_FW_DIR}/ipc_echo_test_mcu3_0_release.xer5f ${DEPLOYDIR}/
-    install ${J721E_R5_DSP_FW_DIR}/ipc_echo_test_mcu3_0_release.strip.xer5f ${DEPLOYDIR}/
-    install ${J721E_R5_DSP_FW_DIR}/ipc_echo_testb_mcu3_0_release.xer5f ${DEPLOYDIR}/
-    install ${J721E_R5_DSP_FW_DIR}/ipc_echo_testb_mcu3_0_release.strip.xer5f ${DEPLOYDIR}/
-    install ${J721E_R5_DSP_FW_DIR}/ipc_echo_test_mcu3_1_release.xer5f ${DEPLOYDIR}/
-    install ${J721E_R5_DSP_FW_DIR}/ipc_echo_test_mcu3_1_release.strip.xer5f ${DEPLOYDIR}/
-    install ${J721E_R5_DSP_FW_DIR}/ipc_echo_testb_mcu3_1_release.xer5f ${DEPLOYDIR}/
-    install ${J721E_R5_DSP_FW_DIR}/ipc_echo_testb_mcu3_1_release.strip.xer5f ${DEPLOYDIR}/
-    install ${J721E_R5_DSP_FW_DIR}/ipc_echo_test_c66xdsp_1_release.xe66 ${DEPLOYDIR}/
-    install ${J721E_R5_DSP_FW_DIR}/ipc_echo_test_c66xdsp_1_release.strip.xe66 ${DEPLOYDIR}/
-    install ${J721E_R5_DSP_FW_DIR}/ipc_echo_test_c66xdsp_2_release.xe66 ${DEPLOYDIR}/
-    install ${J721E_R5_DSP_FW_DIR}/ipc_echo_test_c66xdsp_2_release.strip.xe66 ${DEPLOYDIR}/
-    install ${J721E_R5_DSP_FW_DIR}/ipc_echo_test_c7x_1_release.xe71 ${DEPLOYDIR}/
-    install ${J721E_R5_DSP_FW_DIR}/ipc_echo_test_c7x_1_release.strip.xe71 ${DEPLOYDIR}/
-}
-
-addtask deploy after do_install before do_build
-
-# This is used to prevent the build system to strip the executables
-INHIBIT_PACKAGE_STRIP = "1"
-INHIBIT_SYSROOT_STRIP = "1"
-# This is used to prevent the build system to split the debug info in a separate file
-INHIBIT_PACKAGE_DEBUG_SPLIT = "1"
-# As it likely to be a different arch from the Yocto build, disable checking by adding "arch" to INSANE_SKIP
-INSANE_SKIP_${PN} += "arch"
-
-# we don't want to configure and build the source code
-do_compile[noexec] = "1"
-do_configure[noexec] = "1"
--- a/recipes-bsp/ipc-lld/ipc-lld-rtos_git.bb
+++ b/recipes-bsp/ipc-lld/ipc-lld-rtos_git.bb
@@ -1,45 +0,0 @@
-SUMMARY = "TI RTOS low level driver for IPC"
-
-require ipc-lld.inc
-
-DEPENDS += " osal-rtos common-csl-ip-rtos sciclient-rtos"
-
-do_configure() {
-    # remove any previous package
-    rm -rf ${IPCLLD_PACKAGE_BASE}
-    cd ${S}
-
-    mkdir -p ${IPCLLD_ROOTPATH}
-
-    for board in ${TI_PDK_LIMIT_BOARDS}
-    do
-        # make the release package before building it
-        oe_runmake package BOARD=$board DEST_ROOT=${IPCLLD_PACKAGE_BASE} PDK_IPC_COMP_PATH=${S}
-    done
-
-}
-
-do_compile() {
-    cd ${IPCLLD_ROOTPATH}
-
-    oe_runmake lib LIMIT_BOARDS="${TI_PDK_LIMIT_BOARDS}" PDK_IPC_COMP_PATH=${IPCLLD_ROOTPATH}
-}
-
-do_install() {
-    cd ${IPCLLD_ROOTPATH}
-
-    #remove prebuilt binaries
-    rm -rf examples/echo_test/binaries
-
-    #archive
-    tar -cf ipc-lld.tar --exclude='*.tar' ./*
-
-    install -d ${D}${PDK_INSTALL_DIR_RECIPE}/packages/ti/drv/ipc
-    find -name "*.tar" -exec tar xf {} --no-same-owner -C ${D}${PDK_INSTALL_DIR_RECIPE}/packages/ti/drv/ipc \;
-}
-
-FILES_${PN} += "${PDK_INSTALL_DIR_RECIPE}/packages"
-
-INSANE_SKIP_${PN} = "arch ldflags file-rdeps"
-
-INSANE_SKIP_${PN}-dbg = "arch"
--- a/recipes-bsp/ipc-lld/ipc-lld.inc
+++ b/recipes-bsp/ipc-lld/ipc-lld.inc
@@ -1,29 +0,0 @@
-inherit ti-pdk ti-pdk-fetch
-
-TI_PDK_COMP = "ti.drv.ipc"
-
-PE = "1"
-
-LICENSE = "BSD-3-Clause"
-LIC_FILES_CHKSUM = "file://LICENSE;md5=7eae093f2b09fd39307f30028a068b91"
-
-COMPATIBLE_MACHINE = "k3"
-PACKAGE_ARCH = "${MACHINE_ARCH}"
-
-PR = "r4"
-
-# Build with make instead of XDC
-TI_PDK_XDCMAKE = "0"
-
-IPCLLD_PACKAGE_BASE   = "${WORKDIR}/ipclld_base"
-IPCLLD_ROOTPATH = "${IPCLLD_PACKAGE_BASE}/package/all/pdk_/packages/ti/drv/ipc"
-
-export PDK_INSTALL_PATH = "${PDK_INSTALL_DIR}/packages"
-export PDK_IPC_ROOT_PATH = "${IPCLLD_PACKAGE_BASE}/package/all/pdk_/packages"
-
-# HTML doc link params
-PDK_COMP_LINK_TEXT = "IPCLLD"
-
-EXTRA_OEMAKE = "PDK_INSTALL_PATH=${PDK_INSTALL_PATH} "
-
-TI_PDK_LIMIT_CORES_append_am65xx-evm = " mcu1_1 "
--- a/recipes-bsp/ipumm-fw/ipumm-fw_git.bb
+++ b/recipes-bsp/ipumm-fw/ipumm-fw_git.bb
@@ -17,12 +17,12 @@ RDEPENDS_${PN} = " libdce"

 SRC_URI = "git://git.ti.com/ivimm/ipumm.git;protocol=git"

-SRCREV = "df4c50aecc9aad7ab3eb1ca9ebacfe473fcad7c5"
+SRCREV = "035ba2571a273162fde75a31decadc6534d17eca"

 S = "${WORKDIR}/git"

 PV = "3.00.15.00"
-PR = "r5"
+PR = "r1"

 require recipes-ti/includes/ti-paths.inc

--- a/recipes-bsp/iqn2-lld/iqn2-lld.inc
+++ b/recipes-bsp/iqn2-lld/iqn2-lld.inc
@@ -1,13 +1,21 @@
 LIC_FILES_CHKSUM = "file://COPYING.txt;md5=5bdceac872dffdec915b819654ee23ea"
 LICENSE = "BSD-3-Clause"

-inherit ti-pdk-fetch
+IQN2_LLD_GIT_URI = "git://git.ti.com/keystone-rtos/iqn2-lld.git"
+IQN2_LLD_GIT_PROTOCOL = "git"
+IQN2_LLD_GIT_BRANCH = "master"
+IQN2_LLD_GIT_DESTSUFFIX = "git/ti/drv/iqn2"

-TI_PDK_COMP = "ti.drv.iqn2"
+# Following commit corresponds to DEV.IQN_LLD.01.00.00.10
+IQN2_LLD_SRCREV = "dfc6bdd3b397b58e234f74eadda6d79ee399e682"

-PE = "1"
+BRANCH = "${IQN2_LLD_GIT_BRANCH}"
+SRC_URI = "${IQN2_LLD_GIT_URI};destsuffix=${IQN2_LLD_GIT_DESTSUFFIX};protocol=${IQN2_LLD_GIT_PROTOCOL};branch=${BRANCH}"
+SRCREV = "${IQN2_LLD_SRCREV}"

+PV = "1.0.0.10"
 INC_PR = "r0"

 COMPATIBLE_MACHINE = "k2l"

+S = "${WORKDIR}/${IQN2_LLD_GIT_DESTSUFFIX}"
--- a/recipes-bsp/ivshmem-uio/ivshmem-uio-driver_git.bb
+++ b/recipes-bsp/ivshmem-uio/ivshmem-uio-driver_git.bb
@@ -1,29 +0,0 @@
-SUMMARY =  "Kernel driver for IVSHMEM based UIO driver"
-DESCRIPTION = "Kernel module which registers a UIO (userspace io) device for inter VM shared memory"
-HOMEPAGE = "https://github.com/henning-schild-work/ivshmem-guest-code"
-LICENSE = "GPLv2"
-LIC_FILES_CHKSUM = "file://COPYING;md5=0546a27aad86c83b75ad4ee6133e9d5e"
-
-inherit module
-
-RDEPENDS_${PN} = "jailhouse"
-
-PROTOCOL = "git"
-BRANCH = "jailhouse"
-SRCREV = "f3ad79881bebb6c6068966ee3d265d8034c20492"
-SRC_URI = "git://github.com/henning-schild-work/ivshmem-guest-code.git;protocol=${PROTOCOL};branch=${BRANCH}"
-
-S = "${WORKDIR}/git"
-
-EXTRA_OEMAKE += 'KDIR="${STAGING_KERNEL_DIR}"'
-
-COMPATIBLE_MACHINE = "(ti-soc)"
-
-do_compile_prepend() {
-    cd ${S}/kernel_module/uio
-}
-
-do_install() {
-    install -d ${D}/${base_libdir}/modules/${KERNEL_VERSION}/extra
-    install -m 644 ${S}/kernel_module/uio/uio_ivshmem.ko ${D}/${base_libdir}/modules/${KERNEL_VERSION}/extra
-}
--- a/recipes-bsp/ivshmem-uio/ivshmem-uio-tests_git.bb
+++ b/recipes-bsp/ivshmem-uio/ivshmem-uio-tests_git.bb
@@ -1,23 +0,0 @@
-SUMMARY =  "UIO tests for IVSHMEM based UIO driver"
-DESCRIPTION = "Test programs which use UIO (userspace io) device for inter VM communication"
-HOMEPAGE = "https://github.com/henning-schild-work/ivshmem-guest-code"
-LICENSE = "GPLv2"
-LIC_FILES_CHKSUM = "file://${WORKDIR}/git/COPYING;md5=0546a27aad86c83b75ad4ee6133e9d5e"
-
-inherit cmake
-
-PROTOCOL = "git"
-BRANCH = "jailhouse"
-SRCREV = "f3ad79881bebb6c6068966ee3d265d8034c20492"
-SRC_URI = "git://github.com/henning-schild-work/ivshmem-guest-code.git;protocol=${PROTOCOL};branch=${BRANCH}"
-
-S = "${WORKDIR}/git/uio/tests/Interrupts/VM"
-
-COMPATIBLE_MACHINE = "(ti-soc)"
-OECMAKE_TARGET_COMPILE = "uio_send uio_read"
-
-do_install() {
-    install -d ${D}/${bindir}
-    install -m 755 ${B}/uio_send ${D}/${bindir}/
-    install -m 755 ${B}/uio_read ${D}/${bindir}/
-}
--- a/recipes-bsp/mcasp-lld/mcasp-lld-rtos_git.bb
+++ b/recipes-bsp/mcasp-lld/mcasp-lld-rtos_git.bb
@@ -1,20 +1,29 @@
 SUMMARY = "TI RTOS low level driver for Multi channel Audio Serial port (McASP)"

-inherit ti-pdk ti-pdk-fetch
-
-TI_PDK_COMP = "ti.drv.mcasp"
-
-PE = "1"
+inherit ti-pdk

 LICENSE = "BSD-3-Clause"
-LIC_FILES_CHKSUM = "file://mcaspver.h;beginline=19;endline=47;md5=75a9adc782a6df0d3a5419743e9a9f18"
+LIC_FILES_CHKSUM = "file://mcaspver.h;beginline=1;endline=47;md5=cc81a11c1566fe1cf19270744f504619"

-COMPATIBLE_MACHINE = "ti43x|omap-a15|k2g|ti33x|omapl1|k3"
+COMPATIBLE_MACHINE = "ti43x|omap-a15|k2g|ti33x|omapl1"
 PACKAGE_ARCH = "${MACHINE_ARCH}"

+MCASP_LLD_GIT_URI = "git://git.ti.com/keystone-rtos/mcasp-lld.git"
+MCASP_LLD_GIT_PROTOCOL = "git"
+MCASP_LLD_GIT_BRANCH = "master"
+MCASP_LLD_GIT_DESTSUFFIX = "git/ti/drv/mcasp"

+# Below commit ID corresponds to "DEV.MCASP_LLD.01.01.00.09"
+MCASP_LLD_SRCREV = "6459379818712cac10c439a46936bd6bfcd762d7"
+
+BRANCH = "${MCASP_LLD_GIT_BRANCH}"
+SRC_URI = "${MCASP_LLD_GIT_URI};destsuffix=${MCASP_LLD_GIT_DESTSUFFIX};protocol=${MCASP_LLD_GIT_PROTOCOL};branch=${BRANCH}"
+
+SRCREV = "${MCASP_LLD_SRCREV}"
+PV = "01.01.00.09"
 PR = "r0"

+S = "${WORKDIR}/${MCASP_LLD_GIT_DESTSUFFIX}"

 DEPENDS_append = " edma3-lld-rtos \
                   osal-rtos \
@@ -23,11 +32,6 @@ DEPENDS_append_ti43x = " starterware-rtos \
 "
 DEPENDS_append_ti33x = " starterware-rtos \
 "
-
-DEPENDS_remove_k3 = "edma3-lld-rtos "
-DEPENDS_append_k3 = " udma-lld-rtos \
-"
-
 # Build with make instead of XDC
 TI_PDK_XDCMAKE = "0"

--- a/recipes-bsp/mcbsp-lld/mcbsp-lld-rtos_git.bb
+++ b/recipes-bsp/mcbsp-lld/mcbsp-lld-rtos_git.bb
@@ -1,19 +1,29 @@
 SUMMARY = "TI RTOS low level driver for Multi-channel Buffered Serial Port (McBSP)"

-inherit ti-pdk ti-pdk-fetch
-
-TI_PDK_COMP = "ti.drv.mcbsp"
-
-PE = "1"
+inherit ti-pdk

 LICENSE = "BSD-3-Clause"
 LIC_FILES_CHKSUM = "file://mcbspver.h;beginline=1;endline=47;md5=a8a39efd13fa6fe66da5461b898d620e"

-COMPATIBLE_MACHINE = "k2g|c665x-evm|omapl1"
+COMPATIBLE_MACHINE = "k2g|c665x-evm"
 PACKAGE_ARCH = "${MACHINE_ARCH}"

+MCBSP_LLD_GIT_URI = "git://git.ti.com/keystone-rtos/mcbsp-lld.git"
+MCBSP_LLD_GIT_PROTOCOL = "git"
+MCBSP_LLD_GIT_BRANCH = "master"
+MCBSP_LLD_GIT_DESTSUFFIX = "git/ti/drv/mcbsp"
+
+# Below commit ID corresponds to "DEV.MCBSP_LLD.01.00.00.09"
+MCBSP_LLD_SRCREV = "e782f251a7009c786a208a15e6bc0331bb6808f6"
+
+BRANCH = "${MCBSP_LLD_GIT_BRANCH}"
+SRC_URI = "${MCBSP_LLD_GIT_URI};destsuffix=${MCBSP_LLD_GIT_DESTSUFFIX};protocol=${MCBSP_LLD_GIT_PROTOCOL};branch=${BRANCH}"
+
+SRCREV = "${MCBSP_LLD_SRCREV}"
+PV = "01.00.00.09"
 PR = "r0"

+S = "${WORKDIR}/${MCBSP_LLD_GIT_DESTSUFFIX}"

 DEPENDS_append = " edma3-lld-rtos \
 "
@@ -21,10 +31,5 @@ DEPENDS_append = " edma3-lld-rtos \
 export EDMA3LLD_BIOS6_INSTALLDIR = "${EDMA3_LLD_INSTALL_DIR}"
 XDCPATH_append = ";${EDMA3_LLD_INSTALL_DIR}/packages"

-TI_PDK_XDCMAKE = "0"
-
-export PDK_MCBSP_ROOT_PATH = "${WORKDIR}/build"
-export DEST_ROOT = "${S}"
-
 # HTML doc link params
 PDK_COMP_LINK_TEXT = "MCBSP LLD"
--- a/recipes-bsp/mmap-lld/mmap-lld-rtos_git.bb
+++ b/recipes-bsp/mmap-lld/mmap-lld-rtos_git.bb
@@ -1,10 +0,0 @@
-inherit ti-pdk
-
-require recipes-bsp/mmap-lld/mmap-lld.inc
-
-PR = "${INC_PR}.0"
-
-PACKAGE_ARCH = "${MACHINE_ARCH}"
-
-# HTML doc link params
-PDK_COMP_LINK_TEXT = "MMAP LLD"
--- a/recipes-bsp/mmap-lld/mmap-lld.inc
+++ b/recipes-bsp/mmap-lld/mmap-lld.inc
@@ -9,14 +9,14 @@ MMAP_LLD_GIT_PROTOCOL = "git"
 MMAP_LLD_GIT_BRANCH = "master"
 MMAP_LLD_GIT_DESTSUFFIX = "git/ti/runtime/mmap"

-# Commit correspond to DEV.MMAP.02.00.00.08C
-MMAP_LLD_SRCREV = "62e75191ab7144604102dabaa288c5fd5048fc49"
+# Commit correspond to DEV.MMAP.02.00.00.07
+MMAP_LLD_SRCREV = "4426949ddfafdc8ea9408dbf5a642c3e840f4997"

 BRANCH="${MMAP_LLD_GIT_BRANCH}"
 SRC_URI = "${MMAP_LLD_GIT_URI};destsuffix=${MMAP_LLD_GIT_DESTSUFFIX};protocol=${MMAP_LLD_GIT_PROTOCOL};branch=${BRANCH}"
 SRCREV = "${MMAP_LLD_SRCREV}"

-PV = "2.0.0.8C"
+PV = "2.0.0.7"
 INC_PR = "r0"

 S = "${WORKDIR}/git/ti/runtime/mmap"
--- a/recipes-bsp/mmcsd-lld/mmcsd-lld-rtos_git.bb
+++ b/recipes-bsp/mmcsd-lld/mmcsd-lld-rtos_git.bb
@@ -1,20 +1,29 @@
 SUMMARY = "TI Multimedia card(MMC)/Secure Digital(SD) low level driver for RTOS "

-inherit ti-pdk ti-pdk-fetch
-
-TI_PDK_COMP = "ti.drv.mmcsd"
-
-PE = "1"
+inherit ti-pdk

 LICENSE = "BSD-3-Clause"
 LIC_FILES_CHKSUM = "file://MMCSD.h;beginline=1;endline=32;md5=f74069541d4d165a000a66b4043cb065"

-COMPATIBLE_MACHINE = "ti33x|ti43x|omap-a15|k2g|omapl1|k3"
+COMPATIBLE_MACHINE = "ti33x|ti43x|omap-a15|k2g|omapl1"
 PACKAGE_ARCH = "${MACHINE_ARCH}"

+MMCSD_LLD_GIT_URI = "git://git.ti.com/keystone-rtos/sd-mmc.git"
+MMCSD_LLD_GIT_PROTOCOL = "git"
+MMCSD_LLD_GIT_BRANCH = "master"
+MMCSD_LLD_GIT_DESTSUFFIX = "git/ti/drv/mmcsd"

+# Below commit ID corresponds to "DEV.MMCSD_LLD.01.00.00.11"
+MMCSD_LLD_SRCREV = "0fdb39f60ad82385b8f7e0cba8c33fe3883b4320"
+
+BRANCH = "${MMCSD_LLD_GIT_BRANCH}"
+SRC_URI = "${MMCSD_LLD_GIT_URI};destsuffix=${MMCSD_LLD_GIT_DESTSUFFIX};protocol=${MMCSD_LLD_GIT_PROTOCOL};branch=${BRANCH}"
+
+SRCREV = "${MMCSD_LLD_SRCREV}"
+PV = "01.00.00.11"
 PR = "r0"

+S = "${WORKDIR}/${MMCSD_LLD_GIT_DESTSUFFIX}"

 DEPENDS_append = " edma3-lld-rtos \
                   osal-rtos \
@@ -23,10 +32,6 @@ DEPENDS_append_ti33x = " starterware-rtos \
 "
 DEPENDS_append_ti43x = " starterware-rtos \
 "
-DEPENDS_remove_k3 = "edma3-lld-rtos "
-
-DEPENDS_append_k3 = " sciclient-rtos \
-"

 # Build with make instead of XDC
 TI_PDK_XDCMAKE = "0"
--- a/recipes-bsp/netcp-pa-fw/netcp-pa-fw_git.bb
+++ b/recipes-bsp/netcp-pa-fw/netcp-pa-fw_git.bb
@@ -13,7 +13,7 @@ COMPATIBLE_MACHINE = "k2hk|k2l|k2e"
 PACKAGE_ARCH = "${MACHINE_ARCH}"

 SRCREV = "953ab647b0b6af411965242ecd919b1cb0e570d6"
-BRANCH ?= "ti-linux-firmware"
+BRANCH ?= "ti-linux-firmware-4.1.y"

 SRC_URI = "git://git.ti.com/processor-firmware/ti-linux-firmware.git;protocol=git;branch=${BRANCH}"

--- a/recipes-bsp/netcp-sa-fw/netcp-sa-fw_git.bb
+++ b/recipes-bsp/netcp-sa-fw/netcp-sa-fw_git.bb
@@ -13,7 +13,7 @@ COMPATIBLE_MACHINE = "keystone"
 PACKAGE_ARCH = "${MACHINE_ARCH}"

 SRCREV = "588f602a21c62f90b1f4318b881c80a1e711317a"
-BRANCH ?= "ti-linux-firmware"
+BRANCH ?= "ti-linux-firmware-4.1.y"

 SRC_URI = "git://git.ti.com/processor-firmware/ti-linux-firmware.git;protocol=git;branch=${BRANCH}"

--- a/recipes-bsp/nwal-lld/nwal-lld.inc
+++ b/recipes-bsp/nwal-lld/nwal-lld.inc
@@ -1,18 +1,25 @@
 LICENSE = "BSD-3-Clause"
-LIC_FILES_CHKSUM = "file://COPYING.txt;md5=b7982a377c680ad71ca2fbb735982462"
+LIC_FILES_CHKSUM = "file://${WORKDIR}/git/COPYING.txt;md5=b7982a377c680ad71ca2fbb735982462"

 COMPATIBLE_MACHINE = "keystone"
 PACKAGE_ARCH = "${MACHINE_ARCH}"

-inherit ti-pdk-fetch
+NWAL_LLD_GIT_URI = "git://git.ti.com/keystone-rtos/nwal-lld.git"
+NWAL_LLD_GIT_PROTOCOL = "git"
+NWAL_LLD_GIT_BRANCH = "master"

-TI_PDK_COMP = "ti.drv.nwal"
+# Below commit ID corresponds to "DEV.NWAL.02.01.00.11A"
+NWAL_LLD_SRCREV = "a93303e3d682d7161030113b72c3e1adf755bf89"

-PE = "1"
+BRANCH = "${NWAL_LLD_GIT_BRANCH}"
+SRC_URI = "${NWAL_LLD_GIT_URI};protocol=${NWAL_LLD_GIT_PROTOCOL};branch=${BRANCH}"
+SRCREV = "${NWAL_LLD_SRCREV}"

+PV = "02.01.00.11A"
 INC_PR = "r0"

 BASEDIR = "${WORKDIR}/git"
+S = "${BASEDIR}/ti/drv/nwal"

 DEVICELIST_k2hk = "k2h k2k"
 DEVICELIST_k2l  = "k2l"
--- a/recipes-bsp/osal/osal-rtos_git.bb
+++ b/recipes-bsp/osal/osal-rtos_git.bb
@@ -3,7 +3,9 @@ require recipes-bsp/osal/osal.inc

 PR = "${INC_PR}.0"

-COMPATIBLE_MACHINE_append = "|c66x|k3"
+COMPATIBLE_MACHINE_append = "|c66x"
+
+S = "${WORKDIR}/${OSAL_GIT_DESTSUFFIX}"

 DEPENDS_append_ti33x = " starterware-rtos"
 DEPENDS_append_ti43x = " starterware-rtos"
--- a/recipes-bsp/osal/osal-test_git.bb
+++ b/recipes-bsp/osal/osal-test_git.bb
@@ -6,6 +6,8 @@ include osal.inc

 PR = "${INC_PR}.1"

+S = "${WORKDIR}/${OSAL_GIT_DESTSUFFIX}"
+
 EXTRA_OEMAKE = "-f makefile_armv7 PDK_INSTALL_PATH=${STAGING_INCDIR} OSAL_SRC_DIR=${S}"

 do_compile () {
--- a/recipes-bsp/osal/osal.inc
+++ b/recipes-bsp/osal/osal.inc
@@ -1,14 +1,20 @@
 LICENSE = "BSD-3-Clause"
-LIC_FILES_CHKSUM = "file://osal.h;beginline=1;endline=31;md5=6fbde6922f8bca1e6cd371d3c2faa4f9"
+LIC_FILES_CHKSUM = "file://osal.h;beginline=1;endline=31;md5=ae7b9f0410f26c80dcf790ef3f622fad"

 COMPATIBLE_MACHINE = "ti33x|ti43x|omap-a15|keystone|omapl1"
 PACKAGE_ARCH = "${MACHINE_ARCH}"

-inherit ti-pdk-fetch
+OSAL_GIT_URI = "git://git.ti.com/keystone-rtos/osal.git"
+OSAL_GIT_PROTOCOL = "git"
+OSAL_GIT_BRANCH = "master"
+OSAL_GIT_DESTSUFFIX = "git/ti/osal"

-TI_PDK_COMP = "ti.osal"
+# Below commit ID corresponding to "DEV.OSAL.01.00.00.10A"
+OSAL_SRCREV = "d26876bd625d14fc71a9dc79c09d03fab22631dd"

-PE = "1"
+BRANCH = "${OSAL_GIT_BRANCH}"
+SRC_URI = "${OSAL_GIT_URI};destsuffix=${OSAL_GIT_DESTSUFFIX};protocol=${OSAL_GIT_PROTOCOL};branch=${BRANCH}"

+SRCREV = "${OSAL_SRCREV}"
+PV = "01.00.00.10A"
 INC_PR = "r0"
-
--- a/recipes-bsp/osal/osal_git.bb
+++ b/recipes-bsp/osal/osal_git.bb
@@ -6,6 +6,8 @@ include osal.inc

 PR = "${INC_PR}.1"

+S = "${WORKDIR}/${OSAL_GIT_DESTSUFFIX}"
+
 EXTRA_OEMAKE = "-f makefile_armv7 PDK_INSTALL_PATH=${STAGING_INCDIR}"

 do_compile () {
@@ -17,5 +19,4 @@ do_compile () {
 do_install () {
 #   Install the lib
    oe_runmake install INSTALL_INC_BASE_DIR=${D}${includedir} INSTALL_LIB_BASE_DIR=${D}${libdir}
-    chown -R root:root ${D}
 }
--- a/recipes-bsp/pa-lld/pa-lld.inc
+++ b/recipes-bsp/pa-lld/pa-lld.inc
@@ -4,14 +4,22 @@ LIC_FILES_CHKSUM = "file://${WORKDIR}/git/ti/drv/pa/COPYING.txt;md5=cd04fb087063
 COMPATIBLE_MACHINE = "keystone"
 PACKAGE_ARCH = "${MACHINE_ARCH}"

-inherit ti-pdk-fetch
+PA_LLD_GIT_URI = "git://git.ti.com/keystone-rtos/pa-lld.git"
+PA_LLD_GIT_PROTOCOL = "git"
+PA_LLD_GIT_BRANCH = "master"
+PA_LLD_GIT_DESTSUFFIX = "git/ti/drv/pa"

-TI_PDK_COMP = "ti.drv.pa"
+# Below commit ID corresponding to "DEV.PA_LLD.03.00.02.05"
+PA_LLD_SRCREV = "5f24617e71670f17ee9adf71d5b30dc8ff9e5ca3"

-PE = "1"
+BRANCH = "${PA_LLD_GIT_BRANCH}"
+SRC_URI = "${PA_LLD_GIT_URI};destsuffix=${PA_LLD_GIT_DESTSUFFIX};protocol=${PA_LLD_GIT_PROTOCOL};branch=${BRANCH}"
+SRCREV = "${PA_LLD_SRCREV}"

+PV = "03.00.02.05"
 INC_PR = "r0"

+S = "${WORKDIR}/${PA_LLD_GIT_DESTSUFFIX}"

 DEVICELIST = "k2h k2k k2l k2e"
 DEVICELIST_k2hk = "k2h k2k"
--- a/recipes-bsp/pcie-lld/pcie-lld-rtos_git.bb
+++ b/recipes-bsp/pcie-lld/pcie-lld-rtos_git.bb
@@ -1,22 +1,29 @@
 SUMMARY = "TI RTOS low lever driver for Peripheral Interconnect Express (PCIE)"

-inherit ti-pdk ti-pdk-fetch
-
-TI_PDK_COMP = "ti.drv.pcie"
-
-PE = "1"
+inherit ti-pdk

 LICENSE = "BSD-3-Clause"
-LIC_FILES_CHKSUM = "file://pcie.h;beginline=1;endline=34;md5=232c0b07bdf7ab934b23c09e6c5279b0"
+LIC_FILES_CHKSUM = "file://pcie.h;beginline=1;endline=34;md5=c094db055596498ba803933936611eb2"

-COMPATIBLE_MACHINE = "omap-a15|keystone|c66x|k3"
+COMPATIBLE_MACHINE = "omap-a15|keystone|c66x"
 PACKAGE_ARCH = "${MACHINE_ARCH}"

-PR = "r1"
+PCIE_LLD_GIT_URI = "git://git.ti.com/keystone-rtos/pcie-lld.git"
+PCIE_LLD_GIT_PROTOCOL = "git"
+PCIE_LLD_GIT_BRANCH = "master"
+PCIE_LLD_GIT_DESTSUFFIX = "git/ti/drv/pcie"

-DEPENDS_append_k3 = " udma-lld-rtos \
-"
+# Below commit ID corresponds to "DEV.PCIE_LLD.02.02.00.12"
+PCIE_LLD_SRCREV = "90c85b801cc8524deb57d897d204597b11fa26c4"

+BRANCH = "${PCIE_LLD_GIT_BRANCH}"
+SRC_URI = "${PCIE_LLD_GIT_URI};destsuffix=${PCIE_LLD_GIT_DESTSUFFIX};protocol=${PCIE_LLD_GIT_PROTOCOL};branch=${BRANCH}"
+
+SRCREV = "${PCIE_LLD_SRCREV}"
+PV = "02.02.00.12"
+PR = "r0"
+
+S = "${WORKDIR}/${PCIE_LLD_GIT_DESTSUFFIX}"

 export PDK_PCIE_ROOT_PATH ="${WORKDIR}/build"
 export DEST_ROOT="${S}"
--- a/recipes-bsp/pktlib/pktlib.inc
+++ b/recipes-bsp/pktlib/pktlib.inc
@@ -10,15 +10,15 @@ PKTLIB_GIT_PROTOCOL = "git"
 PKTLIB_GIT_BRANCH = "master"
 PKTLIB_GIT_DESTSUFFIX = "git/ti/runtime/pktlib"

-# Below commit ID corresponds to "DEV.PKTLIB.2.1.0.8B"
-PKTLIB_SRCREV = "6d3758fda4c8c40fa9bd1194a9c713c9675b5a40"
+# Below commit ID corresponds to "DEV.PKTLIB.2.1.0.7"
+PKTLIB_SRCREV = "22f66931964c25f83d1971f7eb78902d10c17d8a"

 BRANCH = "${PKTLIB_GIT_BRANCH}"
 # Don't use DESTSUFFIX when cloning since repo contains ti/runtime/pktlib directory tree
 SRC_URI = "${PKTLIB_GIT_URI};protocol=${PKTLIB_GIT_PROTOCOL};branch=${BRANCH}"

 SRCREV = "${PKTLIB_SRCREV}"
-PV = "2.1.0.8B"
-INC_PR = "r0"
+PV = "2.1.0.7"
+INC_PR = "r2"

 S = "${WORKDIR}/${PKTLIB_GIT_DESTSUFFIX}"
--- a/Show More
+++ b/Show More