linux-ti-staging-rt: update to the latest

Signed-off-by: Denys Dmytriyenko <denys@ti.com>

conf/layer.conf

@@ -11,5 +11,14 @@ BBFILE_PRIORITY_meta-ti = "6"
 LICENSE_PATH += "${LAYERDIR}/licenses"
 
 SIGGEN_EXCLUDERECIPES_ABISAFE += " \
+    omapdrm-pvr \
+    omap5-sgx-ddk-um-linux \
     ti-ipc \
+    ti-ipc-rtos \
+    cmem-mod \
+    hplib-mod \
+    gdbserverproxy-module-drv \
+    debugss-module-drv \
+    uio-module-drv \
+    mpm-transport \
 "

conf/machine/am335x-evm.conf

@@ -24,7 +24,7 @@ SERIAL_CONSOLE = "115200 ttyO0"
 # UBI: logical eraseblock size:    126976 bytes
 # from ubiattach stdout:
 # UBI device number 0, total 1988 LEBs
-MKUBIFS_ARGS = "-F -m 2048 -e 126976 -c 3836"
+MKUBIFS_ARGS = "-F -m 2048 -e 126976 -c 4600"
 
 # do ubiattach /dev/ubi_ctrl -m 7 -O 2048
 # from dmesg:

conf/machine/am437x-evm.conf

@@ -24,7 +24,7 @@ SERIAL_CONSOLE = "115200 ttyO0"
 # UBI: logical eraseblock size:    253952 bytes
 # from ubiattach stdout:
 # UBI device number 0, total 994 LEBs
-MKUBIFS_ARGS = "-F -m 4096 -e 253952 -c 1918"
+MKUBIFS_ARGS = "-F -m 4096 -e 253952 -c 2200"
 
 # do ubiattach /dev/ubi_ctrl -m 11 -O 4096
 # from dmesg:

conf/machine/am57xx-evm.conf

@@ -10,7 +10,7 @@ IMAGE_FSTYPES += "ubi tar.gz"
 
 SERIAL_CONSOLE = "115200 ttyO2"
 
-UBOOT_MACHINE = "beagle_x15_config"
+UBOOT_MACHINE = "am57xx_evm_config"
 
 # UBI information.  Note that this is board and kernel specific.  Changes
 # in your kernel port may require changes in these variables.  For more
@@ -23,7 +23,7 @@ UBOOT_MACHINE = "beagle_x15_config"
 # UBI: logical eraseblock size:    126976 bytes
 # from ubiattach stdout:
 # UBI device number 0, total 1988 LEBs
-MKUBIFS_ARGS = "-F -m 2048 -e 126976 -c 5120"
+MKUBIFS_ARGS = "-F -m 2048 -e 126976 -c 6400"
 
 # do ubiattach /dev/ubi_ctrl -m 7 -O 2048
 # from dmesg:

conf/machine/dra7xx-evm.conf

@@ -23,7 +23,7 @@ UBOOT_MACHINE = "dra7xx_evm_config"
 # UBI: logical eraseblock size:    126976 bytes
 # from ubiattach stdout:
 # UBI device number 0, total 1988 LEBs
-MKUBIFS_ARGS = "-F -m 2048 -e 126976 -c 5120"
+MKUBIFS_ARGS = "-F -m 2048 -e 126976 -c 6400"
 
 # do ubiattach /dev/ubi_ctrl -m 7 -O 2048
 # from dmesg:

conf/machine/include/keystone.inc

@@ -4,18 +4,22 @@ require conf/machine/include/soc-family.inc
 DEFAULTTUNE ?= "cortexa15thf-neon"
 require conf/machine/include/tune-cortexa15.inc
 
-PREFERRED_PROVIDER_virtual/kernel = "linux-keystone"
-PREFERRED_PROVIDER_virtual/bootloader = "u-boot-keystone"
-PREFERRED_PROVIDER_u-boot = "u-boot-keystone"
+PREFERRED_PROVIDER_virtual/kernel = "linux-ti-staging"
+PREFERRED_PROVIDER_virtual/bootloader = "u-boot-ti-staging"
+PREFERRED_PROVIDER_u-boot = "u-boot-ti-staging"
 
 # Increase this everytime you change something in the kernel
-MACHINE_KERNEL_PR = "r8"
+MACHINE_KERNEL_PR = "r10"
 
-KERNEL_IMAGETYPE = "uImage"
+KERNEL_IMAGETYPE = "zImage"
 
 UBOOT_ENTRYPOINT = "0x80008000"
 UBOOT_LOADADDRESS = "0x80008000"
 
+# Use the expected value of the ubifs filesystem's volume name in the kernel
+# and u-boot.
+UBI_VOLNAME = "rootfs"
+
 EXTRA_IMAGEDEPENDS += "u-boot"
 EXTRA_IMAGEDEPENDS += "boot-monitor"
 

conf/machine/k2g-evm.conf

@@ -0,0 +1,30 @@
+#@TYPE: Machine
+#@NAME: Keystone 2 K2G machine
+#@DESCRIPTION: Machine configuration for the TI Keystone 2 K2G EVM
+
+require conf/machine/include/keystone.inc
+
+UBOOT_MACHINE = "k2g_evm_config"
+
+BOOT_MONITOR_MAKE_TARGET = "k2g"
+
+IMAGE_FSTYPES += "ubi tar.gz cpio"
+
+SERIAL_CONSOLE = "115200 ttyS0"
+
+SYSVINIT_ENABLED_GETTYS = ""
+
+# do ubiattach /dev/ubi_ctrl -m 4
+# From dmesg:
+# UBI: smallest flash I/O unit:    4096
+# 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"
+
+# do ubiattach /dev/ubi_ctrl -m 4
+# from dmesg:
+# UBI: smallest flash I/O unit:    4096
+# UBI: physical eraseblock size:   256 KiB
+# UBI: sub-page size:              4096
+UBINIZE_ARGS = "-m 4096 -p 256KiB -s 4096 -O 4096"

conf/machine/omap5-evm.conf

@@ -19,7 +19,7 @@ SERIAL_CONSOLE = "115200 ttyO2"
 # UBI: logical eraseblock size:    126976 bytes
 # from ubiattach stdout:
 # UBI device number 0, total 1988 LEBs
-MKUBIFS_ARGS = "-F -m 2048 -e 126976 -c 3836"
+MKUBIFS_ARGS = "-F -m 2048 -e 126976 -c 4000"
 
 # do ubiattach /dev/ubi_ctrl -m 7 -O 2048
 # from dmesg:

recipes-bsp/aif2-lld/aif2-lld-test_git.bb

@@ -0,0 +1,18 @@
+DESCRIPTION = "TI Antenna Interface peripheral module low level driver test binaries"
+
+DEPENDS = "common-csl-ip aif2-lld qmss-lld cppi-lld"
+
+include aif2-lld.inc
+
+PR = "${INC_PR}.0"
+
+EXTRA_OEMAKE = "-f makefile_armv7 PDK_INSTALL_PATH=${STAGING_INCDIR} AIF2_SRC_DIR=${WORKDIR}/git"
+
+do_compile () {
+    oe_runmake clean DEVICE=k2hk
+    oe_runmake tests DEVICE=k2hk
+}
+
+do_install () {
+    oe_runmake installbin DEVICE=k2hk AIF2_SRC_DIR=${WORKDIR}/git INSTALL_BIN_BASE_DIR=${D}/${bindir}
+}

recipes-bsp/aif2-lld/aif2-lld.inc

@@ -0,0 +1,22 @@
+LICENSE = "BSD-3-Clause"
+
+LIC_FILES_CHKSUM = "file://COPYING.txt;md5=5bdceac872dffdec915b819654ee23ea"
+
+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"
+
+# The following commit correspond to DEV.AIF2LLD.01.02.00.00A
+AIF2_LLD_SRCREV = "7f394ec9975cd4cef982b11763c882c4c763ddce"
+
+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.0"
+INC_PR = "r1"
+
+COMPATIBLE_MACHINE = "k2hk-evm"
+
+S = "${WORKDIR}/${AIF2_LLD_GIT_DESTSUFFIX}"

recipes-bsp/aif2-lld/aif2-lld_git.bb

@@ -0,0 +1,17 @@
+DESCRIPTION = "Antenna Interface low level driver"
+
+DEPENDS = "common-csl-ip qmss-lld cppi-lld"
+
+include aif2-lld.inc
+
+PR = "${INC_PR}.0"
+
+EXTRA_OEMAKE = "-f makefile_armv7 PDK_INSTALL_PATH=${STAGING_INCDIR}"
+
+do_compile () {
+    oe_runmake lib DEVICE=k2hk
+}
+
+do_install () {
+    oe_runmake install INSTALL_INC_BASE_DIR=${D}/${includedir} INSTALL_LIB_BASE_DIR=${D}${libdir}
+}

recipes-bsp/boot-monitor/boot-monitor_git.bb

@@ -3,38 +3,44 @@ LICENSE = "BSD"
 LIC_FILES_CHKSUM = "file://COPYING;md5=25fe219a6febf6e5bb45beda1b2eb315"
 
 COMPATIBLE_MACHINE = "keystone"
+PACKAGE_ARCH = "${MACHINE_ARCH}"
 
-SRC_URI = "git://git.ti.com/keystone-linux/boot-monitor.git;protocol=git;branch=${BRANCH}"
+SRC_URI = "git://git.ti.com/processor-firmware/ks2-boot-monitor.git;protocol=git;branch=${BRANCH}"
 
-PV = "2.0+git${SRCPV}"
-PR = "r2"
+PV = "3.0+git${SRCPV}"
+PR = "r1"
 
 BRANCH = "master"
 
 S = "${WORKDIR}/git"
 
-#Tag "K2_BM_14.09"
-SRCREV = "4b0287a3fa9c7a25c75bbe3a54f4ac2a92dc0aaa"
+SRCREV = "035329caed63abe7193c855ad5d561ae783b19d7"
 
-BOOT_MONITOR_BINARY ?= "skern.bin"
-BOOT_MONITOR_IMAGE  ?= "skern-${MACHINE}.bin"
+BOOT_MONITOR_IMAGE  ?= "skern-${BOOT_MONITOR_MAKE_TARGET}.bin"
 
 FLOATABI = "${@base_contains("TUNE_FEATURES", "vfp", base_contains("TUNE_FEATURES", "callconvention-hard", " -mfloat-abi=hard", " -mfloat-abi=softfp", d), "" ,d)}"
 
 EXTRA_OEMAKE = "CROSS_COMPILE=${TARGET_PREFIX} CC="${TARGET_PREFIX}gcc ${TOOLCHAIN_OPTIONS} ${FLOATABI}" LD="${TARGET_PREFIX}gcc ${TOOLCHAIN_OPTIONS} ${FLOATABI}""
 
+FILES_${PN} = "/boot"
+
+inherit deploy
+
 do_compile () {
 	unset LDFLAGS
 	unset CFLAGS
 	unset CPPFLAGS
-	oe_runmake ${BOOT_MONITOR_MAKE_TARGET}
+	oe_runmake image_${BOOT_MONITOR_MAKE_TARGET}
 }
 
-inherit deploy
-
-addtask deploy before do_build after do_compile
+do_install () {
+	install -d ${D}/boot
+	install -m 0644 ${S}/${BOOT_MONITOR_IMAGE} ${D}/boot/
+}
 
 do_deploy () {
 	install -d ${DEPLOYDIR}
-	install ${S}/${BOOT_MONITOR_BINARY} ${DEPLOYDIR}/${BOOT_MONITOR_IMAGE}
+	install -m 0644 ${S}/${BOOT_MONITOR_IMAGE} ${DEPLOYDIR}/
 }
+
+addtask deploy before do_build after do_compile

recipes-bsp/cm3-pm-firmware/am33x-cm3_git.bb

@@ -4,13 +4,13 @@ LICENSE = "BSD-3-Clause"
 LIC_FILES_CHKSUM = "file://License.txt;md5=7bdc54a749ab7a7dea999d25d99a41b8"
 
 PV = "1.9.0"
-PR = "r0"
+PR = "r1"
 PE = "1"
 
 SRCREV = "d85e6a17da1025adac9ab7f97dd7aa2a58c517ce"
 BRANCH ?= "ti-v3.14.y"
 
-SRC_URI = "git://git.ti.com/ti-cm3-pm-firmware/amx3-cm3.git;protocol=git;branch=${BRANCH}"
+SRC_URI = "git://git.ti.com/processor-firmware/ti-amx3-cm3-pm-firmware.git;protocol=git;branch=${BRANCH}"
 
 S = "${WORKDIR}/git"
 

recipes-bsp/cm3-pm-firmware/amx3-cm3_git.bb

@@ -0,0 +1,28 @@
+DESCRIPTION = "Cortex-M3 binary blob for suspend-resume"
+
+LICENSE = "BSD-3-Clause"
+LIC_FILES_CHKSUM = "file://License.txt;md5=7bdc54a749ab7a7dea999d25d99a41b8"
+
+PV = "1.9.1"
+PR = "r2"
+
+SRCREV = "730f0695ca2dda65abcff5763e8f108517bc0d43"
+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 = "${@base_contains("TUNE_FEATURES", "vfp", base_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} ${FLOATABI}"
+}
+
+do_install() {
+	install -d ${D}${base_libdir}/firmware
+	install -m 0644 bin/am335x-pm-firmware.elf ${D}${base_libdir}/firmware/
+	install -m 0644 bin/*-scale-data.bin ${D}${base_libdir}/firmware/
+}
+
+FILES_${PN} += "${base_libdir}/firmware"

recipes-bsp/cmem/cmem-mod_git.bb

@@ -11,4 +11,4 @@ inherit module
 EXTRA_OEMAKE += '-f lu.mak KERNEL_INSTALL_DIR="${STAGING_KERNEL_DIR}" TOOLCHAIN_PREFIX="${TOOLCHAIN_PREFIX}" EXEC_DIR="${D}/lib/modules/${KERNEL_VERSION}/extra"'
 MAKE_TARGETS = "module"
 
-module_autoload_cmemk = "cmemk"
+KERNEL_MODULE_AUTOLOAD += "cmemk"

recipes-bsp/cmem/cmem.inc

@@ -3,11 +3,11 @@ HOMEPAGE = "http://processors.wiki.ti.com/index.php/Category:CMEM"
 LICENSE = "GPLv2"
 LIC_FILES_CHKSUM = "file://include/ti/cmem.h;beginline=1;endline=30;md5=9b745e2765a6ba8a636c91aed4b02ac1"
 
-BRANCH ?= "master"
-# This corresponds to version 4.10.00.01
-SRCREV = "0d2fac7187ca1f6af62a98dee5b3621908cf5831"
+BRANCH ?= "lu-next"
+# This corresponds to version 4.10.02.03
+SRCREV = "00241c45f810c8b8e4f5ac66c3323fec8e43b621"
 
-PV = "4.10.00.01+git${SRCPV}"
+PV = "4.10.02.04+git${SRCPV}"
 
 SRC_URI = "git://git.ti.com/ipc/ludev.git;protocol=git;branch=${BRANCH}"
 

recipes-bsp/cmem/cmem_git.bb

@@ -4,7 +4,7 @@ include cmem.inc
 
 RDEPENDS_${PN} = "cmem-mod"
 
-PR = "r1"
+PR = "r0"
 
 PACKAGES =+ "${PN}-test"
 

recipes-bsp/common-csl-ip/common-csl-ip-rtos_git.bb

@@ -0,0 +1,36 @@
+require common-csl-ip.inc
+
+PR = "${INC_PR}.0"
+
+require recipes-ti/includes/ti-paths.inc
+require recipes-ti/includes/ti-staging.inc
+
+DEPENDS = "ti-xdctools ti-cgt6x-native ti-sysbios"
+
+CSL_GIT_DESTSUFFIX = "git/ti/csl"
+
+export C6X_GEN_INSTALL_PATH="${STAGING_DIR_NATIVE}/usr"
+export XDCCGROOT="${STAGING_DIR_NATIVE}/usr/share/ti/cgt-c6x"
+export XDCPATH="${XDCCGROOT}/include;${XDC_INSTALL_DIR}/packages;${SYSBIOS_INSTALL_DIR}/packages"
+
+do_configure() {
+    sed -i "s/\ \"\.\\\\\\\\\"\ +//" src/Module.xs
+    find -name "*.xs" -exec sed -i "s/ofd6x\.exe/ofd6x/" {} \;
+    find -name "*.xs" -exec sed -i "s/sectti\.exe/sectti/" {} \;
+    find -name "*.xs" -exec sed -i "/\.chm/d" {} \;
+    find -name "*.xs" -exec sed -i "s/pasm\_dos/pasm\_linux/" {} \;
+}
+
+do_compile() {
+    ${XDC_INSTALL_DIR}/xdc .make
+    ${XDC_INSTALL_DIR}/xdc clean
+    ${XDC_INSTALL_DIR}/xdc release
+}
+
+do_install () {
+    install -d ${D}${PDK_INSTALL_DIR_RECIPE}/packages
+    find -name "*.tar" -exec tar xf {} -C ${D}${PDK_INSTALL_DIR_RECIPE}/packages \;
+}
+
+ALLOW_EMPTY_${PN} = "1"
+FILES_${PN}-dev += "${PDK_INSTALL_DIR_RECIPE}/packages"

recipes-bsp/common-csl-ip/common-csl-ip.inc

@@ -0,0 +1,26 @@
+DESCRIPTION = "Chip support library low level interface"
+LICENSE = "BSD-3-Clause"
+LIC_FILES_CHKSUM = "file://COPYING.txt;md5=5857833e20836213677fac33f9aded21"
+
+COMPATIBLE_MACHINE = "keystone|dra7xx"
+PACKAGE_ARCH = "${MACHINE_ARCH}"
+
+INC_PR = "r4"
+
+CSL_GIT_URI = "git://git.ti.com/keystone-rtos/common-csl-ip.git"
+CSL_GIT_PROTOCOL ="git"
+CSL_GIT_BRANCH = "master"
+CSL_GIT_BRANCH_dra7xx = "releases/PROCESSOR-SDK.01.00.00"
+CSL_GIT_DESTSUFFIX = "git"
+
+# commit ID corresponds to DEV.CSL_KEYSTONE2.02.01.01.00A
+CSL_SRCREV = "17bb083f0d5ed4ad6f38c991210a6a8e9aaf9c56"
+
+# commit ID corresponds to PROCESSOR-SDK-ALPHA-1
+CSL_SRCREV_dra7xx = "37c5311ddf289f83b1432a9422816722d264bf55"
+
+BRANCH="${CSL_GIT_BRANCH}"
+SRC_URI = "${CSL_GIT_URI};protocol=${CSL_GIT_PROTOCOL};branch=${BRANCH};destsuffix=${CSL_GIT_DESTSUFFIX}"
+SRCREV = "${CSL_SRCREV}"
+
+S = "${WORKDIR}/${CSL_GIT_DESTSUFFIX}"

recipes-bsp/common-csl-ip/common-csl-ip_git.bb

@@ -1,18 +1,9 @@
-DESCRIPTION = "Chip support library low level interface"
-LICENSE = "BSD-3-Clause"
-LIC_FILES_CHKSUM = "file://COPYING.txt;md5=5857833e20836213677fac33f9aded21"
+require common-csl-ip.inc
+
+PR = "${INC_PR}.0"
 
-COMPATIBLE_MACHINE = "keystone"
 ALLOW_EMPTY_${PN} = "1"
 
-PR = "r3"
-BRANCH="master"
-SRC_URI = "git://git.ti.com/keystone-rtos/common-csl-ip.git;protocol=git;branch=${BRANCH}"
-# commit ID corresponds to DEV.CSL_KEYSTONE2.02.01.00.07A
-SRCREV = "c78867df9165fdf8042fb692fcea776fc0102326"
-
-S = "${WORKDIR}/git"
-
 do_install () {
     install -d ${D}${includedir}/ti/csl
     find . -name "*.h" -type f | xargs -I {} cp --parents {} ${D}${includedir}/ti/csl

recipes-bsp/cppi-lld/cppi-lld-test_git.bb

@@ -1,9 +1,10 @@
 DESCRIPTION = "TI CPPI low level driver unit test and example binaries"
-COMPATIBLE_MACHINE = "keystone"
 DEPENDS = "common-csl-ip rm-lld cppi-lld qmss-lld"
 
 include cppi-lld.inc
 
+PR = "${INC_PR}.0"
+
 CHOICELIST = "yes no"
 
 do_compile () {

recipes-bsp/cppi-lld/cppi-lld.inc

@@ -1,15 +1,27 @@
 LICENSE = "BSD-3-Clause"
 LIC_FILES_CHKSUM = "file://${WORKDIR}/git/ti/drv/cppi/COPYING.txt;md5=e8f6789acdcda76d02ed9203fc2e603d"
 
-BRANCH = "master"
-SRC_URI = "git://git.ti.com/keystone-rtos/cppi-lld.git;destsuffix=git/ti/drv/cppi;protocol=git;branch=${BRANCH}"
+COMPATIBLE_MACHINE = "keystone"
+PACKAGE_ARCH = "${MACHINE_ARCH}"
 
-# Below Commit ID corresponds to "DEV.CPPI_LLD.02.01.00.08"
-SRCREV = "320af092dc382af52b9e68f14ca8acd5c1c467c1"
-PV = "02.01.00.09"
-PR = "r1"
+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"
+
+# Below Commit ID corresponds to "DEV.CPPI_LLD.02.01.00.10"
+CPPI_LLD_SRCREV = "97c537fa544a78e83512db3499a49d0bd86fad32"
+
+BRANCH = "${CPPI_LLD_GIT_BRANCH}"
+SRC_URI = "${CPPI_LLD_GIT_URI};destsuffix=${CPPI_LLD_GIT_DESTSUFFIX};protocol=${CPPI_LLD_GIT_PROTOCOL};branch=${BRANCH}"
+
+SRCREV = "${CPPI_LLD_SRCREV}"
+PV = "02.01.00.10"
+INC_PR = "r3"
 
 DEVICELIST = "k2h k2k k2l k2e"
+DEVICELIST_k2hk-evm = "k2h k2k"
+DEVICELIST_k2l-evm  = "k2l"
+DEVICELIST_k2e-evm  = "k2e"
 
-BASEDIR = "${WORKDIR}/git"
-S = "${BASEDIR}/ti/drv/cppi"
+S = "${WORKDIR}/${CPPI_LLD_GIT_DESTSUFFIX}"

recipes-bsp/cppi-lld/cppi-lld_git.bb

@@ -1,16 +1,10 @@
 DESCRIPTION = "TI CPPI Module low level driver"
-COMPATIBLE_MACHINE = "keystone"
 
 DEPENDS = "common-csl-ip rm-lld qmss-lld"
 
 include cppi-lld.inc
 
-SRC_URI += "file://init_cppi.sh"
-
-inherit update-rc.d
-
-INITSCRIPT_NAME = "init_cppi.sh"
-INITSCRIPT_PARAMS = "defaults 10"
+PR = "${INC_PR}.1"
 
 do_compile () {
 #   Now build the lld in the updated directory
@@ -23,11 +17,15 @@ do_compile () {
 
 do_install () {
 	make -f makefile_armv7 install PDK_INSTALL_PATH=${STAGING_INCDIR} INSTALL_INC_BASE_DIR=${D}/${includedir} INSTALL_LIB_BASE_DIR=${D}${libdir}
+
 #   Set the generic device library symbolic link to default k2h
     cd ${D}${libdir}
-    ln -sf libcppi_k2h.so.1.0.0 libcppi_device.so.1
+
+    # Link only the first device in the list
+    for device in ${DEVICELIST}
+    do
+        ln -sf libcppi_${device}.so.1.0.0 libcppi_device.so.1
+        break
+    done
     ln -sf libcppi_device.so.1 libcppi_device.so
-#   Copy init scripts
-    install -d ${D}${sysconfdir}/init.d/
-    install -c -m 755 ${WORKDIR}/init_cppi.sh ${D}${sysconfdir}/init.d/${INITSCRIPT_NAME}
 }

recipes-bsp/cppi-lld/files/init_cppi.sh

@@ -1,47 +0,0 @@
-#*
-#* Copyright (C) 2015 Texas Instruments Incorporated - http://www.ti.com/
-#*
-#*
-#*  Redistribution and use in source and binary forms, with or without
-#*  modification, are permitted provided that the following conditions
-#*  are met:
-#*
-#*    Redistributions of source code must retain the above copyright
-#*    notice, this list of conditions and the following disclaimer.
-#*
-#*    Redistributions in binary form must reproduce the above copyright
-#*    notice, this list of conditions and the following disclaimer in the
-#*    documentation and/or other materials provided with the
-#*    distribution.
-#*
-#*    Neither the name of Texas Instruments Incorporated nor the names of
-#*    its contributors may be used to endorse or promote products derived
-#*    from this software without specific prior written permission.
-#*
-
-#! /bin/sh
-compatible=$(cat /proc/device-tree/compatible)
-
-cd /usr/lib
-case "$compatible" in
-	*k2hk*)
-		device=k2hk
-		ln -sf libcppi_k2h.so.1.0.0 libcppi_device.so.1
-	;;
-	*k2l*)
-		device=k2l
-		ln -sf libcppi_k2l.so.1.0.0 libcppi_device.so.1
-	;;
-	*k2e*)
-	device=k2e
-		ln -sf libcppi_k2e.so.1.0.0 libcppi_device.so.1
-	;;
-	*)
-		device=unknown
-	;;
-esac
-
-if [ $device != unknown ]; then
-	ln -sf libcppi_device.so.1 libcppi_device.so
-	echo cppi library link established for device : $device
-fi

recipes-bsp/cuia/cuia_1.0.0.13.bb

@@ -11,6 +11,8 @@ SRC_URI[cuia.sha256sum] = "f16d138a9146fdc7d52cba77bd30596da65835f6ffe4092baf2b3
 
 S = "${WORKDIR}/cuia_${CUIA_PV}${CUIA_PVExtra}"
 
+CLEANBROKEN = "1"
+
 do_compile () {
 	cd ${S}
 	oe_runmake clean

recipes-bsp/dfe-lld/dfe-lld-test_git.bb

@@ -4,6 +4,8 @@ DEPENDS = "common-csl-ip dfe-lld iqn2-lld"
 
 include dfe-lld.inc
 
+PR = "${INC_PR}.0"
+
 EXTRA_OEMAKE = "-f makefile_armv7 PDK_INSTALL_PATH=${STAGING_INCDIR} DFE_SRC_DIR=${S}"
 
 do_compile () {

recipes-bsp/dfe-lld/dfe-lld.inc

@@ -1,13 +1,22 @@
 LICENSE = "BSD-3-Clause"
 
 LIC_FILES_CHKSUM = "file://COPYING.txt;md5=1f4217b705bf98762a302fd720649dcc"
-BRANCH = "master"
-SRC_URI = "git://git.ti.com/keystone-rtos/dfe-lld.git;destsuffix=git/ti/drv/dfe;protocol=git;branch=${BRANCH}"
-# The following commit correspond to DEV.DFE_LLD.01.00.00.04C
-SRCREV = "62da141c1cf6224d24161f0c020091043a3d7c82"
 
-PV = "1.0.0.4"
+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"
+
+# The following commit correspond to DEV.DFE_LLD.01.00.00.05E
+DFE_LLD_SRCREV = "42e9df0108d208c92b9d2fee7e8b1b1ab62f4b69"
+
+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.5"
+INC_PR = "r1"
 
 COMPATIBLE_MACHINE = "k2l-evm"
 
-S = "${WORKDIR}/git/ti/drv/dfe"
+S = "${WORKDIR}/${DFE_LLD_GIT_DESTSUFFIX}"

recipes-bsp/dfe-lld/dfe-lld_git.bb

@@ -4,6 +4,8 @@ DEPENDS = "common-csl-ip"
 
 include dfe-lld.inc
 
+PR = "${INC_PR}.0"
+
 EXTRA_OEMAKE = "-f makefile_armv7 PDK_INSTALL_PATH=${STAGING_INCDIR}"
 
 do_compile () {

recipes-bsp/dspdce-fw/dspdce-fw_1.00.00.05.bb

@@ -1,26 +0,0 @@
-DESCRIPTION = "Firmware for DSP for an example application called copycodectest"
-LICENSE = "TI-TSPA"
-LIC_FILES_CHKSUM = "file://DSPDCE-${PV}-Manifest.doc;md5=386d1802eefc2fcf00ab01a5b4556277"
-
-COMPATIBLE_MACHINE = "dra7xx-evm"
-PACKAGE_ARCH = "${MACHINE_ARCH}"
-
-SRC_URI = "http://downloads.ti.com/dsps/dsps_public_sw/glsdk/dspdce/1_00_00_05/exports/dspdce-${MACHINE}-1.00.00.05.tar.gz;protocol=ftp"
-
-S = "${WORKDIR}/dspdce-${MACHINE}-${PV}"
-
-SRC_URI[md5sum] = "4f3d5c6ef088019aa4804eaaedc8e949"
-SRC_URI[sha256sum] = "8d99c4f149613448a6d72c62a18cc7445c63c687b786658da1762c4e1c03a6a0"
-
-TARGET = "dra7-dsp1-fw.xe66"
-
-do_install() {
-        mkdir -p ${D}${base_libdir}/firmware
-        cp ${S}/firmware/${TARGET} ${D}${base_libdir}/firmware/${TARGET}
-}
-
-FILES_${PN} += "${base_libdir}/firmware/${TARGET}"
-
-INSANE_SKIP_${PN} = "arch"
-
-PR = "r1"

recipes-bsp/dspdce-fw/dspdce-fw_git.bb

@@ -0,0 +1,62 @@
+DESCRIPTION = "Firmware for DSP for an example application called copycodectest"
+LICENSE = "TI-TSPA"
+LIC_FILES_CHKSUM = "file://src/ti/framework/dce/dce.c;startline=1;endline=31;md5=2c6e9aba6ed75f22b1a2b7544b1c809d"
+
+COMPATIBLE_MACHINE = "dra7xx"
+
+SRC_URI = "git://git.ti.com/glsdk/dspdce.git;protocol=git"
+
+SRCREV = "88705fd4584edd1289e4bb50658def936de90433"
+
+PV = "1.00.00.06"
+
+S = "${WORKDIR}/git"
+
+require recipes-ti/includes/ti-paths.inc
+require recipes-ti/includes/ti-staging.inc
+
+PR = "r2"
+inherit update-alternatives
+
+DEPENDS = "ti-xdctools ti-sysbios ti-codec-engine ti-framework-components ti-xdais ti-ipc-rtos ti-osal ti-cgt6x-native"
+
+export HWVERSION = "ES10"
+export BIOSTOOLSROOT = "${STAGING_DIR_TARGET}/usr/share/ti"
+
+export XDCVERSION = "ti-xdctools-tree"
+export BIOSVERSION = "ti-sysbios-tree"
+export IPCVERSION = "ti-ipc-tree"
+export CEVERSION = "ti-codec-engine-tree"
+export FCVERSION = "ti-framework-components-tree"
+export XDAISVERSION = "ti-xdais-tree"
+export OSALVERSION = "ti-osal-tree"
+
+export IPCSRC = "${STAGING_DIR_TARGET}/usr/share/ti/ti-ipc-tree"
+export C66XCGTOOLSPATH = "${STAGING_DIR_NATIVE}/usr/share/ti/cgt-c6x"
+
+do_configure() {
+    cd ${S}
+    make unconfig
+    make vayu_config
+}
+
+do_compile() {
+    cd ${S}
+    make dspbin
+}
+
+TARGET = "dra7-dsp1-fw.xe66"
+
+do_install() {
+        mkdir -p ${D}${base_libdir}/firmware
+        cp ${S}/dra7xx-c66x-dsp.xe66 ${D}${base_libdir}/firmware/${TARGET}.${BPN}
+}
+
+ALTERNATIVE_${PN} = "dra7-dsp1-fw.xe66"
+ALTERNATIVE_LINK_NAME[dra7-dsp1-fw.xe66] = "${base_libdir}/firmware/${TARGET}"
+ALTERNATIVE_TARGET[dra7-dsp1-fw.xe66] = "${base_libdir}/firmware/${TARGET}.${BPN}"
+ALTERNATIVE_PRIORITY = "10"
+
+INSANE_SKIP_${PN} = "arch"
+
+FILES_${PN} += "${base_libdir}/firmware/*"

recipes-bsp/dsptop/debugss-module-drv_git.bb

@@ -3,7 +3,7 @@ LICENSE = "GPLv2"
 LIC_FILES_CHKSUM = "file://COPYING.txt;md5=9d4316fe434ba450dca4da25348ca5a3"
 
 # This package builds a kernel module, use kernel PR as base and append a local
-MACHINE_KERNEL_PR_append = "a"
+MACHINE_KERNEL_PR_append = "b"
 PR = "${MACHINE_KERNEL_PR}"
 PV_append = "+git${SRCPV}"
 
@@ -15,7 +15,7 @@ PLATFORM = ""
 PLATFORM_dra7xx = "DRA7xx_PLATFORM"
 PLATFORM_keystone = "KEYSTONE_PLATFORM"
 
-EXTRA_OEMAKE = "'PLATFORM=${PLATFORM}'"
+EXTRA_OEMAKE = "'PLATFORM=${PLATFORM}' KVERSION=${KERNEL_VERSION} KERNEL_SRC=${STAGING_KERNEL_DIR}"
 
 COMPATIBLE_MACHINE = "dra7xx|keystone"
 PACKAGE_ARCH = "${MACHINE_ARCH}"

recipes-bsp/edma3-lld/edma3-lld-rtos_git.bb

@@ -0,0 +1,76 @@
+require edma3-lld.inc
+require recipes-ti/includes/ti-paths.inc
+require recipes-ti/includes/ti-staging.inc
+
+PR = "${INC_PR}.0"
+
+DEPENDS = "ti-cgt6x-native ti-sysbios ti-xdctools"
+
+COMPATIBLE_MACHINE = "dra7xx|keystone"
+PACKAGE_ARCH = "${MACHINE_ARCH}"
+
+PLATFORMLIST = ""
+PLATFORMLIST_keystone = " \
+        tci6636k2h-evm \
+        tci6638k2k-evm \
+        tci6630k2l-evm \
+        c66ak2e-evm \
+"
+
+PLATFORMLIST_dra7xx = " \
+        tda2xx-evm \
+        dra72x-evm \
+        am571x-evm \
+        am572x-evm \
+"
+
+S = "${WORKDIR}/git"
+
+PARALLEL_MAKE = ""
+
+export C6X_GEN_INSTALL_PATH = "${STAGING_DIR_NATIVE}/usr"
+export XDCCGROOT = "${STAGING_DIR_NATIVE}/usr/share/ti/cgt-c6x"
+export CGTOOLS = "${XDCCGROOT}"
+export CGTOOLS_ELF = "${XDCCGROOT}"
+export CODEGEN_PATH_DSP = "${XDCCGROOT}"
+export CODEGEN_PATH_DSPELF = "${XDCCGROOT}"
+export TMS470_CGTOOLS = "${XDCCGROOT}"
+export UTILS_INSTALL_DIR = "${XDC_INSTALL_DIR}"
+export XDCPATH = "${XDCCGROOT}/include;${XDC_INSTALL_DIR}/packages;${SYSBIOS_INSTALL_DIR}/packages"
+export PATH := "${XDC_INSTALL_DIR}:${PATH}"
+export ROOTDIR="${S}"
+export INTERNAL_SW_ROOT="${S}"
+export CROSSCC="${TARGET_PREFIX}gcc"
+export CROSSAR="${TARGET_PREFIX}ar"
+export CROSSLNK="${TARGET_PREFIX}gcc"
+
+
+EXTRA_OEMAKE += " -C ${S}/packages TARGET=66 FORMAT=ELF"
+
+do_configure () {
+    sed -i -e "s|^UTILS_INSTALL_DIR =.*$|UTILS_INSTALL_DIR = ${XDC_INSTALL_DIR}|g" ${S}/makerules/env.mk
+    sed -i -e "s|^bios_PATH =.*$|bios_PATH = ${SYSBIOS_INSTALL_DIR}|g" ${S}/makerules/env.mk
+    sed -i -e "s|^xdc_PATH =.*$|xdc_PATH = ${XDC_INSTALL_DIR}|g" ${S}/makerules/env.mk
+    sed -i -e "s|^CODEGEN_PATH_DSP =.*$|CODEGEN_PATH_DSP = ${XDCCGROOT}|g" ${S}/makerules/env.mk
+    sed -i -e "s|^CODEGEN_PATH_DSPELF =.*$|CODEGEN_PATH_DSPELF = ${XDCCGROOT}|g" ${S}/makerules/env.mk
+
+    cd ${S}/packages
+    ${XDC_INSTALL_DIR}/xdc .interfaces -PR .
+}
+
+do_compile () {
+    for p in ${PLATFORMLIST}
+    do
+        oe_runmake PLATFORM=${p}
+    done
+}
+
+do_install () {
+    install -d ${D}${EDMA3_LLD_INSTALL_DIR_RECIPE}
+    cp -pPrf ${S}/* ${D}${EDMA3_LLD_INSTALL_DIR_RECIPE}
+}
+
+INSANE_SKIP_${PN}-dev = "arch"
+
+ALLOW_EMPTY_${PN} = "1"
+FILES_${PN}-dev += "${EDMA3_LLD_INSTALL_DIR_RECIPE}"

recipes-bsp/edma3-lld/edma3-lld.inc

@@ -0,0 +1,17 @@
+DESCRIPTION = "TI EDMA3 low level driver and test code"
+LICENSE = "BSD-3-Clause"
+LIC_FILES_CHKSUM = "file://COPYING.txt;md5=5bdceac872dffdec915b819654ee23ea"
+
+EDMA3_LLD_GIT_URI = "git://git.ti.com/keystone-rtos/edma3_lld.git"
+EDMA3_LLD_GIT_PROTOCOL = "git"
+EDMA3_LLD_GIT_BRANCH = "master"
+
+# The following commit corresponds to tag DEV_EDMA3_LLD_02_12_01_21_RC1
+EDMA3_LLD_SRCREV = "562cba36ccd53e89e6979e99a58374513b543f93"
+
+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.01.21"
+INC_PR = "r2"

recipes-bsp/edma3-lld/edma3-lld_git.bb

@@ -1,14 +1,6 @@
-DESCRIPTION = "TI EDMA3 low level driver and test code"
-LICENSE = "BSD-3-Clause"
-LIC_FILES_CHKSUM = "file://COPYING.txt;md5=5bdceac872dffdec915b819654ee23ea"
+require edma3-lld.inc
 
-BRANCH = "master"
-SRC_URI = "git://git.ti.com/keystone-rtos/edma3_lld.git"
-# The following commit corresponds to tag DEV_EDMA3_LLD_02_11_13_17
-SRCREV = "8c27e548fa53ca8472404ef347b8f6b6e2588d46"
-
-PV = "2.11.13"
-PR = "r0"
+PR = "${INC_PR}.0"
 
 COMPATIBLE_MACHINE = "keystone"
 
@@ -77,4 +69,3 @@ do_install () {
 	install -c -m 755 ${S}/examples/edma3_user_space_driver/evmC66AK2E/bin/c66ak2e-evm/edma3_drv_c66ak2e_a15_sample_a15host_release.xa15fg \
 		${D}/${bindir}/edma3_drv_c66ak2e_a15_sample_a15host_release.xa15fg
 }
-

recipes-bsp/hplib/hplib-test_git.bb

@@ -6,6 +6,8 @@ DEPENDS = "common-csl-ip qmss-lld sa-lld pktlib hplib"
 
 include hplib.inc
 
+PR = "${INC_PR}.0"
+
 CHOICELIST = "yes no"
 
 S = "${WORKDIR}/git/ti/runtime/hplib"

recipes-bsp/hplib/hplib.inc

@@ -1,10 +1,20 @@
 COMPATIBLE_MACHINE = "keystone"
+PACKAGE_ARCH = "${MACHINE_ARCH}"
 
-DEVICELIST = "k2h k2k k2l k2e"
+DEVICELIST_k2hk-evm = "k2h k2k"
+DEVICELIST_k2l-evm  = "k2l"
+DEVICELIST_k2e-evm  = "k2e"
 
-BRANCH = "master"
-SRC_URI = "git://git.ti.com/keystone-rtos/hplib.git;protocol=git;branch=${BRANCH}"
+HPLIB_GIT_URI = "git://git.ti.com/keystone-rtos/hplib.git"
+HPLIB_GIT_PROTOCOL = "git"
+HPLIB_GIT_BRANCH = "master"
 
-# Below Commit ID corresponds to "DEV.HPLIB.01.01.00.05"
-SRCREV = "97c2ce177c78c0f7a861c8dc9ac10657d85eae36"
-PV = "01.01.00.05+git${SRCPV}"
+# Below Commit ID corresponds to "DEV.HPLIB.01.01.00.06"
+HPLIB_SRCREV = "1cbe6a41926c131d9cab63b40d43807c6e56e2fd"
+
+BRANCH = "${HPLIB_GIT_BRANCH}"
+SRC_URI = "${HPLIB_GIT_URI};protocol=${HPLIB_GIT_PROTOCOL};branch=${BRANCH}"
+SRCREV = "${HPLIB_SRCREV}"
+
+PV = "01.01.00.06+git${SRCPV}"
+INC_PR = "r1"

recipes-bsp/hplib/hplib_git.bb

@@ -3,9 +3,12 @@ LICENSE = "BSD-3-Clause"
 LIC_FILES_CHKSUM = "file://${WORKDIR}/git/ti/runtime/hplib/src/COPYING.txt;md5=b7982a377c680ad71ca2fbb735982462"
 
 DEPENDS = "common-csl-ip rm-lld qmss-lld sa-lld pktlib"
+RDEPENDS_${PN} = "hplib-mod"
 
 include hplib.inc
 
+PR = "${INC_PR}.0"
+
 CHOICELIST = "yes no"
 
 S = "${WORKDIR}/git/ti/runtime/hplib"

recipes-bsp/hyplnk-lld/files/init_hyplnk.sh

@@ -1,47 +0,0 @@
-#*
-#* Copyright (C) 2015 Texas Instruments Incorporated - http://www.ti.com/
-#*
-#*
-#*  Redistribution and use in source and binary forms, with or without
-#*  modification, are permitted provided that the following conditions
-#*  are met:
-#*
-#*    Redistributions of source code must retain the above copyright
-#*    notice, this list of conditions and the following disclaimer.
-#*
-#*    Redistributions in binary form must reproduce the above copyright
-#*    notice, this list of conditions and the following disclaimer in the
-#*    documentation and/or other materials provided with the
-#*    distribution.
-#*
-#*    Neither the name of Texas Instruments Incorporated nor the names of
-#*    its contributors may be used to endorse or promote products derived
-#*    from this software without specific prior written permission.
-#*
-
-#! /bin/sh
-compatible=$(cat /proc/device-tree/compatible)
-
-cd /usr/lib
-case "$compatible" in
-	*k2hk*)
-		device=k2hk
-		ln -sf libhyplnk_k2h.so.1.0.0 libhyplnk_device.so.1
-	;;
-	*k2l*)
-		device=k2l
-		ln -sf libhyplnk_k2l.so.1.0.0 libhyplnk_device.so.1
-	;;
-	*k2e*)
-		device=k2e
-		ln -sf libhyplnk_k2e.so.1.0.0 libhyplnk_device.so.1
-	;;
-	*)
-		device=unknown
-	;;
-esac
-
-if [ $device != unknown ]; then
-	ln -sf libhyplnk_device.so.1 libhyplnk_device.so
-	echo hyplnk library link established for device : $device
-fi

recipes-bsp/hyplnk-lld/hyplnk-lld-test_git.bb

@@ -1,23 +1,17 @@
 include hyplnk-lld.inc
 
-DEPENDS = "common-csl-ip hyplnk-lld"
+PR = "${INC_PR}.0"
 
-CHOICELIST = " yes \
-               no  \
-"
+DEPENDS = "common-csl-ip hyplnk-lld"
 
 do_compile () {
 	make -f makefile_armv7 clean PDK_INSTALL_PATH="${STAGING_INCDIR}" \
 		HYPLNK_SRC_DIR="${S}"
 	for device in ${DEVICELIST}
 	do
-		for choice in ${CHOICELIST}
-		do
-			make -f makefile_armv7 tests examples \
-				PDK_INSTALL_PATH="${STAGING_INCDIR}" \
-				DEVICE="$device" HYPLNK_SRC_DIR="${S}" \
-				USEDYNAMIC_LIB="$choice"
-		done
+		make -f makefile_armv7 tests examples \
+			PDK_INSTALL_PATH="${STAGING_INCDIR}" \
+			DEVICE="$device" HYPLNK_SRC_DIR="${S}"
 	done
 }
 

recipes-bsp/hyplnk-lld/hyplnk-lld.inc

@@ -1,24 +1,29 @@
 DESCRIPTION = "TI Hyperlink Low Level Driver"
 LICENSE = "BSD-3-Clause"
 
-COMPATIBLE_MACHINE = "keystone"
+COMPATIBLE_MACHINE = "k2hk-evm|k2e-evm"
+PACKAGE_ARCH = "${MACHINE_ARCH}"
 
 LLDNAME="hyplnk"
 
-LIC_FILES_CHKSUM = "file://${WORKDIR}/git/ti/drv/${LLDNAME}/COPYING.txt;md5=623325cc19e613a4e770fbb749922592"
+LIC_FILES_CHKSUM = "file://${WORKDIR}/${HYPLNK_GIT_DESTSUFFIX}/COPYING.txt;md5=623325cc19e613a4e770fbb749922592"
 
-BRANCH="master"
-SRC_URI = "git://git.ti.com/keystone-rtos/hyplnk-lld.git;destsuffix=git/ti/drv/${LLDNAME};protocol=git;branch=${BRANCH}"
-# Following commit corresponds to tag DEV.HYPLNK_LLD.02.01.00.02
-SRCREV = "8451586025a0cf561ed9bc6ab70a2cad88a7e95e"
+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}"
 
-PV = "2.1.0.2"
-PR = "r1"
+# Following commit corresponds to tag DEV.HYPLNK_LLD.02.01.00.05
+HYPLNK_SRCREV = "ea2a634578626deaa69608a189d5d7e84e5b7127"
 
-DEVICELIST = " k2h \
-               k2k \
-               k2e \
-"
+BRANCH="${HYPLNK_GIT_BRANCH}"
+SRC_URI = "${HYPLNK_GIT_URI};destsuffix=${HYPLNK_GIT_DESTSUFFIX};protocol=${HYPLNK_GIT_PROTOCOL};branch=${BRANCH}"
+SRCREV = "${HYPLNK_SRCREV}"
 
-BASEDIR = "${WORKDIR}/git"
-S = "${BASEDIR}/ti/drv/${LLDNAME}"
+PV = "2.1.0.5"
+INC_PR = "r2"
+
+DEVICELIST_k2hk-evm = "k2h k2k"
+DEVICELIST_k2e-evm  = "k2e"
+
+S = "${WORKDIR}/${HYPLNK_GIT_DESTSUFFIX}"

recipes-bsp/hyplnk-lld/hyplnk-lld_git.bb

@@ -1,14 +1,9 @@
 include hyplnk-lld.inc
 
+PR = "${INC_PR}.1"
+
 DEPENDS = "common-csl-ip"
 
-SRC_URI += "file://init_hyplnk.sh"
-
-inherit update-rc.d
-
-INITSCRIPT_NAME = "init_hyplnk.sh"
-INITSCRIPT_PARAMS = "defaults 10"
-
 do_compile () {
 	make -f makefile_armv7 clean PDK_INSTALL_PATH="${STAGING_INCDIR}" \
 		HYPLNK_SRC_DIR="${S}"
@@ -23,12 +18,15 @@ 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}"
-#   Set the generic device library symbolic link to default k2h
-	cd ${D}${libdir}
-	ln -sf libhyplnk_k2h.so.1.0.0 libhyplnk_device.so.1
-	ln -sf libhyplnk_device.so.1 libhyplnk_device.so
-#   Copy init scripts
-	install -d ${D}${sysconfdir}/init.d/
-	install -c -m 755 ${WORKDIR}/init_hyplnk.sh ${D}${sysconfdir}/init.d/${INITSCRIPT_NAME}
 
+	# Set the generic device library symbolic link to default k2h
+	cd ${D}${libdir}
+
+	# Link only the first device in the list
+	for device in ${DEVICELIST}
+	do
+		ln -sf libhyplnk_${device}.so.1.0.0 libhyplnk_device.so.1
+		break
+	done
+	ln -sf libhyplnk_device.so.1 libhyplnk_device.so
 }

recipes-bsp/ipumm-fw/ipumm-fw_3.00.08.01.bb

@@ -0,0 +1,33 @@
+python __anonymous() {
+    features = bb.data.getVar("MACHINE_FEATURES", d, 1)
+    if not features:
+        return
+    if "mmip" not in features:
+        raise bb.parse.SkipPackage('ipumm-fw does not apply to systems without the "mmip" flag in MACHINE_FEATURES')
+}
+
+DESCRIPTION = "Firmware for IPU for supporting Accelerated MM decode and encode"
+LICENSE = "TI-TSPA"
+
+LIC_FILES_CHKSUM = "file://MMIP-${PV}-Manifest.doc;md5=57d49afcca8f1be47b1c4e79aa06b3ba"
+
+COMPATIBLE_MACHINE = "dra7xx"
+PACKAGE_ARCH = "${MACHINE_ARCH}"
+
+RDEPENDS_${PN} = "libdce"
+
+SRC_URI = "http://downloads.ti.com/dsps/dsps_public_sw/glsdk/ipumm/3_00_08_01/exports/ipumm-dra7xx-evm-${PV}.tar.gz;protocol=http"
+
+SRC_URI[md5sum] = "a1873333e7676ec1b7fcb18fb8b90696"
+SRC_URI[sha256sum] = "d583d827191a3772f496145cbf81747e10e7ed553d4653379576ac891019d7fb"
+
+S = "${WORKDIR}/ipumm-dra7xx-evm-${PV}"
+
+TARGET = "dra7-ipu2-fw.xem4"
+
+do_install() {
+        mkdir -p ${D}${base_libdir}/firmware
+        cp ${S}/firmware/${TARGET} ${D}${base_libdir}/firmware/${TARGET}
+}
+
+FILES_${PN} += "${base_libdir}/firmware/${TARGET}"

recipes-bsp/ipumm-fw/ipumm-fw_3.00.08.02.bb

@@ -0,0 +1,35 @@
+python __anonymous() {
+    features = bb.data.getVar("MACHINE_FEATURES", d, 1)
+    if not features:
+        return
+    if "mmip" not in features:
+        raise bb.parse.SkipPackage('ipumm-fw does not apply to systems without the "mmip" flag in MACHINE_FEATURES')
+}
+
+DESCRIPTION = "Firmware for IPU for supporting Accelerated MM decode and encode"
+LICENSE = "TI-TSPA"
+
+LIC_FILES_CHKSUM = "file://MMIP-${PV}-Manifest.doc;md5=81f4b23808c36c9223523f43e35d291c"
+
+COMPATIBLE_MACHINE = "dra7xx"
+PACKAGE_ARCH = "${MACHINE_ARCH}"
+
+RDEPENDS_${PN} = " libdce"
+
+SRC_URI = "http://downloads.ti.com/infotainment/esd/jacinto6/glsdk/ipumm/3_00_08_02/exports/ipumm-dra7xx-evm-${PV}.tar.gz;protocol=http"
+
+SRC_URI[md5sum] = "53f47909c2e2575b188bba9ddc325437"
+SRC_URI[sha256sum] = "4ac7598bbbb5dd0cd6504906afe0e09d76ba612a3c326e45425e67535e5f2d09"
+
+S = "${WORKDIR}/ipumm-dra7xx-evm-${PV}"
+
+TARGET = "dra7-ipu2-fw.xem4"
+
+do_install() {
+        mkdir -p ${D}${base_libdir}/firmware
+        cp ${S}/firmware/${TARGET} ${D}${base_libdir}/firmware/${TARGET}
+}
+
+FILES_${PN} += "${base_libdir}/firmware/${TARGET}"
+
+PR = "r2"

recipes-bsp/ipumm-fw/ipumm-fw_git.bb

@@ -0,0 +1,62 @@
+python __anonymous() {
+    features = bb.data.getVar("MACHINE_FEATURES", d, 1)
+    if not features:
+        return
+    if "mmip" not in features:
+        raise bb.parse.SkipPackage('ipumm-fw does not apply to systems without the "mmip" flag in MACHINE_FEATURES')
+}
+
+DESCRIPTION = "Firmware for IPU for supporting Accelerated MM decode and encode"
+LICENSE = "TI-TSPA"
+
+LIC_FILES_CHKSUM = "file://Texas_Instruments_ipumm_Manifest.pdf;md5=036f6300761559fbc5ce7d06e1ccea5a"
+
+COMPATIBLE_MACHINE = "dra7xx"
+
+RDEPENDS_${PN} = " libdce"
+
+SRC_URI = "git://git.ti.com/ivimm/ipumm.git;protocol=git"
+
+SRCREV = "486aa14f700783dbee63a0d81fb2e57d27a286e6"
+
+S = "${WORKDIR}/git"
+
+PV = "3.00.09.01"
+
+require recipes-ti/includes/ti-paths.inc
+require recipes-ti/includes/ti-staging.inc
+
+DEPENDS = "ti-xdctools ti-sysbios ti-codec-engine ti-framework-components ti-xdais ti-ccsv6-native ti-ipc-rtos"
+
+export HWVERSION="ES10"
+export BIOSTOOLSROOT="${STAGING_DIR_TARGET}/usr/share/ti"
+
+export XDCVERSION="ti-xdctools-tree"
+export BIOSVERSION="ti-sysbios-tree"
+export IPCVERSION="ti-ipc-tree"
+export CEVERSION="ti-codec-engine-tree"
+export FCVERSION="ti-framework-components-tree"
+export XDAISVERSION="ti-xdais-tree"
+
+export TMS470CGTOOLPATH="${M4_TOOLCHAIN_INSTALL_DIR}"
+export IPCSRC="${STAGING_DIR_TARGET}/usr/share/ti/ti-ipc-tree"
+
+do_configure() {
+    oe_runmake unconfig
+    oe_runmake vayu_smp_config
+}
+
+do_compile() {
+    oe_runmake
+}
+
+TARGET = "dra7-ipu2-fw.xem4"
+
+do_install() {
+        mkdir -p ${D}${base_libdir}/firmware
+        cp ${S}/${TARGET} ${D}${base_libdir}/firmware/${TARGET}
+}
+
+FILES_${PN} += "${base_libdir}/firmware/${TARGET}"
+
+PR = "r2"

recipes-bsp/iqn2-lld/iqn2-lld-test_git.bb

@@ -4,6 +4,8 @@ DEPENDS = "common-csl-ip iqn2-lld dfe-lld"
 
 include iqn2-lld.inc
 
+PR = "${INC_PR}.0"
+
 EXTRA_OEMAKE = "-f makefile_armv7 PDK_INSTALL_PATH=${STAGING_INCDIR} IQN2_SRC_DIR=${WORKDIR}/git"
 
 do_compile () {

recipes-bsp/iqn2-lld/iqn2-lld.inc

@@ -1,13 +1,21 @@
 LIC_FILES_CHKSUM = "file://COPYING.txt;md5=5bdceac872dffdec915b819654ee23ea"
 LICENSE = "BSD-3-Clause"
 
-BRANCH = "master"
-SRC_URI = "git://git.ti.com/keystone-rtos/iqn2-lld.git;destsuffix=git/ti/drv/iqn2;protocol=git;branch=${BRANCH}"
-# Following commit corresponds to DEV.IQN_LLD.01.00.00.07A
-SRCREV = "94017e30c87853e48f6e947186c5075289b190c6"
+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"
 
-PV = "1.0.0.7"
+# Following commit corresponds to DEV.IQN_LLD.01.00.00.08F
+IQN2_LLD_SRCREV = "29d5358b944f1447c024263f86e8c71784440b99"
+
+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.8"
+INC_PR = "r1"
 
 COMPATIBLE_MACHINE = "k2l-evm"
 
-S = "${WORKDIR}/git/ti/drv/iqn2"
+S = "${WORKDIR}/${IQN2_LLD_GIT_DESTSUFFIX}"

recipes-bsp/iqn2-lld/iqn2-lld_git.bb

@@ -4,6 +4,8 @@ DEPENDS = "common-csl-ip"
 
 include iqn2-lld.inc
 
+PR = "${INC_PR}.0"
+
 EXTRA_OEMAKE = "-f makefile_armv7 PDK_INSTALL_PATH=${STAGING_INCDIR}"
 
 do_compile () {

recipes-bsp/mmap-lld/mmap-lld-test_git.bb

@@ -1,13 +1,15 @@
 DESCRIPTION = "TI KEYSTONE MMAP driver test binaries "
 include mmap-lld.inc
 
+PR = "${INC_PR}.1"
+
+PACKAGE_ARCH = "${MACHINE_ARCH}"
+
 DEPENDS="common-csl-ip mmap-lld"
 RDEPENDS_${PN}="uio-module-drv"
 
-DEVICELIST = "k2h \
-              k2k \
-              k2e \
-"
+DEVICELIST_k2hk-evm = "k2h k2k"
+DEVICELIST_k2e-evm  = "k2e"
 
 CHOICELIST = " yes \
                no \

recipes-bsp/mmap-lld/mmap-lld.inc

@@ -4,12 +4,19 @@ COMPATIBLE_MACHINE = "keystone"
 
 LIC_FILES_CHKSUM = "file://COPYING.txt;md5=b3315b8190036fe1c6a8263d02e15606"
 
-BRANCH="master"
-SRC_URI = "git://git.ti.com/keystone-rtos/mmap-lld.git;destsuffix=git/ti/runtime/mmap;protocol=git;branch=${BRANCH}"
+MMAP_LLD_GIT_URI = "git://git.ti.com/keystone-rtos/mmap-lld.git"
+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.04
-SRCREV = "306895eb2d5decd14a760e70d273946958ff716f"
+MMAP_LLD_SRCREV = "306895eb2d5decd14a760e70d273946958ff716f"
+
+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.4"
-PR = "r1"
+INC_PR = "r4"
 
 S = "${WORKDIR}/git/ti/runtime/mmap"

recipes-bsp/mmap-lld/mmap-lld_git.bb

@@ -1,6 +1,8 @@
 DESCRIPTION = "TI KEYSTONE mmap driver using Keystone MPAX Programming"
 include mmap-lld.inc
 
+PR = "${INC_PR}.0"
+
 DEPENDS="common-csl-ip"
 
 do_compile () {

recipes-bsp/nwal-lld/nwal-lld-test_git.bb

@@ -4,6 +4,8 @@ DEPENDS = "common-csl-ip rm-lld qmss-lld hplib pa-lld sa-lld pktlib nwal-lld"
 
 include nwal-lld.inc
 
+PR = "${INC_PR}.0"
+
 EXTRA_OEMAKE += "-f makefile_armv7 PDK_INSTALL_PATH=${STAGING_INCDIR}"
 
 do_compile () {

recipes-bsp/nwal-lld/nwal-lld.inc

@@ -2,17 +2,27 @@ LICENSE = "BSD-3-Clause"
 LIC_FILES_CHKSUM = "file://${WORKDIR}/git/COPYING.txt;md5=b7982a377c680ad71ca2fbb735982462"
 
 COMPATIBLE_MACHINE = "keystone"
+PACKAGE_ARCH = "${MACHINE_ARCH}"
 
-BRANCH = "master"
-SRC_URI = "git://git.ti.com/keystone-rtos/nwal-lld.git;protocol=git;branch=${BRANCH}"
+NWAL_LLD_GIT_URI = "git://git.ti.com/keystone-rtos/nwal-lld.git"
+NWAL_LLD_GIT_PROTOCOL = "git"
+NWAL_LLD_GIT_BRANCH = "master"
 
-# Below commit ID corresponds to "DEV.NWAL.02.01.00.06"
-SRCREV = "a3494c9aaa2808f438d26b2c3b8b091448ffc445"
-PV = "02.01.00.06"
+# Below commit ID corresponds to "DEV.NWAL.02.01.00.08"
+NWAL_LLD_SRCREV = "e6df99e59a848c7afffe90fc9710b7dcb8067c31"
+
+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.08"
+INC_PR = "r2"
 
 BASEDIR = "${WORKDIR}/git"
 S = "${BASEDIR}/ti/drv/nwal"
 
-DEVICELIST = "k2h k2k k2l k2e"
+DEVICELIST_k2hk-evm = "k2h k2k"
+DEVICELIST_k2l-evm  = "k2l"
+DEVICELIST_k2e-evm  = "k2e"
 
 CHOICELIST = "yes no"

recipes-bsp/nwal-lld/nwal-lld_git.bb

@@ -4,6 +4,8 @@ DEPENDS = "common-csl-ip rm-lld qmss-lld hplib pa-lld sa-lld pktlib"
 
 include nwal-lld.inc
 
+PR = "${INC_PR}.0"
+
 EXTRA_OEMAKE += "-f makefile_armv7 PDK_INSTALL_PATH=${STAGING_INCDIR}"
 
 do_compile () {

recipes-bsp/pa-lld/files/0001-makefile_armv7-fix-missing-separator-error.patch

@@ -0,0 +1,30 @@
+From 60a938e6902c7cb8bec34abbc5a3723c8094d728 Mon Sep 17 00:00:00 2001
+From: Denys Dmytriyenko <denys@ti.com>
+Date: Tue, 1 Dec 2015 00:00:00 -0500
+Subject: [PATCH] makefile_armv7: fix missing separator error
+
+Doesn't seem to work in all versions of Make, fails like this:
+makefile_armv7:27: *** missing separator.  Stop.
+
+Signed-off-by: Denys Dmytriyenko <denys@ti.com>
+---
+ makefile_armv7 | 3 ---
+ 1 file changed, 3 deletions(-)
+
+diff --git a/makefile_armv7 b/makefile_armv7
+index a2bc4f6..1ae6e0a 100644
+--- a/makefile_armv7
++++ b/makefile_armv7
+@@ -24,9 +24,6 @@ else
+     export LLD_NAME=pa
+ endif        
+ 
+-echo DEVICE=$(DEVICE)
+-echo LLD_NAME=$(LLD_NAME)
+-
+ # Output for prebuilt generated libraries
+ export ARMV7LIBDIR ?= ./lib
+ export ARMV7OBJDIR ?= ./obj/$(DEVICE)
+-- 
+2.2.0
+

recipes-bsp/pa-lld/pa-lld-test_git.bb

@@ -4,7 +4,7 @@ DEPENDS = "common-csl-ip pa-lld cppi-lld qmss-lld sa-lld"
 
 include pa-lld.inc
 
-DEVICELIST = "k2h k2k k2l k2e"
+PR = "${INC_PR}.1"
 
 CHOICELIST = "yes no"
 

recipes-bsp/pa-lld/pa-lld.inc

@@ -2,14 +2,32 @@ LICENSE = "BSD-3-Clause"
 LIC_FILES_CHKSUM = "file://${WORKDIR}/git/ti/drv/pa/COPYING.txt;md5=e8f6789acdcda76d02ed9203fc2e603d"
 
 COMPATIBLE_MACHINE = "keystone"
+PACKAGE_ARCH = "${MACHINE_ARCH}"
 
-BRANCH = "master"
-SRC_URI = "git://git.ti.com/keystone-rtos/pa-lld.git;destsuffix=git/ti/drv/pa;protocol=git;branch=${BRANCH}"
+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"
 
-# Below Commit ID corresponds to "DEV.PA_LLD.03.00.01.04"
-SRCREV = "92de8879be3712af684bd031ca0ed291c05d6050"
-PV = "03.00.01.04"
-PR = "r1"
+# Below Commit ID corresponds to "DEV.PA_LLD.03.00.01.05A"
+PA_LLD_SRCREV = "ae3aa3e80ecf64fe5a16515d134a6bc217220e2e"
 
-BASEDIR = "${WORKDIR}/git"
-S = "${BASEDIR}/ti/drv/pa"
+BRANCH = "${PA_LLD_GIT_BRANCH}"
+SRC_URI = "${PA_LLD_GIT_URI};destsuffix=${PA_LLD_GIT_DESTSUFFIX};protocol=${PA_LLD_GIT_PROTOCOL};branch=${BRANCH} \
+            file://0001-makefile_armv7-fix-missing-separator-error.patch"
+SRCREV = "${PA_LLD_SRCREV}"
+
+PV = "03.00.01.05"
+INC_PR = "r3"
+
+S = "${WORKDIR}/${PA_LLD_GIT_DESTSUFFIX}"
+
+DEVICELIST = "k2h k2k k2l k2e"
+DEVICELIST_k2hk-evm = "k2h k2k"
+DEVICELIST_k2l-evm = "k2l"
+DEVICELIST_k2e-evm = "k2e"
+
+LIBPA = "libpa"
+LIBPA_k2hk-evm = "libpa"
+LIBPA_k2e-evm = "libpa2"
+LIBPA_k2l-evm = "libpa2"

recipes-bsp/pa-lld/pa-lld_git.bb

@@ -4,12 +4,20 @@ DEPENDS = "common-csl-ip rm-lld"
 
 include pa-lld.inc
 
+PR = "${INC_PR}.1"
+
 do_compile () {
 #   Now build the lld in the updated directory
-	make -f makefile_armv7 DEVICE=k2h clean lib PDK_INSTALL_PATH=${STAGING_INCDIR}
-	make -f makefile_armv7 DEVICE=k2l lib PDK_INSTALL_PATH=${STAGING_INCDIR}
+    for device in ${DEVICELIST}
+    do
+        make -f makefile_armv7 lib PDK_INSTALL_PATH=${STAGING_INCDIR} DEVICE="$device"
+    done
 }
 
 do_install () {
 	make -f makefile_armv7 install PDK_INSTALL_PATH=${STAGING_INCDIR} INSTALL_INC_BASE_DIR=${D}${includedir} INSTALL_LIB_BASE_DIR=${D}${libdir}
+
+#   Set the generic device library symbolic link
+    ln -sf ${LIBPA}.so.1.0.0 ${D}${libdir}/libpa_device.so.1
+    ln -sf libpa_device.so.1 ${D}${libdir}/libpa_device.so
 }

recipes-bsp/pktlib/pktlib_git.bb

@@ -5,12 +5,19 @@ LIC_FILES_CHKSUM = "file://${WORKDIR}/git/COPYING.txt;md5=b7982a377c680ad71ca2fb
 DEPENDS = "common-csl-ip rm-lld qmss-lld cppi-lld"
 COMPATIBLE_MACHINE = "keystone"
 
-BRANCH = "master"
-SRC_URI = "git://git.ti.com/keystone-rtos/pktlib.git;protocol=git;branch=${BRANCH}"
+PKTLIB_GIT_URI = "git://git.ti.com/keystone-rtos/pktlib.git"
+PKTLIB_GIT_PROTOCOL = "git"
+PKTLIB_GIT_BRANCH = "master"
 
-# Corresponds to DEV.PKTLIB.2.1.0.4
-SRCREV = "a9aa56afed54b0a04f36d2fdb248cad5dcac6ff6"
-PV = "2.1.0.4"
+# Corresponds to DEV.PKTLIB.2.1.0.5
+PKTLIB_SRCREV = "d757026f3d6a837711f4b44b5ffdefed761fc186"
+
+BRANCH = "${PKTLIB_GIT_BRANCH}"
+SRC_URI = "${PKTLIB_GIT_URI};protocol=${PKTLIB_GIT_PROTOCOL};branch=${BRANCH}"
+SRCREV = "${PKTLIB_SRCREV}"
+
+PV = "2.1.0.5"
+PR = "r1"
 
 S = "${WORKDIR}/git/ti/runtime/pktlib"
 

recipes-bsp/powervr-drivers/omapdrm-pvr_1.9.2253347.bb

@@ -5,24 +5,38 @@ LIC_FILES_CHKSUM = "file://eurasia_km/README;beginline=13;endline=22;md5=2b841bf
 
 inherit module
 
-MACHINE_KERNEL_PR_append = "d"
+COMPATIBLE_MACHINE = "ti33x|ti43x|omap-a15"
+
+MACHINE_KERNEL_PR_append = "i"
 PR = "${MACHINE_KERNEL_PR}"
 
-BRANCH = "next"
+PACKAGE_ARCH = "${MACHINE_ARCH}"
+
+BRANCH_omap-a15 = "dra7/k4.1"
+BRANCH_ti33x = "am4/k4.1"
+BRANCH_ti43x = "am4/k4.1"
 
 SRC_URI = "git://git.ti.com/graphics/omap5-sgx-ddk-linux.git;protocol=git;branch=${BRANCH}"
 S = "${WORKDIR}/git"
 
-SRCREV = "872aa64b227cadbc97755a4192919dd5ca637971"
+SRCREV_omap-a15 = "e06c0a4e11401534b938b9a7b1c3f27a65db871f"
+SRCREV_ti33x = "f7ae3f68dd6a05f67b15702b823ed15d2c03105d"
+SRCREV_ti43x = "f7ae3f68dd6a05f67b15702b823ed15d2c03105d"
 
-EXTRA_OEMAKE += 'KERNELDIR="${STAGING_KERNEL_DIR}"'
+PVR_NULLDRM_ti33x = "1"
+PVR_NULLDRM_ti43x = "0"
+PVR_NULLDRM_omap-a15 = "0"
+
+EXTRA_OEMAKE += 'KERNELDIR="${STAGING_KERNEL_DIR}" PVR_NULLDRM=${PVR_NULLDRM}'
+
+DEVICE_SUB_DIR_omap-a15 = "omap5430"
+DEVICE_SUB_DIR_ti33x = "omap335x"
+DEVICE_SUB_DIR_ti43x = "omap437x"
 
 do_compile_prepend() {
-    cd ${S}/eurasia_km/eurasiacon/build/linux2/omap5430_linux
+    cd ${S}/eurasia_km/eurasiacon/build/linux2/${DEVICE_SUB_DIR}_linux
 }
 
 do_install() {
-    mkdir -p ${D}/lib/modules/${KERNEL_VERSION}/extra/
-    cp ${S}/eurasia_km/eurasiacon/binary2_omap5430_linux_release/target/kbuild/omapdrm_pvr.ko \
-    ${D}/lib/modules/${KERNEL_VERSION}/extra/
+    make -C ${STAGING_KERNEL_DIR} SUBDIRS=${B}/eurasia_km/eurasiacon/binary2_${DEVICE_SUB_DIR}_linux_release/target/kbuild INSTALL_MOD_PATH=${D} PREFIX=${STAGING_DIR_HOST} modules_install
 }

recipes-bsp/pru/pru-icss_git.bb

@@ -0,0 +1,139 @@
+DESCRIPTION = "Programmable Real-time Unit Software Package"
+HOMEPAGE = "http://processors.wiki.ti.com/index.php/PRU-ICSS"
+LICENSE = "BSD-3-Clause & GPL-2.0 & PD"
+
+LIC_FILES_CHKSUM = "file://PRU-Package-v4.0-Manifest.html;md5=5ea937e4ff2c924a735d42e61ad8cbe3"
+
+inherit update-alternatives
+
+BRANCH = "master"
+SRC_URI = "git://git.ti.com/pru-software-support-package/pru-software-support-package.git;protocol=git;branch=${BRANCH}"
+SRCREV = "c21ff82cf0a8864a66505be88be1d579a66a983a"
+
+PV = "4.0.1"
+PR = "r1"
+
+require recipes-ti/includes/ti-paths.inc
+
+COMPATIBLE_MACHINE = "ti33x|ti43x|omap-a15"
+PACKAGE_ARCH = "${MACHINE_ARCH}"
+
+PACKAGES_prepend = " \
+    ${PN}-halt \
+    ${PN}-rpmsg-echo \
+"
+
+RDEPENDS_${PN}_append = " \
+    ${PN}-halt \
+    ${PN}-rpmsg-echo \
+"
+
+DEPENDS = "ti-cgt-pru-native"
+
+S = "${WORKDIR}/git"
+
+export PRU_CGT = "${TI_CGT_PRU_INSTALL_DIR}"
+
+SUBDIRS = "examples pru_cape/pru_fw lib/src labs"
+
+PLATFORM_ti33x = "am335x"
+PLATFORM_ti43x = "am437x"
+PLATFORM_omap-a15 = "am572x"
+
+do_compile() {
+    for dir in ${SUBDIRS}
+    do
+        make -C ${S}/$dir
+    done
+}
+
+do_install() {
+    install -d ${D}/lib/firmware/pru
+    install -m 644 ${S}/examples/${PLATFORM}/PRU_Halt/gen/PRU_Halt.out \
+                   ${D}/lib/firmware/pru
+}
+
+do_install_append_ti33x() {
+    for i in 0 1
+    do
+        install -m 0644 ${S}/examples/am335x/PRU_RPMsg_Echo_Interrupt${i}/gen/PRU_RPMsg_Echo_Interrupt${i}.out \
+                        ${D}/lib/firmware/pru
+    done
+}
+
+do_install_append_ti43x() {
+    for i in 0 1
+    do
+        install -m 0644 ${S}/examples/am437x/PRU_RPMsg_Echo_Interrupt${i}/gen/PRU_RPMsg_Echo_Interrupt${i}.out \
+                        ${D}/lib/firmware/pru
+    done
+}
+
+do_install_append_omap-a15() {
+    for i in 1 2
+    do
+        for j in 0 1
+        do
+            install -m 0644 ${S}/examples/am572x/PRU_RPMsg_Echo_Interrupt${i}_${j}/gen/PRU_RPMsg_Echo_Interrupt${i}_${j}.out \
+                            ${D}/lib/firmware/pru
+        done
+    done
+}
+
+FILES_${PN}-halt = "/lib/firmware/pru/PRU_Halt.out"
+FILES_${PN}-rpmsg-echo = "/lib/firmware/pru/PRU_RPMsg_Echo_Interrupt*"
+
+# Set up names for the firmwares
+PRU_ICSS_ALTERNATIVES_ti33x    = "am335x-pru0-fw am335x-pru1-fw"
+PRU_ICSS_ALTERNATIVES_ti43x    = "am437x-pru1_0-fw am437x-pru1_1-fw"
+PRU_ICSS_ALTERNATIVES_omap-a15 = "am57xx-pru1_0-fw am57xx-pru1_1-fw am57xx-pru2_0-fw am57xx-pru2_1-fw"
+
+# Set up link names for the firmwares
+ALTERNATIVE_LINK_NAME[am335x-pru0-fw] = "/lib/firmware/am335x-pru0-fw"
+ALTERNATIVE_LINK_NAME[am335x-pru1-fw] = "/lib/firmware/am335x-pru1-fw"
+
+ALTERNATIVE_LINK_NAME[am437x-pru1_0-fw] = "/lib/firmware/am437x-pru1_0-fw"
+ALTERNATIVE_LINK_NAME[am437x-pru1_1-fw] = "/lib/firmware/am437x-pru1_1-fw"
+
+ALTERNATIVE_LINK_NAME[am57xx-pru1_0-fw] = "/lib/firmware/am57xx-pru1_0-fw"
+ALTERNATIVE_LINK_NAME[am57xx-pru1_1-fw] = "/lib/firmware/am57xx-pru1_1-fw"
+ALTERNATIVE_LINK_NAME[am57xx-pru2_0-fw] = "/lib/firmware/am57xx-pru2_0-fw"
+ALTERNATIVE_LINK_NAME[am57xx-pru2_1-fw] = "/lib/firmware/am57xx-pru2_1-fw"
+
+# Create the pru-icss-halt firmware alternatives
+ALTERNATIVE_pru-icss-halt = "${PRU_ICSS_ALTERNATIVES}"
+
+ALTERNATIVE_TARGET_pru-icss-halt[am335x-pru0-fw] = "/lib/firmware/pru/PRU_Halt.out"
+ALTERNATIVE_TARGET_pru-icss-halt[am335x-pru1-fw] = "/lib/firmware/pru/PRU_Halt.out"
+
+ALTERNATIVE_TARGET_pru-icss-halt[am437x-pru1_0-fw] = "/lib/firmware/pru/PRU_Halt.out"
+ALTERNATIVE_TARGET_pru-icss-halt[am437x-pru1_1-fw] = "/lib/firmware/pru/PRU_Halt.out"
+
+ALTERNATIVE_TARGET_pru-icss-halt[am57xx-pru1_0-fw] = "/lib/firmware/pru/PRU_Halt.out"
+ALTERNATIVE_TARGET_pru-icss-halt[am57xx-pru1_1-fw] = "/lib/firmware/pru/PRU_Halt.out"
+ALTERNATIVE_TARGET_pru-icss-halt[am57xx-pru2_0-fw] = "/lib/firmware/pru/PRU_Halt.out"
+ALTERNATIVE_TARGET_pru-icss-halt[am57xx-pru2_1-fw] = "/lib/firmware/pru/PRU_Halt.out"
+
+ALTERNATIVE_PRIORITY_pru-icss-halt = "50"
+
+# Craete the pru-icss-rpmsg-echo firmware alternatives
+ALTERNATIVE_pru-icss-rpmsg-echo = "${PRU_ICSS_ALTERNATIVES}"
+
+ALTERNATIVE_TARGET_pru-icss-rpmsg-echo[am335x-pru0-fw] = "/lib/firmware/pru/PRU_RPMsg_Echo_Interrupt0.out"
+ALTERNATIVE_TARGET_pru-icss-rpmsg-echo[am335x-pru1-fw] = "/lib/firmware/pru/PRU_RPMsg_Echo_Interrupt1.out"
+
+ALTERNATIVE_TARGET_pru-icss-rpmsg-echo[am437x-pru1_0-fw] = "/lib/firmware/pru/PRU_RPMsg_Echo_Interrupt0.out"
+ALTERNATIVE_TARGET_pru-icss-rpmsg-echo[am437x-pru1_1-fw] = "/lib/firmware/pru/PRU_RPMsg_Echo_Interrupt1.out"
+
+ALTERNATIVE_TARGET_pru-icss-rpmsg-echo[am57xx-pru1_0-fw] = "/lib/firmware/pru/PRU_RPMsg_Echo_Interrupt1_0.out"
+ALTERNATIVE_TARGET_pru-icss-rpmsg-echo[am57xx-pru1_1-fw] = "/lib/firmware/pru/PRU_RPMsg_Echo_Interrupt1_1.out"
+ALTERNATIVE_TARGET_pru-icss-rpmsg-echo[am57xx-pru2_0-fw] = "/lib/firmware/pru/PRU_RPMsg_Echo_Interrupt2_0.out"
+ALTERNATIVE_TARGET_pru-icss-rpmsg-echo[am57xx-pru2_1-fw] = "/lib/firmware/pru/PRU_RPMsg_Echo_Interrupt2_1.out"
+
+ALTERNATIVE_PRIORITY_pru-icss-rpmsg-echo = "100"
+
+ALLOW_EMPTY_${PN} = "1"
+
+# This installs PRU firmware, so skip "arch" QA check
+INSANE_SKIP_${PN}-halt = "arch"
+INSANE_SKIP_${PN}-rpmsg-echo = "arch"

recipes-bsp/qmss-lld/files/init_qmss.sh

@@ -1,47 +0,0 @@
-#*
-#* Copyright (C) 2015 Texas Instruments Incorporated - http://www.ti.com/
-#*
-#*
-#*  Redistribution and use in source and binary forms, with or without
-#*  modification, are permitted provided that the following conditions
-#*  are met:
-#*
-#*    Redistributions of source code must retain the above copyright
-#*    notice, this list of conditions and the following disclaimer.
-#*
-#*    Redistributions in binary form must reproduce the above copyright
-#*    notice, this list of conditions and the following disclaimer in the
-#*    documentation and/or other materials provided with the
-#*    distribution.
-#*
-#*    Neither the name of Texas Instruments Incorporated nor the names of
-#*    its contributors may be used to endorse or promote products derived
-#*    from this software without specific prior written permission.
-#*
-
-#! /bin/sh
-compatible=$(cat /proc/device-tree/compatible)
-
-cd /usr/lib
-case "$compatible" in
-	*k2hk*)
-		device=k2hk
-		ln -sf libqmss_k2h.so.1.0.0 libqmss_device.so.1
-	;;
-	*k2l*)
-		device=k2l
-		ln -sf libqmss_k2l.so.1.0.0 libqmss_device.so.1
-	;;
-	*k2e*)
-		device=k2e
-		ln -sf libqmss_k2e.so.1.0.0 libqmss_device.so.1
-	;;
-	*)
-		device=unknown
-	;;
-esac
-
-if [ $device != unknown ]; then
-	ln -sf libqmss_device.so.1 libqmss_device.so
-	echo qmss library link established for device : $device
-fi

recipes-bsp/qmss-lld/qmss-lld-test_git.bb

@@ -1,10 +1,11 @@
 DESCRIPTION = "TI QMSS low level driver unit test and example binaries"
-COMPATIBLE_MACHINE = "keystone"
 
 DEPENDS="common-csl-ip rm-lld cppi-lld qmss-lld"
 
 include qmss-lld.inc
 
+PR = "${INC_PR}.1"
+
 CHOICELIST = "yes no"
 
 do_compile () {

recipes-bsp/qmss-lld/qmss-lld.inc

@@ -1,15 +1,27 @@
 LICENSE = "BSD-3-Clause"
 LIC_FILES_CHKSUM = "file://${WORKDIR}/git/ti/drv/qmss/COPYING.txt;md5=e8f6789acdcda76d02ed9203fc2e603d"
 
-BRANCH ="master"
-SRC_URI = "git://git.ti.com/keystone-rtos/qmss-lld.git;destsuffix=git/ti/drv/qmss;protocol=git;branch=${BRANCH}"
+COMPATIBLE_MACHINE = "keystone"
+PACKAGE_ARCH = "${MACHINE_ARCH}"
 
-# commit ID corresponding to DEV.QMSS_LLD.02.01.00.10
-SRCREV = "ffec14248f460b7cf4def4457f9c2335df62618d"
-PV = "02.01.00.10"
-PR = "r1"
+QMSS_LLD_GIT_URI = "git://git.ti.com/keystone-rtos/qmss-lld.git"
+QMSS_LLD_GIT_PROTOCOL = "git"
+QMSS_LLD_GIT_BRANCH = "master"
+QMSS_LLD_GIT_DESTSUFFIX = "git/ti/drv/qmss"
+
+# commit ID corresponding to DEV.QMSS_LLD.02.01.00.11
+QMSS_LLD_SRCREV = "2024ab2d411c1a6dd3f5e768a3cb30c2a685f1e4"
+
+BRANCH ="${QMSS_LLD_GIT_BRANCH}"
+SRC_URI = "${QMSS_LLD_GIT_URI};destsuffix=${QMSS_LLD_GIT_DESTSUFFIX};protocol=${QMSS_LLD_GIT_PROTOCOL};branch=${BRANCH}"
+SRCREV = "${QMSS_LLD_SRCREV}"
+
+PV = "02.01.00.11"
+INC_PR = "r2"
 
 DEVICELIST = "k2h k2k k2l k2e"
+DEVICELIST_k2hk-evm = "k2h k2k"
+DEVICELIST_k2l-evm = "k2l"
+DEVICELIST_k2e-evm = "k2e"
 
-BASEDIR = "${WORKDIR}/git"
-S = "${BASEDIR}/ti/drv/qmss"
+S = "${WORKDIR}/${QMSS_LLD_GIT_DESTSUFFIX}"

recipes-bsp/qmss-lld/qmss-lld_git.bb

@@ -1,17 +1,10 @@
 DESCRIPTION = "TI QMSS low level driver library"
-COMPATIBLE_MACHINE = "keystone"
 
 DEPENDS="common-csl-ip rm-lld"
 
 include qmss-lld.inc
 
-
-SRC_URI += "file://init_qmss.sh"
-
-inherit update-rc.d
-
-INITSCRIPT_NAME = "init_qmss.sh"
-INITSCRIPT_PARAMS = "defaults 10"
+PR = "${INC_PR}.1"
 
 do_compile () {
 #   Now build the lld
@@ -26,11 +19,14 @@ do_compile () {
 do_install () {
     make -f makefile_armv7 install PDK_INSTALL_PATH=${STAGING_INCDIR} INSTALL_INC_BASE_DIR=${D}${includedir} INSTALL_LIB_BASE_DIR=${D}${libdir}
 
-#   Set the generic device library symbolic link to default k2h
+    # Set the generic device library symbolic link to default k2h
     cd ${D}${libdir}
-    ln -sf libqmss_k2h.so.1.0.0 libqmss_device.so.1
+
+    # Link only the first device in the list
+    for device in ${DEVICELIST}
+    do
+        ln -sf libqmss_${device}.so.1.0.0 libqmss_device.so.1
+        break
+    done
     ln -sf libqmss_device.so.1 libqmss_device.so
-#   Copy init scripts
-	install -d ${D}${sysconfdir}/init.d/
-	install -c -m 755 ${WORKDIR}/init_qmss.sh ${D}${sysconfdir}/init.d/${INITSCRIPT_NAME}
 }

recipes-bsp/qmss-pdsp-fw/qmss-pdsp-fw_git.bb

@@ -0,0 +1,29 @@
+DESCRIPTION = "QMSS PDSP firmware"
+
+LICENSE = "TI-TFL"
+LIC_FILES_CHKSUM = "file://LICENCE.ti-keystone;md5=3a86335d32864b0bef996bee26cc0f2c"
+
+PV = "1.0.0.9"
+PR = "r1"
+
+CLEANBROKEN = "1"
+
+COMPATIBLE_MACHINE = "keystone"
+
+PACKAGE_ARCH = "${MACHINE_ARCH}"
+
+SRCREV = "778668c4bb5fe59870e549a4a2820b9f7f90e89e"
+BRANCH ?= "ti-linux-firmware-4.1.y"
+
+SRC_URI = "git://git.ti.com/processor-firmware/ti-linux-firmware.git;protocol=git;branch=${BRANCH}"
+
+S = "${WORKDIR}/git"
+ORIGIN = "ks2_qmss_pdsp_acc48_k2_le_1_0_0_9.bin"
+TARGET = "ks2_qmss_pdsp_acc48.bin"
+
+do_install() {
+	install -d ${D}${base_libdir}/firmware
+	install -m 0644 ${S}/ti-keystone/${ORIGIN} ${D}${base_libdir}/firmware/${TARGET}
+}
+
+FILES_${PN} = "${base_libdir}/firmware"

recipes-bsp/rm-lld/rm-lld_git.bb

@@ -2,12 +2,20 @@ DESCRIPTION = "TI Resource Manager Low Level Driver"
 LICENSE = "BSD-3-Clause"
 LIC_FILES_CHKSUM = "file://${WORKDIR}/git/ti/drv/rm/COPYING.txt;md5=dc61631b65360e6beb73b6c337800afc"
 
-BRANCH="master"
-SRC_URI = "git://git.ti.com/keystone-rtos/rm-lld.git;destsuffix=git/ti/drv/rm;protocol=git;branch=${BRANCH}"
-# Below commit ID corresponds to DEV.RM_LLD.02.01.00.08
-SRCREV = "7873d22076b4cb865365bbce20a244121414bb44"
-PV = "02.01.00.08"
-PR = "r1"
+RM_LLD_GIT_URI = "git://git.ti.com/keystone-rtos/rm-lld.git"
+RM_LLD_GIT_PROTOCOL = "git"
+RM_LLD_GIT_BRANCH = "master"
+RM_LLD_GIT_DESTSUFFIX = "git/ti/drv/rm"
+
+# Below commit ID corresponds to DEV.RM_LLD.02.01.02.00
+RM_LLD_SRCREV = "b3d711203c6b4cf99fb2f95dc2f4728dfd1b2639"
+
+BRANCH = "${RM_LLD_GIT_BRANCH}"
+SRC_URI = "${RM_LLD_GIT_URI};destsuffix=${RM_LLD_GIT_DESTSUFFIX};protocol=${RM_LLD_GIT_PROTOCOL};branch=${BRANCH}"
+SRCREV = "${RM_LLD_SRCREV}"
+
+PV = "02.01.02.00"
+PR = "r2"
 
 COMPATIBLE_MACHINE = "keystone"
 

recipes-bsp/sa-lld/sa-lld-test_git.bb

@@ -4,7 +4,13 @@ DEPENDS = "common-csl-ip cppi-lld qmss-lld pa-lld sa-lld"
 
 include sa-lld.inc
 
-DEVICELIST = "k2h k2k k2l k2e"
+PR = "${INC_PR}.1"
+
+PACKAGE_ARCH = "${MACHINE_ARCH}"
+
+DEVICELIST_k2hk-evm = "k2h k2k"
+DEVICELIST_k2l-evm  = "k2l"
+DEVICELIST_k2e-evm  = "k2e"
 
 CHOICELIST = "no yes"
 
@@ -15,7 +21,7 @@ do_compile () {
 		make -f makefile_armv7 clean PDK_INSTALL_PATH=${STAGING_INCDIR} DEVICE="$device" SA_SRC_DIR=${S}
 		for choice in ${CHOICELIST}
 		do
-			make -f makefile_armv7 examples PDK_INSTALL_PATH=${STAGING_INCDIR} DEVICE="$device" SA_SRC_DIR=${S} USEDYNAMIC_LIB="$choice"
+			make -f makefile_armv7 examples utils PDK_INSTALL_PATH=${STAGING_INCDIR} DEVICE="$device" SA_SRC_DIR=${S} USEDYNAMIC_LIB="$choice"
 		done
 	done
 }

recipes-bsp/sa-lld/sa-lld.inc

@@ -3,12 +3,19 @@ COMPATIBLE_MACHINE = "keystone"
 
 LIC_FILES_CHKSUM = "file://${WORKDIR}/git/ti/drv/sa/COPYING.txt;md5=4709d353574a9569e129ebdf20e732dd"
 
-BRANCH = "master"
-SRC_URI = "git://git.ti.com/keystone-rtos/sa-lld.git;destsuffix=git/ti/drv/sa;protocol=git;branch=${BRANCH}"
-# Following commit DEV.SA_LLD.03.00.00.10
-SRCREV = "533aec7ef0e28c3faff4ee64a861c8935262dc33"
-PV = "03.00.00.10"
-PR = "r1"
+SA_LLD_GIT_URI = "git://git.ti.com/keystone-rtos/sa-lld.git"
+SA_LLD_GIT_PROTOCOL = "git"
+SA_LLD_GIT_BRANCH = "master"
+SA_LLD_GIT_DESTSUFFIX = "git/ti/drv/sa"
 
-BASEDIR = "${WORKDIR}/git"
-S = "${BASEDIR}/ti/drv/sa"
+# Following commit DEV.SA_LLD.03.00.00.11A
+SA_LLD_SRCREV = "bf5b097e868b20d23d386abc34a1902903d7d9ea"
+
+BRANCH = "${SA_LLD_GIT_BRANCH}"
+SRC_URI = "${SA_LLD_GIT_URI};destsuffix=${SA_LLD_GIT_DESTSUFFIX};protocol=${SA_LLD_GIT_PROTOCOL};branch=${BRANCH}"
+SRCREV = "${SA_LLD_SRCREV}"
+
+PV = "03.00.00.11"
+INC_PR = "r1"
+
+S = "${WORKDIR}/${SA_LLD_GIT_DESTSUFFIX}"

recipes-bsp/sa-lld/sa-lld_git.bb

@@ -4,6 +4,8 @@ DEPENDS = "common-csl-ip"
 
 include sa-lld.inc
 
+PR = "${INC_PR}.0"
+
 do_compile () {
 #   Now build the lld in the updated directory
 	make -f makefile_armv7 clean lib PDK_INSTALL_PATH=${STAGING_INCDIR}
@@ -11,4 +13,8 @@ do_compile () {
 
 do_install () {
 	make -f makefile_armv7 install PDK_INSTALL_PATH=${STAGING_INCDIR} INSTALL_INC_BASE_DIR=${D}/${includedir} INSTALL_LIB_BASE_DIR=${D}${libdir}
+
+#   Set the generic device library symbolic link
+	ln -sf libsa.so.1.0.0 ${D}${libdir}/libsa_device.so.1
+	ln -sf libsa_device.so.1 ${D}${libdir}/libsa_device.so
 }

recipes-bsp/serdes-fw/serdes-fw_git.bb

@@ -0,0 +1,36 @@
+DESCRIPTION = "SerDes firmware for Keystone PCIe and 1/10GigE"
+
+LICENSE = "TI-TFL"
+LIC_FILES_CHKSUM = "file://LICENCE.ti-keystone;md5=3a86335d32864b0bef996bee26cc0f2c"
+
+PV = "1.0.0"
+PR = "r0"
+
+CLEANBROKEN = "1"
+
+COMPATIBLE_MACHINE = "keystone"
+
+PACKAGE_ARCH = "${MACHINE_ARCH}"
+
+SRCREV = "8756d98081e1011a1334b0769f13ffb31d3b41bd"
+BRANCH ?= "ti-linux-firmware-4.1.y"
+
+SRC_URI = "git://git.ti.com/processor-firmware/ti-linux-firmware.git;protocol=git;branch=${BRANCH}"
+
+S = "${WORKDIR}/git"
+ORIGINPCIE = "ks2_pcie_serdes_1.0.0.bin"
+ORIGINGBE = "ks2_gbe_serdes_1.0.0.bin"
+ORIGINXGBE = "ks2_xgbe_serdes_1.0.0.bin"
+
+TARGETPCIE = "ks2_pcie_serdes.bin"
+TARGETGBE = "ks2_gbe_serdes.bin"
+TARGETXGBE = "ks2_xgbe_serdes.bin"
+
+do_install() {
+	install -d ${D}${base_libdir}/firmware
+	install -m 0644 ${S}/ti-keystone/${ORIGINPCIE} ${D}${base_libdir}/firmware/${TARGETPCIE}
+	install -m 0644 ${S}/ti-keystone/${ORIGINGBE} ${D}${base_libdir}/firmware/${TARGETGBE}
+	install -m 0644 ${S}/ti-keystone/${ORIGINXGBE} ${D}${base_libdir}/firmware/${TARGETXGBE}
+}
+
+FILES_${PN} = "${base_libdir}/firmware"

recipes-bsp/srio-lld/srio-lld-test_git.bb

@@ -1,9 +1,10 @@
 DESCRIPTION = "TI SRIO peripheral low level driver unit test and example binaries"
-COMPATIBLE_MACHINE = "keystone"
 DEPENDS="common-csl-ip rm-lld cppi-lld qmss-lld srio-lld cmem"
 
 include srio-lld.inc
 
+PR = "${INC_PR}.0"
+
 CHOICELIST = "yes no"
 
 do_compile () {

recipes-bsp/srio-lld/srio-lld.inc

@@ -1,12 +1,22 @@
 LICENSE = "BSD-3-Clause"
 LIC_FILES_CHKSUM = "file://${WORKDIR}/git/ti/drv/srio/srio_drv.h;beginline=1;endline=41;md5=469096088e072d883ff7eef301b34093"
 
-BRANCH = "master"
-SRC_URI = "git://git.ti.com/keystone-rtos/srio-lld.git;destsuffix=git/ti/drv/srio;protocol=git;branch=${BRANCH}"
+COMPATIBLE_MACHINE = "k2hk-evm"
 
-# commit ID corresponding to DEV.SRIO_LLD.02.00.00.12
-SRCREV = "fb1c484f781bab73e742e4e265c9f7469c8b3350"
-PV = "02.00.00.12"
+SRIO_LLD_GIT_URI = "git://git.ti.com/keystone-rtos/srio-lld.git"
+SRIO_LLD_GIT_PROTOCOL = "git"
+SRIO_LLD_GIT_BRANCH = "master"
+SRIO_LLD_GIT_DESTSUFFIX = "git/ti/drv/srio"
+
+# commit ID corresponding to DEV.SRIO_LLD.02.00.00.13
+SRIO_LLD_SRCREV = "dc49972265afd3ffd3b29ca235b8ca6daf790bd1"
+
+BRANCH = "${SRIO_LLD_GIT_BRANCH}"
+SRC_URI = "${SRIO_LLD_GIT_URI};destsuffix=${SRIO_LLD_GIT_DESTSUFFIX};protocol=${SRIO_LLD_GIT_PROTOCOL};branch=${BRANCH}"
+SRCREV = "${SRIO_LLD_SRCREV}"
+
+PV = "02.00.00.13"
+INC_PR = "r2"
 
 DEVICELIST = "k2h k2k"
 

recipes-bsp/srio-lld/srio-lld_git.bb

@@ -1,10 +1,11 @@
 DESCRIPTION = "TI SRIO peripheral low level driver"
-COMPATIBLE_MACHINE = "keystone"
 
 DEPENDS="common-csl-ip rm-lld cppi-lld"
 
 include srio-lld.inc
 
+PR = "${INC_PR}.0"
+
 do_compile () {
 #   Now build the lld
 	oe_runmake clean

recipes-bsp/ti-sci-fw/ti-sci-fw_git.bb

@@ -0,0 +1,37 @@
+DESCRIPTION = "TI SCI firmware"
+
+LICENSE = "TI-TFL"
+LIC_FILES_CHKSUM = "file://LICENCE.ti-keystone;md5=3a86335d32864b0bef996bee26cc0f2c"
+
+PV = "0.1.0.70"
+PR = "r1"
+
+CLEANBROKEN = "1"
+
+COMPATIBLE_MACHINE = "k2g-evm"
+
+PACKAGE_ARCH = "${MACHINE_ARCH}"
+
+SRCREV = "778668c4bb5fe59870e549a4a2820b9f7f90e89e"
+BRANCH ?= "ti-linux-firmware-4.1.y"
+
+SRC_URI = "git://git.ti.com/processor-firmware/ti-linux-firmware.git;protocol=git;branch=${BRANCH}"
+
+S = "${WORKDIR}/git"
+TARGET = "ti-sci-firmware-k2g.bin"
+
+do_install() {
+	install -d ${D}/boot
+	install -m 0644 ${S}/ti-keystone/${TARGET} ${D}/boot/${TARGET}
+}
+
+FILES_${PN} = "/boot"
+
+inherit deploy
+
+do_deploy () {
+	install -d ${DEPLOYDIR}
+	install -m 0644 ${S}/ti-keystone/${TARGET} ${DEPLOYDIR}/${TARGET}
+}
+
+addtask deploy before do_build after do_compile

recipes-bsp/traceframework/traceframework_git.bb

@@ -2,20 +2,30 @@ DESCRIPTION = "TI Trace Framework library"
 LICENSE = "BSD-3-Clause"
 LIC_FILES_CHKSUM = "file://${WORKDIR}/git/ti/instrumentation/traceframework/COPYING.txt;md5=e8f6789acdcda76d02ed9203fc2e603d"
 
-BRANCH="master"
-SRC_URI = "git://git.ti.com/keystone-rtos/traceframework.git;destsuffix=git/ti/instrumentation/traceframework;protocol=git;branch=${BRANCH}"
+TRACEFRAMEWORK_GIT_URI = "git://git.ti.com/keystone-rtos/traceframework.git"
+TRACEFRAMEWORK_GIT_PROTOCOL = "git"
+TRACEFRAMEWORK_GIT_BRANCH = "master"
+TRACEFRAMEWORK_GIT_DESTSUFFIX = "git/ti/instrumentation/traceframework"
 
-# Below commit ID corresponds to DEV.TFWK-01.01.01.06B
-SRCREV = "6d29bc0d1ab6bb0658876552197dcdc757a25082"
-PV = "01.01.01.06"
-PR = "r1"
+# Below commit ID corresponds to DEV.TFWK-01.01.01.07
+TRACEFRAMEWORK_SRCREV = "8d9c0e3a5bcb43aad98a794c31f42b652c6b3b53"
+
+BRANCH="${TRACEFRAMEWORK_GIT_BRANCH}"
+SRC_URI = "${TRACEFRAMEWORK_GIT_URI};destsuffix=${TRACEFRAMEWORK_GIT_DESTSUFFIX};protocol=${TRACEFRAMEWORK_GIT_PROTOCOL};branch=${BRANCH}"
+SRCREV = "${TRACEFRAMEWORK_SRCREV}"
+
+PV = "01.01.01.07"
+PR = "r4"
 
 COMPATIBLE_MACHINE = "(tci6614-evm|keystone)"
+PACKAGE_ARCH = "${MACHINE_ARCH}"
 DEPENDS = "cuia"
 
-DEVICELIST = ""
-DEVICELIST_append_tci6614-evm = "c6614"
-DEVICELIST_append_keystone    = "k2k k2h k2e k2l"
+DEVICELIST = "k2k k2h k2e k2l"
+DEVICELIST_tci6614-evm = "c6614"
+DEVICELIST_k2hk-evm    = "k2k k2h"
+DEVICELIST_k2e-evm     = "k2e"
+DEVICELIST_k2l-evm     = "k2l"
 
 PACKAGES =+ "${PN}-test"
 

recipes-bsp/u-boot/u-boot-keystone_2013.01.bb

@@ -4,11 +4,11 @@ DESCRIPTION = "u-boot bootloader for Multi-Core BU devices"
 
 COMPATIBLE_MACHINE = "keystone"
 
-PR = "r5"
+PR = "r6"
 PV_append = "+git${SRCPV}"
 
-# Tag "K2_UBOOT_2013_01_14.09"
-SRCREV = "f9bc365551ff8c685bf6134d795576713fec0917"
+# Tag "K2_UBOOT_2013_01_15.07_01"
+SRCREV = "5eaedcc4c2bca0ed971ee46694df7edc0cfa36cf"
 BRANCH = "master"
 
 SRC_URI = "git://git.ti.com/keystone-linux/u-boot.git;protocol=git;branch=${BRANCH}"

recipes-bsp/u-boot/u-boot-ti-staging_2014.07.bb

@@ -7,14 +7,14 @@ DESCRIPTION = "u-boot bootloader for TI devices"
 
 LIC_FILES_CHKSUM = "file://Licenses/README;md5=025bf9f768cbcb1a165dbe1a110babfb"
 
-PR = "r13"
+PR = "r14"
 PV_append = "+git${SRCPV}"
 
 SRC_URI = "git://git.ti.com/ti-u-boot/ti-u-boot.git;protocol=git;branch=${BRANCH}"
 
 BRANCH ?= "ti-u-boot-2014.07"
 
-SRCREV = "93b92d24320babe1f9b88736bbb8a5877a317bf4"
+SRCREV = "fb6ab76dad21e12b12d0f824fcfa2609a26ec695"
 
 SPL_BINARY = "MLO"
 SPL_UART_BINARY = "u-boot-spl.bin"

recipes-bsp/u-boot/u-boot-ti-staging_2015.07.bb

@@ -0,0 +1,65 @@
+require u-boot-ti.inc
+
+# u-boot needs devtree compiler to parse dts files
+DEPENDS += "dtc-native"
+
+DESCRIPTION = "u-boot bootloader for TI devices"
+
+LIC_FILES_CHKSUM = "file://Licenses/README;md5=0507cd7da8e7ad6d6701926ec9b84c95"
+
+PR = "r15"
+PV_append = "+git${SRCPV}"
+
+SRC_URI = "git://git.ti.com/ti-u-boot/ti-u-boot.git;protocol=git;branch=${BRANCH}"
+
+BRANCH ?= "ti-u-boot-2015.07"
+
+SRCREV = "5922e09363b1449ba558fd1dfcd527c71119d0ee"
+
+SPL_BINARY = "MLO"
+SPL_UART_BINARY = "u-boot-spl.bin"
+
+# Keystone specifics
+UBOOT_SUFFIX_keystone = "bin"
+SPL_UART_BINARY_keystone = ""
+
+# SPI NOR Flash binaries
+UBOOT_SPI_SPL_BINARY = "u-boot-spl.bin"
+UBOOT_SPI_BINARY = "u-boot.img"
+UBOOT_SPI_GPH_BINARY = "u-boot-spi.gph"
+
+# SPI NOR Flash deployed images
+UBOOT_SPI_SPL_IMAGE = "u-boot-spl-${MACHINE}-${PV}-${PR}.bin"
+UBOOT_SPI_SPL_SYMLINK = "u-boot-spl-${MACHINE}.bin"
+UBOOT_SPI_IMAGE = "u-boot-${MACHINE}-${PV}-${PR}.img"
+UBOOT_SPI_SYMLINK = "u-boot-${MACHINE}.img"
+UBOOT_SPI_GPH_IMAGE = "u-boot-spi-${MACHINE}-${PV}-${PR}.gph"
+UBOOT_SPI_GPH_SYMLINK = "u-boot-spi-${MACHINE}.gph"
+
+do_install_append_keystone () {
+	install ${S}/spl/${UBOOT_SPI_SPL_BINARY} ${D}/boot/${UBOOT_SPI_SPL_IMAGE}
+	ln -sf ${UBOOT_SPI_SPL_IMAGE} ${D}/boot/${UBOOT_SPI_SPL_BINARY}
+
+	install ${S}/${UBOOT_SPI_BINARY} ${D}/boot/${UBOOT_SPI_IMAGE}
+	ln -sf ${UBOOT_SPI_IMAGE} ${D}/boot/${UBOOT_SPI_BINARY}
+
+	install ${S}/${UBOOT_SPI_GPH_BINARY} ${D}/boot/${UBOOT_SPI_GPH_IMAGE}
+	ln -sf ${UBOOT_SPI_GPH_IMAGE} ${D}/boot/${UBOOT_SPI_GPH_BINARY}
+}
+
+do_deploy_append_keystone () {
+	install ${S}/spl/${UBOOT_SPI_SPL_BINARY} ${DEPLOYDIR}/${UBOOT_SPI_SPL_IMAGE}
+	rm -f ${UBOOT_SPI_SPL_BINARY} ${UBOOT_SPI_SPL_SYMLINK}
+	ln -sf ${UBOOT_SPI_SPL_IMAGE} ${UBOOT_SPI_SPL_SYMLINK}
+	ln -sf ${UBOOT_SPI_SPL_IMAGE} ${UBOOT_SPI_SPL_BINARY}
+
+	install ${S}/${UBOOT_SPI_BINARY} ${DEPLOYDIR}/${UBOOT_SPI_IMAGE}
+	rm -f ${UBOOT_SPI_BINARY} ${UBOOT_SPI_SYMLINK}
+	ln -sf ${UBOOT_SPI_IMAGE} ${UBOOT_SPI_SYMLINK}
+	ln -sf ${UBOOT_SPI_IMAGE} ${UBOOT_SPI_BINARY}
+
+	install ${S}/${UBOOT_SPI_GPH_BINARY} ${DEPLOYDIR}/${UBOOT_SPI_GPH_IMAGE}
+	rm -f ${UBOOT_SPI_GPH_BINARY} ${UBOOT_SPI_GPH_SYMLINK}
+	ln -sf ${UBOOT_SPI_GPH_IMAGE} ${UBOOT_SPI_GPH_SYMLINK}
+	ln -sf ${UBOOT_SPI_GPH_IMAGE} ${UBOOT_SPI_GPH_BINARY}
+}

recipes-bsp/uio-module-drv/uio-module-drv-test_git.bb

@@ -0,0 +1,16 @@
+DESCRIPTION = "Test code for user space IO (UIO) driver"
+
+include uio-module-drv.inc
+PV = "1.0.2.3"
+
+COMPATIBLE_MACHINE = "keystone"
+RDEPENDS_${PN} = "uio-module-drv"
+
+do_compile() {
+	oe_runmake -C ${S} test
+}
+
+do_install() {
+	install -d ${D}${bindir}/
+	install -c -m 755 ${S}/test/uio_cic2_int_multithread_test ${D}${bindir}/.
+}

recipes-bsp/uio-module-drv/uio-module-drv.inc

@@ -0,0 +1,10 @@
+LICENSE = "BSD"
+LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=2b7c96eb2aed7b0f6f922214dbde9016"
+
+BRANCH = "linux4.1"
+# This corresponds to version 02.00.00.00_eng
+SRCREV = "6a7eda36e390658593a5b8d87b0f00beb3997240"
+
+SRC_URI = "git://git.ti.com/keystone-linux/uio-module-drv.git;protocol=git;branch=${BRANCH}"
+
+S = "${WORKDIR}/git"

recipes-bsp/uio-module-drv/uio-module-drv_git.bb

@@ -1,21 +1,19 @@
 DESCRIPTION="User space IO (UIO) driver for on-chip modules"
 
-LICENSE = "BSD"
-LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=2b7c96eb2aed7b0f6f922214dbde9016"
-
-BRANCH ?= "master"
-# This corresponds to version 01.00.02.01
-SRCREV = "c1988446e3364af4df7cd877e6536f0c6647d7bb"
-PV = "1.0.2.1+git${SRCPV}"
-
-SRC_URI = "git://git.ti.com/keystone-linux/uio-module-drv.git;protocol=git;branch=${BRANCH}"
+include uio-module-drv.inc
+PV = "2.0.0.0+git${SRCPV}"
 
 # This package builds a kernel module, use kernel PR as base and append a local
-MACHINE_KERNEL_PR_append = "b"
+MACHINE_KERNEL_PR_append = "c"
 PR = "${MACHINE_KERNEL_PR}"
 
-S = "${WORKDIR}/git"
+do_configure[depends] += "virtual/kernel:do_compile_kernelmodules"
 
 module_auto_load_uio-module-drv = "uio-module-drv"
 
 inherit module
+
+do_install_append () {
+    install -d ${D}${includedir}
+    cp *.h ${D}${includedir}
+}

recipes-bsp/vpe-tests/vpe-tests_git.bb

@@ -3,9 +3,9 @@ DESCRIPTION = "VPE test program"
 LICENSE = "BSD"
 LIC_FILES_CHKSUM = "file://COPYING;md5=74d2f71d8898c54e3d1c9d0058c484aa"
 
-DEPENDS = "virtual/kernel"
+DEPENDS = "virtual/kernel vpdma-fw"
 
-PR = "r2"
+PR = "r3"
 
 COMPATIBLE_MACHINE = "dra7xx"
 
@@ -25,4 +25,6 @@ EXTRA_OEMAKE = 'CROSS_COMPILE="${TARGET_PREFIX}" CC="${TARGET_PREFIX}gcc ${FLOAT
 
 do_install() {
     oe_runmake DESTDIR="${D}" install
+    rm -rf ${D}${base_libdir}/firmware/vpdma-*.bin
+    rmdir -p ${D}${base_libdir}/firmware || true
 }

recipes-devtools/gdbc6x/gdbc6x/init

@@ -0,0 +1,48 @@
+#!/bin/bash
+
+GDB_DEVICE_NAME='/dev/gdbtty$i'
+DSP_FIRMWARE_NAME='/lib/firmware/dra7-dsp$[$i+1]-fw.xe66'
+
+DSP_L2_GLOBAL_OFFSET="40000000"
+DSP_L2_GLOBAL_SHIFT="00800000"
+
+case "$1" in
+  start)
+
+    dsp_core_l2_offset=$DSP_L2_GLOBAL_OFFSET
+
+    i=0
+    while [ -c "`eval echo $GDB_DEVICE_NAME`" ]
+    do
+      dsp_firmware=`eval echo $DSP_FIRMWARE_NAME`
+
+      if [ -f "`eval echo $DSP_FIRMWARE_NAME`" ]
+      then 
+        eval echo "Initializing $GDB_DEVICE_NAME based on $DSP_FIRMWARE_NAME ..."
+
+        gdb_data_local=`eval readelf -s "$DSP_FIRMWARE_NAME" | \
+                        grep 'gdb_globalData' | \
+                        awk '{print $2}'`
+
+        echo "gdb_globalData (local)  = $gdb_data_local"
+        printf "gdb_globalData (global) = %X\n" \
+          $[0x$gdb_data_local + 0x$dsp_core_l2_offset]
+
+
+        printf "%X\n" $[0x$gdb_data_local + 0x$dsp_core_l2_offset] \
+          >> `eval echo $GDB_DEVICE_NAME`
+      fi
+      i=$[$i + 1]
+      dsp_core_l2_offset=`printf "%X" $[0x$dsp_core_l2_offset + 0x$DSP_L2_GLOBAL_SHIFT]`
+    done
+  ;;
+  stop)
+    # Nothing to be done.
+  ;;
+  *)
+    echo "Usage: $0 {start|stop}"
+    exit 1
+  ;;
+esac
+
+

recipes-devtools/gdbc6x/gdbc6x_git.bb

@@ -0,0 +1,44 @@
+DESCRIPTION = "GNU debugger for TI C6X DSP."
+SECTION = "devel"
+LICENSE = "GPLv3+"
+LIC_FILES_CHKSUM = "file://debian/copyright;md5=bf0fe2872eb3dfeebb2cbe38206fe81f"
+
+DEPENDS = "ncurses bison texinfo flex gettext"
+
+PR = "${INC_PR}.0"
+
+SRC_URI_append = " \
+    file://init \
+"
+
+S = "${WORKDIR}/git/gdbc6x"
+
+inherit update-rc.d
+inherit gettext
+
+do_configure () {
+    cd ${S}
+    ./configure --program-suffix=c6x --target=tic6x-elf-tirtos --host=${HOST_SYS} --prefix=${S}/install_gdb
+}
+
+do_install () {
+    make install
+
+    # Custom install to prevent conflict with standard GDB.
+    install -d ${D}${bindir}
+    install -d ${D}${includedir}
+    install -m 755  ${S}/install_gdb/bin/gdbc6x ${D}${bindir} 
+    cp -rf ${S}/install_gdb/include/* ${D}${includedir}
+
+    install -d ${D}${sysconfdir}/init.d
+    install -m 0755 ${WORKDIR}/init ${D}${sysconfdir}/init.d/gdbserverproxy
+}
+
+RDEPENDS_${PN} = "gdbserverproxy-module-drv"
+
+include gdbc6x.inc
+
+INITSCRIPT_NAME = "gdbserverproxy"
+INITSCRIPT_PARAMS = "defaults 95"
+
+PARALLEL_MAKE = ""

recipes-devtools/gdbc6x/gdbserver-c6x_git.bb

@@ -0,0 +1,50 @@
+DESCRIPTION = "TI gdb-server to be used with c6xgdb."
+LICENSE = "BSD"
+LIC_FILES_CHKSUM = "file://../debian/copyright;md5=82c616b6c8f9c11c46feaaf8f9a11495"
+
+DEPENDS = "ti-xdais ti-framework-components ti-cgt6x-native ti-sysbios ti-xdctools"
+
+PR = "${INC_PR}.0"
+
+S = "${WORKDIR}/git/gdbserver-c6x/src"
+
+PLATFORM = ""
+PLATFORM_dra7xx = "DRA7xx_PLATFORM"
+PLATFORM_keystone = "KEYSTONE_PLATFORM"
+
+EXTRA_OEMAKE = "PLATFORM=${PLATFORM}"
+
+export XDAIS_DIR = "${XDAIS_INSTALL_DIR}"
+export FC_DIR = "${FC_INSTALL_DIR}"
+export TI_CGT_INSTALL = "${STAGING_DIR_NATIVE}/usr/share/ti/cgt-c6x"
+export BIOS_DIR = "${SYSBIOS_INSTALL_DIR}" 
+export XDC_DIR = "${XDC_INSTALL_DIR}"
+
+# The following is to prevent an unused configure.ac from erroneously
+# triggering the QA check for gettext.
+EXTRA_OECONF = "--disable-nls"
+do_configure() {
+    :
+}
+
+do_install() {
+    install -d ${D}${datadir}/ti/gdbc6x/include
+    install -d ${D}${datadir}/ti/gdbc6x/lib
+    cp -f ../include/* ${D}${datadir}/ti/gdbc6x/include
+    cp -f ../lib/* ${D}${datadir}/ti/gdbc6x/lib
+}
+
+COMPATIBLE_MACHINE = "dra7xx|keystone"
+PACKAGE_ARCH = "${MACHINE_ARCH}"
+
+FILES_${PN}-dev += "\
+    ${datadir}/ti/gdbc6x \
+"
+
+include gdbc6x.inc
+
+require recipes-ti/includes/ti-paths.inc
+
+ALLOW_EMPTY_${PN} = "1"
+
+PARALLEL_MAKE = ""

recipes-devtools/gdbc6x/gdbserverproxy-module-drv_git.bb

@@ -3,7 +3,7 @@ LICENSE = "GPLv2"
 LIC_FILES_CHKSUM = "file://COPYING.txt;md5=75859989545e37968a99b631ef42722e"
 
 # This package builds a kernel module, use kernel PR as base and append a local
-MACHINE_KERNEL_PR_append = "a"
+MACHINE_KERNEL_PR_append = "b"
 PR = "${MACHINE_KERNEL_PR}"
 PV_append = "+git${SRCPV}"
 
@@ -15,7 +15,7 @@ PLATFORM = ""
 PLATFORM_dra7xx = "DRA7xx_PLATFORM"
 PLATFORM_keystone = "KEYSTONE_PLATFORM"
 
-EXTRA_OEMAKE = "PLATFORM=${PLATFORM}"
+EXTRA_OEMAKE = "PLATFORM=${PLATFORM} KVERSION=${KERNEL_VERSION} KERNEL_SRC=${STAGING_KERNEL_DIR}"
 
 # The following is to prevent an unused configure.ac from erroneously
 # triggering the QA check for gettext.
@@ -29,4 +29,4 @@ PACKAGE_ARCH = "${MACHINE_ARCH}"
 
 include gdbc6x.inc
 
-module_autoload_gdbserverproxy = "gdbserverproxy"
+KERNEL_MODULE_AUTOLOAD += "gdbserverproxy"

recipes-graphics/bltsville/bltsville_git.bb

@@ -8,7 +8,7 @@ PR = "r3"
 
 SRCREV = "a759bde8a5a6e518dfb8a6e633736a360005498e"
 
-inherit autotools pkgconfig
+inherit autotools-brokensep pkgconfig
 
 SRC_URI = "git://git.omapzoom.org/platform/external/bltsville.git;protocol=git"
 

recipes-graphics/drm/libdrm_2.4.41.bb

@@ -2,7 +2,7 @@ require recipes-graphics/drm/libdrm.inc
 
 FILESEXTRAPATHS_append := ":${COREBASE}/meta/recipes-graphics/drm/libdrm"
 
-COMPATIBLE_MACHINE = "omap-a15"
+COMPATIBLE_MACHINE = "ti33x|ti43x|omap-a15"
 
 DEFAULT_PREFERENCE = "-1"
 
@@ -12,9 +12,8 @@ SRC_URI = "git://git.ti.com/glsdk/libdrm.git;protocol=git"
 SRCREV = "3cb5405084111193cedb8796d259b56560b088f0"
 
 SRC_URI += "file://installtests-ti.patch \
-            file://GNU_SOURCE_definition.patch \
            "
 
-PR = "${INC_PR}.1"
+PR = "${INC_PR}.2"
 
 S = "${WORKDIR}/git"

recipes-graphics/libgles/omap5-sgx-ddk-um-linux/rc.pvr

@@ -0,0 +1,17 @@
+#!/bin/bash
+
+case "$1" in
+  start)
+
+  echo "Initializing the graphics driver ..."
+  pvrsrvinit
+
+  ;;
+  stop)
+    # Nothing to be done.
+  ;;
+  *)
+    echo "Usage: $0 {start|stop}"
+    exit 1
+  ;;
+esac

recipes-graphics/libgles/omap5-sgx-ddk-um-linux/ti33x/powervr.ini

@@ -0,0 +1,4 @@
+[default]
+WindowSystem=libpvrDRMWSEGL_FRONT.so
+#WindowSystem=libpvrDRMWSEGL.so
+DisableHWTQTextureUpload=1

recipes-graphics/libgles/omap5-sgx-ddk-um-linux_1.9.0.12.bb

@@ -3,26 +3,64 @@ HOMEPAGE = "http://downloads.ti.com/dsps/dsps_public_sw/gfxsdk"
 LICENSE = "TI-TSPA"
 LIC_FILES_CHKSUM = "file://OMAP5-Linux-Graphics-DDK-UM-Manifest.doc;md5=360d293df455e4f2d363bb4014a49603"
 
-SRC_URI = "git://git.ti.com/graphics/omap5-sgx-ddk-um-linux.git;protocol=git"
-SRCREV = "53be02a24a30a4c74eb48f2c84fda789bd95ab33"
+PACKAGE_ARCH = "${MACHINE_ARCH}"
 
-PR = "r4"
+BRANCH_omap-a15 = "master"
+BRANCH_ti33x = "am3/k4.1"
+BRANCH_ti43x = "am4/k4.1"
+
+SRC_URI = "git://git.ti.com/graphics/omap5-sgx-ddk-um-linux.git;protocol=git;branch=${BRANCH}"
+SRCREV_omap-a15 = "d63cd6469fff610317a8e1c986f227bb3e7922f6"
+SRCREV_ti33x    = "84ae5444c7cbc3f4c65a226b9fea62d4a513f3e0"
+SRCREV_ti43x    = "fdf4c0b594ca142a68aabb4c3f82b75be50b46cc"
+
+INITSCRIPT_NAME = "pvr-init"
+INITSCRIPT_PARAMS = "defaults 8"
+
+inherit update-rc.d
+
+PR = "r14"
 PROVIDES += "virtual/egl virtual/libgles1 virtual/libgles2"
 
+RDEPENDS_${PN} += "libdrm"
+
 RREPLACES_${PN} = "libegl libgles1 libgles2"
 RREPLACES_${PN}-dev = "libegl-dev libgles1-dev libgles2-dev"
 RREPLACES_${PN}-dbg = "libegl-dbg"
 
 S = "${WORKDIR}/git"
 
+SRC_URI_append = " \
+    file://rc.pvr \
+    file://powervr.ini \
+"
+
 do_install () {
     oe_runmake install DESTDIR=${D}
+    install -d ${D}${sysconfdir}/init.d
+    install -m 0755 ${WORKDIR}/rc.pvr ${D}${sysconfdir}/init.d/pvr-init
+
+    install -d ${D}${sysconfdir}
+    install -m 0644 ${WORKDIR}/powervr.ini ${D}${sysconfdir}/
 }
 
 FILES_${PN} =  "${bindir}/*"
 FILES_${PN} += " ${libdir}/*"
 FILES_${PN} +=  "${includedir}/* /usr/share/sgx-lib/"
+FILES_${PN} += "${sysconfdir}/init.d/pvr-init"
+FILES_${PN} += "${sysconfdir}/powervr.ini"
+
+PACKAGES =+ "${PN}-plugins"
+FILES_${PN}-plugins = ""
+FILES_${PN}-plugins_ti43x = "${libdir}/libsrv_init.so ${libdir}/libsrv_um.so ${libdir}/libglslcompiler.so ${libdir}/libpvrws_WAYLAND.so ${libdir}/libpvrws_KMS.so "
+FILES_${PN}-plugins_ti33x = "${libdir}/libsrv_init.so ${libdir}/libsrv_um.so ${libdir}/libglslcompiler.so ${libdir}/libpvrDRMWSEGL.so ${libdir}/libpvrDRMWSEGL_FRONT.so "
+RDEPENDS_${PN} += "${PN}-plugins"
+
+ALLOW_EMPTY_${PN}-plugins = "1"
 
 INHIBIT_PACKAGE_STRIP = "1"
 
 INSANE_SKIP_${PN} += "dev-so ldflags useless-rpaths"
+INSANE_SKIP_${PN}-plugins = "dev-so"
+
+CLEANBROKEN = "1"

recipes-kernel/kselftests/kselftests_4.1.bb

@@ -0,0 +1,88 @@
+SUMMARY = "Linux Kernel Selftests"
+LICENSE = "GPLv2"
+LIC_FILES_CHKSUM = "file://COPYING;md5=d7810fab7487fb0aad327b76f1be7cd7"
+
+SRC_URI = "https://www.kernel.org/pub/linux/kernel/v4.x/linux-${PV}.tar.xz"
+
+SRC_URI[md5sum] = "fe9dc0f6729f36400ea81aa41d614c37"
+SRC_URI[sha256sum] = "caf51f085aac1e1cea4d00dbbf3093ead07b551fc07b31b2a989c05f8ea72d9f"
+
+S = "${WORKDIR}/linux-${PV}"
+
+PACKAGE_ARCH = "${MACHINE_ARCH}"
+
+DEPENDS = "virtual/kernel popt"
+
+inherit kernel-arch
+
+TARGETS = "cpu-hotplug efivarfs exec firmware ftrace kcmp memfd memory-hotplug \
+	mount mqueue net ptrace size sysctl timers user vm"
+
+# Arch specific tests
+TARGETS_append_x86 = " breakpoints ipc x86"
+TARGETS_append_x86-64 = " breakpoints ipc x86"
+TARGETS_append_powerpc = " powerpc"
+TARGETS_append_powerpc64 = " powerpc"
+
+EXTRA_OEMAKE += "-C tools/testing/selftests TARGETS="${TARGETS}" INSTALL_PATH=${D}${bindir}/kselftests CC="${CC}""
+
+# Their Makefiles are so sloppy, let's clean up a bit
+do_configure () {
+	sed "s|^CC := .*||g" -i ${S}/tools/testing/selftests/lib.mk
+	sed "s|^CC = .*||g" -i ${S}/tools/testing/selftests/timers/Makefile
+	sed "s|^CC = .*||g" -i ${S}/tools/testing/selftests/memfd/Makefile
+	sed "s|^CC := .*||g" -i ${S}/tools/testing/selftests/powerpc/switch_endian/Makefile
+	sed "s|gcc|\$(CC)|g" -i ${S}/tools/testing/selftests/breakpoints/Makefile
+	sed "s|^LDFLAGS += -lrt -lpthread|LDLIBS += -lrt -lpthread|g" -i ${S}/tools/testing/selftests/timers/Makefile
+}
+
+do_compile () {
+	oe_runmake
+}
+
+do_install () {
+	oe_runmake install
+}
+
+PACKAGE_BEFORE_PN = "${PN}-breakpoints ${PN}-cpu-hotplug ${PN}-efivarfs ${PN}-exec ${PN}-firmware ${PN}-ftrace \
+	${PN}-ipc ${PN}-kcmp ${PN}-memfd ${PN}-memory-hotplug ${PN}-mount ${PN}-mqueue ${PN}-net ${PN}-powerpc \
+	${PN}-ptrace ${PN}-size ${PN}-sysctl ${PN}-timers ${PN}-user ${PN}-vm ${PN}-x86"
+
+FILES_${PN}-breakpoints = "${bindir}/kselftests/breakpoints"
+FILES_${PN}-cpu-hotplug = "${bindir}/kselftests/cpu-hotplug"
+FILES_${PN}-efivarfs = "${bindir}/kselftests/efivarfs"
+FILES_${PN}-exec = "${bindir}/kselftests/exec"
+FILES_${PN}-firmware = "${bindir}/kselftests/firmware"
+FILES_${PN}-ftrace = "${bindir}/kselftests/ftrace"
+FILES_${PN}-ipc = "${bindir}/kselftests/ipc"
+FILES_${PN}-kcmp = "${bindir}/kselftests/kcmp"
+FILES_${PN}-memfd = "${bindir}/kselftests/memfd"
+FILES_${PN}-memory-hotplug = "${bindir}/kselftests/memory-hotplug"
+FILES_${PN}-mount = "${bindir}/kselftests/mount"
+FILES_${PN}-mqueue = "${bindir}/kselftests/mqueue"
+FILES_${PN}-net = "${bindir}/kselftests/net"
+FILES_${PN}-powerpc = "${bindir}/kselftests/powerpc"
+FILES_${PN}-ptrace = "${bindir}/kselftests/ptrace"
+FILES_${PN}-size = "${bindir}/kselftests/size"
+FILES_${PN}-sysctl = "${bindir}/kselftests/sysctl"
+FILES_${PN}-timers = "${bindir}/kselftests/timers"
+FILES_${PN}-user = "${bindir}/kselftests/user"
+FILES_${PN}-vm = "${bindir}/kselftests/vm"
+FILES_${PN}-x86 = "${bindir}/kselftests/x86"
+FILES_${PN}-dbg += "${bindir}/kselftests/*/.debug"
+
+RDEPENDS_${PN}-cpu-hotplug += "bash"
+RDEPENDS_${PN}-efivarfs += "bash"
+RDEPENDS_${PN}-memory-hotplug += "bash"
+RDEPENDS_${PN}-net += "bash"
+RDEPENDS_${PN}-vm += "bash"
+RDEPENDS_${PN} += "bash ${PN}-cpu-hotplug ${PN}-efivarfs ${PN}-exec ${PN}-firmware ${PN}-ftrace \
+	${PN}-kcmp ${PN}-memfd ${PN}-memory-hotplug ${PN}-mount ${PN}-mqueue ${PN}-net ${PN}-ptrace \
+	${PN}-size ${PN}-sysctl ${PN}-timers ${PN}-user ${PN}-vm"
+
+RDEPENDS_${PN}_append_x86 = " ${PN}-breakpoints ${PN}-ipc ${PN}-x86"
+RDEPENDS_${PN}_append_x86-64 = " ${PN}-breakpoints ${PN}-ipc ${PN}-x86"
+RDEPENDS_${PN}_append_powerpc = " ${PN}-powerpc"
+RDEPENDS_${PN}_append_powerpc64 = " ${PN}-powerpc"
+
+INSANE_SKIP_${PN} = "already-stripped"

recipes-kernel/linux/cmem.inc

@@ -1,17 +1,12 @@
 SRC_URI += "file://cmem.dtsi"
 
-CMEM_BASE ?= ""
-CMEM_SIZE ?= ""
+RESERVE_CMEM ?= "0"
 
 do_setup_cmem() {
-    if [ ! -z "${CMEM_BASE}" ]
+    if [ "${RESERVE_CMEM}" == "1" ]
     then
         cp ${WORKDIR}/cmem.dtsi ${S}/arch/arm/boot/dts/${MACHINE}-cmem.dtsi
 
-        sed -i -e "s|__CMEM_BASE__|${CMEM_BASE}|g" \
-               -e "s|__CMEM_SIZE__|${CMEM_SIZE}|g" \
-               ${S}/arch/arm/boot/dts/${MACHINE}-cmem.dtsi
-
         for dtb in ${KERNEL_DEVICETREE}
         do
             dts=`echo $dtb | sed -e 's|dtb$|dts|'`

recipes-kernel/linux/files/cmem.dtsi

@@ -1,24 +1,38 @@
+/*
+ * This is a placeholder for CMEM reserved memory declarations. This
+ * is simply an example and does not actually reserve any memory for
+ * CMEM.
+ *
+ * The commented sections below provide an example for how to provide
+ * a reserved memory region for CMEM to use as a buffer pool.
+ */
 / {
-        reserved-memory {
-                cmem_block_mem_0: cmem_block_mem@__CMEM_BASE__ {
-                        reg = <0x__CMEM_BASE__ 0x__CMEM_SIZE__>;
-                        no-map;
-                        status = "okay";
-                };
-        };
+/*
+	reserved-memory {
+		cmem_block_mem_0: cmem_block_mem@a0000000 {
+			reg = <0x0 0xa0000000 0x0 0x0a000000>;
+			no-map;
+			status = "okay";
+		};
+	};
+*/
 
-        cmem {
-                compatible = "ti,cmem";
-                #address-cells = <1>;
-                #size-cells = <0>;
+	cmem {
+		compatible = "ti,cmem";
+		#address-cells = <1>;
+		#size-cells = <0>;
 
-                status = "okay";
+		#pool-size-cells = <2>;
+
+		status = "disabled";
+/*
+		status = "okay";
 
                 cmem_block_0: cmem_block@0 {
                         reg = <0>;
                         memory-region = <&cmem_block_mem_0>;
-                        cmem-buf-pools = <1 0x__CMEM_SIZE__>;
+                        cmem-buf-pools = <1 0x0 0x0a000000>;
                 };
+*/
         };
-
 };

recipes-kernel/linux/files/dra7xx/cmem.dtsi

@@ -0,0 +1,26 @@
+/ {
+        reserved-memory {
+                cmem_block_mem_0: cmem_block_mem@a0000000 {
+                        reg = <0x0 0xa0000000 0x0 0x0a000000>;
+                        no-map;
+                        status = "okay";
+                };
+        };
+
+        cmem {
+                compatible = "ti,cmem";
+                #address-cells = <1>;
+                #size-cells = <0>;
+
+		#pool-size-cells = <2>;
+
+                status = "okay";
+
+                cmem_block_0: cmem_block@0 {
+                        reg = <0>;
+                        memory-region = <&cmem_block_mem_0>;
+                        cmem-buf-pools = <1 0x0 0x0a000000>;
+                };
+        };
+
+};

recipes-kernel/linux/files/k2hk-evm/cmem.dtsi

@@ -0,0 +1,54 @@
+/ {
+        reserved-memory {
+                mpm_block_mem_0: mpm_block_mem@820000000 {
+                        reg = <0x00000008 0x20000000 0x00000000 0x02000000>;
+                        no-map;
+                        status = "okay";
+                };
+
+                cmem_block_mem_0: cmem_block_mem@829000000 {
+                        reg = <0x00000008 0x29000000 0x00000000 0x17000000>;
+                        no-map;
+                        status = "okay";
+                };
+
+                cmem_block_mem_1: cmem_block_mem@00c100000 {
+                        reg = <0x00000000 0x0c100000 0x00000000 0x00480000>;
+                        no-map;
+                        status = "okay";
+                };
+
+                cmem_block_mem_2: cmem_block_mem@822000000 {
+                        reg = <0x00000008 0x22000000 0x00000000 0x07000000>;
+                        no-map;
+                        status = "okay";
+                };
+        };
+
+        cmem {
+                compatible = "ti,cmem";
+                #address-cells = <1>;
+                #size-cells = <0>;
+
+		#pool-size-cells = <2>;
+
+                status = "okay";
+
+                cmem_block_0: cmem_block@0 {
+                        reg = <0>;
+                        memory-region = <&cmem_block_mem_0>;
+                        cmem-buf-pools = <1 0x00000000 0x17000000>;
+                };
+
+                cmem_block_1: cmem_block@1 {
+                        reg = <1>;
+                        memory-region = <&cmem_block_mem_1>;
+                };
+
+                cmem_block_2: cmem_block@2 {
+                        reg = <2>;
+                        memory-region = <&cmem_block_mem_2>;
+                };
+        };
+
+};

recipes-kernel/linux/linux-keystone-rt_3.10.bb

@@ -10,7 +10,7 @@ inherit kernel
 require recipes-kernel/linux/linux-dtb.inc
 require recipes-kernel/linux/setup-defconfig.inc
 
-MACHINE_KERNEL_PR_append = "d"
+MACHINE_KERNEL_PR_append = "e"
 PR = "${MACHINE_KERNEL_PR}"
 
 KERNEL_DEVICETREE_k2hk-evm = "k2hk-evm.dtb"
@@ -19,11 +19,11 @@ KERNEL_DEVICETREE_k2l-evm = "k2l-evm.dtb"
 
 KERNEL_EXTRA_ARGS += "LOADADDR=${UBOOT_ENTRYPOINT}"
 
-#This commit corresponds to "K2_RT_LINUX_03.10.61_15.02"
-SRCREV = "e2e31a1d996d2ed8dd06dab1221e159033432b72"
-PV = "3.10.61+git${SRCPV}"
+#This commit corresponds to "K2_RT_LINUX_03.10.72_15.08"
+SRCREV = "dfe5ac2e9d7dba93fad48ca761933503dbdecae2"
+PV = "3.10.72+git${SRCPV}"
 
-BRANCH = "v3.10.61/master-rt"
+BRANCH = "v3.10.72/master-rt"
 SRC_URI = "git://git.ti.com/keystone-linux/linux.git;protocol=git;branch=${BRANCH}\
            file://defconfig\
            "

recipes-kernel/linux/linux-keystone_3.10.bb

@@ -10,7 +10,7 @@ inherit kernel
 require recipes-kernel/linux/linux-dtb.inc
 require recipes-kernel/linux/setup-defconfig.inc
 
-MACHINE_KERNEL_PR_append = "d"
+MACHINE_KERNEL_PR_append = "e"
 PR = "${MACHINE_KERNEL_PR}"
 
 KERNEL_DEVICETREE_k2hk-evm = "k2hk-evm.dtb"
@@ -19,11 +19,11 @@ KERNEL_DEVICETREE_k2l-evm = "k2l-evm.dtb"
 
 KERNEL_EXTRA_ARGS += "LOADADDR=${UBOOT_ENTRYPOINT}"
 
-#This commit corresponds to "K2_LINUX_03.10.61_15.02"
-SRCREV = "a17b4c3fd6c93f908daf032786f90c0321296957"
-PV = "3.10.61+git${SRCPV}"
+#This commit corresponds to "K2_LINUX_03.10.72_15.08"
+SRCREV = "ca334dedb5c234b1602d991d9b330360a5bc97ad"
+PV = "3.10.72+git${SRCPV}"
 
-BRANCH = "v3.10.61/master"
+BRANCH = "v3.10.72/master"
 SRC_URI = "git://git.ti.com/keystone-linux/linux.git;protocol=git;branch=${BRANCH}\
            file://defconfig\
            "

recipes-kernel/linux/linux-ti-staging-3.12/0001-Not-for-merge-ARM-config-omap-Disable-SMP-for-AM335x.patch

@@ -1,45 +0,0 @@
-From bd9c0b09db8798815cb577f82beebf7e6c03edcd Mon Sep 17 00:00:00 2001
-From: Santosh Shilimkar <santosh.shilimkar@ti.com>
-Date: Thu, 13 Feb 2014 08:52:41 -0500
-Subject: [PATCH] Not-for-merge: ARM: config: omap: Disable SMP for AM335x
- build
-
-SMP and SMP_ON_UP introduces some extra barriers and code many fast paths
-including kernel lock functions.
-
-Performance sensitive usecases like networking gets impacted because of this.
-In typical production kernel which is targeted for single core device
-like AM335x family, you don't want to take this hit.
-
-Ideally one should just create a device specific config feed as done by all
-typical distro's. Other option is to apply this specifically during build
-time using recipe.
-
-Whichever option, one definitely don't want this overhead for performance
-critical usecases.
-
-Disabling SMP in the build introduces one warining in cpuidle44xx.c driver
-and fix is included in the series
-
-Signed-off-by: Santosh Shilimkar <santosh.shilimkar@ti.com>
-Signed-off-by: Denys Dmytriyenko <denys@ti.com>
----
- arch/arm/configs/omap2plus_defconfig | 2 --
- 1 file changed, 2 deletions(-)
-
-diff --git a/arch/arm/configs/omap2plus_defconfig b/arch/arm/configs/omap2plus_defconfig
-index ff579a7..25217e3 100644
---- a/arch/arm/configs/omap2plus_defconfig
-+++ b/arch/arm/configs/omap2plus_defconfig
-@@ -36,8 +36,6 @@ CONFIG_OMAP4_ERRATA_I688=y
- CONFIG_ARM_THUMBEE=y
- CONFIG_ARM_ERRATA_411920=y
- CONFIG_PCIE_DRA7XX=y
--CONFIG_SMP=y
--CONFIG_NR_CPUS=2
- CONFIG_CMA=y
- CONFIG_PREEMPT_VOLUNTARY=y
- CONFIG_LEDS=y
--- 
-1.8.3.2
-