u-boot-ti-staging: update to ti2016.05-rc5 tag to fix am5 mmc issues

Signed-off-by: Denys Dmytriyenko <denys@ti.com>
linux/cmem: patch keystone dtsi files to co-exist with new sram driver
2026-01-12 01:20:20 +00:00 · 2016-11-18 11:30:33 -05:00 · 2016-11-18 11:28:50 -05:00 · 2016-11-16 14:39:02 -05:00 · 2016-11-16 14:32:39 -05:00 · 2016-11-16 14:32:32 -05:00
111 changed files with 758 additions and 465 deletions
--- a/2
+++ b/2
@@ -19,5 +19,7 @@ Please follow the recommended setup procedures of your OE distribution.


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

 Maintainers: Denys Dmytriyenko <denys@ti.com>
--- a/classes/ti-pdk.bbclass
+++ b/classes/ti-pdk.bbclass
@@ -3,14 +3,26 @@ require recipes-ti/includes/ti-staging.inc

 inherit perlnative

-DEPENDS = "ti-xdctools ti-cg-xml-native ti-sysbios common-csl-ip-rtos libxml-simple-perl-native gcc-arm-none-eabi-native"
+DEPENDS = "ti-xdctools ti-cg-xml-native ti-sysbios common-csl-ip-rtos libxml-simple-perl-native gcc-arm-none-eabi-native ti-cgt6x-native ti-pdk-build-rtos"

-DEPENDS_append_omap-a15 = " ti-cgt6x-native ti-ccsv6-native"
-DEPENDS_append_keystone = " ti-cgt6x-native"
+DEPENDS_append_omap-a15 = " ti-ccsv6-native"
+DEPENDS_remove_ti33x = "ti-cgt6x-native"
+DEPENDS_remove_ti43x = "ti-cgt6x-native"

 S = "${WORKDIR}/git"
 B = "${WORKDIR}/build"

+# HTML hyperlink text
+PDK_COMP_LINK_TEXT ?= ""
+
+DOC_FILE = "API_Documentation_${PN}.html"
+
+create_doc_link () {
+    PDK_COMP_DIR=`get_build_dir_bash`
+
+    echo "<a href=\"${PDK_COMP_DIR}/docs/doxygen/html/index.html\">${PDK_COMP_LINK_TEXT}</a>" >> ${D}${PDK_INSTALL_DIR_RECIPE}/packages/.extras/doc/${DOC_FILE}
+}
+
 get_build_dir_bash() {
  if [ -f ${S}/package.xdc ]
  then
@@ -36,6 +48,10 @@ export PDK_INSTALL_PATH = "${PDK_INSTALL_DIR}/packages"
 export XDCPATH = "${XDC_INSTALL_DIR}/packages;${SYSBIOS_INSTALL_DIR}/packages;${PDK_INSTALL_DIR}/packages"
 export SECTTI="perl ${CG_XML_INSTALL_DIR}/ofd/sectti.pl"

+XDCMAKE ?= "1"
+LIMSOCS ?= ""
+LIMBOARDS ?= ""
+
 PARALLEL_XDC = "--jobs=${BB_NUMBER_THREADS}"

 do_configure() {
@@ -43,24 +59,43 @@ do_configure() {

    mkdir -p ${BUILD_DIR}
    cp -r ${S}/* ${BUILD_DIR}
-    cd ${BUILD_DIR}

-    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/" {} \;
+    if [ "${XDCMAKE}" == "1" ]
+    then
+        cd ${BUILD_DIR}
+
+        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/" {} \;
+    fi
 }

 do_compile() {
-    ${XDC_INSTALL_DIR}/xdc clean ${PARALLEL_XDC} -PR .
-    ${XDC_INSTALL_DIR}/xdc all ${PARALLEL_XDC} XDCARGS="${XDCARGS}" ROOTDIR="${ROOTDIR}" -PR .
-    ${XDC_INSTALL_DIR}/xdc release XDCARGS="${XDCARGS}" -PR .
+
+    if [ "${XDCMAKE}" == "1" ]
+    then
+        ${XDC_INSTALL_DIR}/xdc clean ${PARALLEL_XDC} -PR .
+        ${XDC_INSTALL_DIR}/xdc all ${PARALLEL_XDC} XDCARGS="${XDCARGS}" ROOTDIR="${ROOTDIR}" -PR .
+        ${XDC_INSTALL_DIR}/xdc release XDCARGS="${XDCARGS}" -PR .
+    else
+        BUILD_DIR=${B}/`get_build_dir_bash`
+        cd ${BUILD_DIR}
+
+        make release LIMIT_SOCS="${LIMSOCS}" LIMIT_BOARDS="${LIMBOARDS}"
+    fi
 }

 do_install () {
    install -d ${D}${PDK_INSTALL_DIR_RECIPE}/packages
    find -name "*.tar" -exec tar xf {} -C ${D}${PDK_INSTALL_DIR_RECIPE}/packages \;
+    
+    if [ "${PDK_COMP_LINK_TEXT}" != "" ]
+    then
+        install -d ${D}${PDK_INSTALL_DIR_RECIPE}/packages/.extras/doc
+        create_doc_link
+    fi
 }

 FILES_${PN} += "${PDK_INSTALL_DIR_RECIPE}/packages"
--- a/conf/machine/am335x-evm.conf
+++ b/conf/machine/am335x-evm.conf
@@ -9,7 +9,7 @@ XSERVER += "xf86-input-tslib"
 MACHINE_GUI_CLASS = "smallscreen"
 MACHINE_FEATURES += "touchscreen"

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

 SERIAL_CONSOLE = ""
 SERIAL_CONSOLES = "115200;ttyS0 115200;ttyO0 115200;ttyS3 115200;ttyO3"
@@ -26,7 +26,7 @@ SERIAL_CONSOLES_CHECK = "${SERIAL_CONSOLES}"
 # UBI: logical eraseblock size:    126976 bytes
 # from ubiattach stdout:
 # UBI device number 0, total 1988 LEBs
-MKUBIFS_ARGS = "-F -m 2048 -e 126976 -c 4900"
+MKUBIFS_ARGS = "-F -m 2048 -e 126976 -c 5250"

 # do ubiattach /dev/ubi_ctrl -m 7 -O 2048
 # from dmesg:
--- a/conf/machine/am335x-hs-evm.conf
+++ b/conf/machine/am335x-hs-evm.conf
@@ -0,0 +1,14 @@
+#@TYPE: Machine
+#@NAME: AM335x HS EVM
+#@DESCRIPTION: Machine configuration for the TI AM435x HS EVM
+
+require conf/machine/am335x-evm.conf
+
+UBOOT_MACHINE = "am335x_hs_evm_mmc_config"
+
+UBOOT_ENTRYPOINT = "0x82000000"
+UBOOT_LOADADDRESS = "0x82000000"
+UBOOT_RD_LOADADDRESS = "0x84000000"
+UBOOT_RD_ENTRYPOINT = "0x84000000"
+
+TI_SECURE_DEV_PKG = "${TI_SECURE_DEV_PKG_CAT}/am3x"
--- a/conf/machine/am437x-evm.conf
+++ b/conf/machine/am437x-evm.conf
@@ -9,7 +9,7 @@ XSERVER += "xf86-input-tslib"
 MACHINE_GUI_CLASS = "smallscreen"
 MACHINE_FEATURES += "touchscreen"

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

 SERIAL_CONSOLE = ""
 SERIAL_CONSOLES = "115200;ttyS0 115200;ttyO0"
@@ -26,7 +26,7 @@ SERIAL_CONSOLES_CHECK = "${SERIAL_CONSOLES}"
 # UBI: logical eraseblock size:    253952 bytes
 # from ubiattach stdout:
 # UBI device number 0, total 994 LEBs
-MKUBIFS_ARGS = "-F -m 4096 -e 253952 -c 2300"
+MKUBIFS_ARGS = "-F -m 4096 -e 253952 -c 2450"

 # do ubiattach /dev/ubi_ctrl -m 11 -O 4096
 # from dmesg:
--- a/conf/machine/am437x-hs-evm.conf
+++ b/conf/machine/am437x-hs-evm.conf
@@ -5,3 +5,10 @@
 require conf/machine/am437x-evm.conf

 UBOOT_MACHINE = "am43xx_hs_evm_config"
+
+UBOOT_ENTRYPOINT = "0x82000000"
+UBOOT_LOADADDRESS = "0x82000000"
+UBOOT_RD_LOADADDRESS = "0x84000000"
+UBOOT_RD_ENTRYPOINT = "0x84000000"
+
+TI_SECURE_DEV_PKG = "${TI_SECURE_DEV_PKG_CAT}/am4x"
--- a/conf/machine/am57xx-evm.conf
+++ b/conf/machine/am57xx-evm.conf
@@ -6,7 +6,7 @@ require conf/machine/include/dra7xx.inc

 MACHINE_FEATURES += "touchscreen"

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

 SERIAL_CONSOLE = ""
 SERIAL_CONSOLES = "115200;ttyS2 115200;ttyO2"
--- a/conf/machine/am57xx-hs-evm.conf
+++ b/conf/machine/am57xx-hs-evm.conf
@@ -5,3 +5,14 @@
 require conf/machine/am57xx-evm.conf

 UBOOT_MACHINE = "am57xx_hs_evm_config"
+
+UBOOT_ENTRYPOINT = "0x82000000"
+UBOOT_LOADADDRESS = "0x82000000"
+UBOOT_RD_LOADADDRESS = "0x84000000"
+UBOOT_RD_ENTRYPOINT = "0x84000000"
+
+TI_SECURE_DEV_PKG = "${TI_SECURE_DEV_PKG_AUTO}"
+
+OPTEEMACHINE = "ti"
+OPTEEFLAVOR = "am57xx_evm"
+OPTEEOUTPUTMACHINE = "ti"
--- a/conf/machine/dra7xx-evm.conf
+++ b/conf/machine/dra7xx-evm.conf
@@ -6,7 +6,7 @@ require conf/machine/include/dra7xx.inc

 MACHINE_FEATURES += "touchscreen"

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

 SERIAL_CONSOLE = ""
 SERIAL_CONSOLES = "115200;ttyS0 115200;ttyO0"
--- a/conf/machine/dra7xx-hs-evm.conf
+++ b/conf/machine/dra7xx-hs-evm.conf
@@ -5,3 +5,14 @@
 require conf/machine/dra7xx-evm.conf

 UBOOT_MACHINE = "dra7xx_hs_evm_config"
+
+UBOOT_ENTRYPOINT = "0x82000000"
+UBOOT_LOADADDRESS = "0x82000000"
+UBOOT_RD_LOADADDRESS = "0x84000000"
+UBOOT_RD_ENTRYPOINT = "0x84000000"
+
+TI_SECURE_DEV_PKG = "${TI_SECURE_DEV_PKG_AUTO}"
+
+OPTEEMACHINE = "ti"
+OPTEEFLAVOR = "dra7_evm dra72_evm_revc dra71_evm"
+OPTEEOUTPUTMACHINE = "ti"
--- a/conf/machine/include/k2e.inc
+++ b/conf/machine/include/k2e.inc
@@ -0,0 +1,2 @@
+require conf/machine/include/keystone.inc
+SOC_FAMILY_append = ":k2e"
--- a/conf/machine/include/k2g.inc
+++ b/conf/machine/include/k2g.inc
@@ -0,0 +1,2 @@
+require conf/machine/include/keystone.inc
+SOC_FAMILY_append = ":k2g"
--- a/conf/machine/include/keystone.inc
+++ b/conf/machine/include/keystone.inc
@@ -1,7 +1,7 @@
 SOC_FAMILY = "keystone"
 require conf/machine/include/soc-family.inc

-DEFAULTTUNE ?= "cortexa15thf-neon"
+DEFAULTTUNE ?= "armv7athf-neon"
 require conf/machine/include/tune-cortexa15.inc

 PREFERRED_PROVIDER_virtual/kernel = "linux-ti-staging"
--- a/conf/machine/include/omap-a15.inc
+++ b/conf/machine/include/omap-a15.inc
@@ -1,7 +1,7 @@
 SOC_FAMILY = "omap-a15"
 require conf/machine/include/soc-family.inc

-DEFAULTTUNE ?= "cortexa15thf-neon"
+DEFAULTTUNE ?= "armv7athf-neon"
 require conf/machine/include/tune-cortexa15.inc

 # Increase this everytime you change something in the kernel
--- a/conf/machine/include/omap3.inc
+++ b/conf/machine/include/omap3.inc
@@ -1,7 +1,7 @@
 SOC_FAMILY = "omap3"
 require conf/machine/include/soc-family.inc

-DEFAULTTUNE ?= "cortexa8thf-neon"
+DEFAULTTUNE ?= "armv7athf-neon"
 require conf/machine/include/tune-cortexa8.inc

 PREFERRED_PROVIDER_virtual/xserver = "xserver-xorg"
--- a/conf/machine/include/omap4.inc
+++ b/conf/machine/include/omap4.inc
@@ -1,7 +1,7 @@
 SOC_FAMILY = "omap4"
 require conf/machine/include/soc-family.inc

-DEFAULTTUNE ?= "cortexa9thf-neon"
+DEFAULTTUNE ?= "armv7athf-neon"
 require conf/machine/include/tune-cortexa9.inc

 PREFERRED_PROVIDER_virtual/kernel = "linux-ti-staging"
--- a/conf/machine/include/ti33x.inc
+++ b/conf/machine/include/ti33x.inc
@@ -1,7 +1,7 @@
 SOC_FAMILY = "ti33x"
 require conf/machine/include/soc-family.inc

-DEFAULTTUNE ?= "cortexa8thf-neon"
+DEFAULTTUNE ?= "armv7athf-neon"
 require conf/machine/include/tune-cortexa8.inc

 PREFERRED_PROVIDER_virtual/xserver = "xserver-xorg"
--- a/conf/machine/include/ti43x.inc
+++ b/conf/machine/include/ti43x.inc
@@ -1,7 +1,7 @@
 SOC_FAMILY = "ti43x"
 require conf/machine/include/soc-family.inc

-DEFAULTTUNE ?= "cortexa9thf-neon"
+DEFAULTTUNE ?= "armv7athf-neon"
 require conf/machine/include/tune-cortexa9.inc

 PREFERRED_PROVIDER_virtual/xserver = "xserver-xorg"
--- a/conf/machine/k2e-evm.conf
+++ b/conf/machine/k2e-evm.conf
@@ -2,7 +2,7 @@
 #@NAME: Keystone 2 K2E machine
 #@DESCRIPTION: Machine configuration for the TI Keystone 2 K2E EVM

-require conf/machine/include/keystone.inc
+require conf/machine/include/k2e.inc

 MACHINE_FEATURES += "opencl"

@@ -10,7 +10,7 @@ UBOOT_MACHINE = "k2e_evm_config"

 BOOT_MONITOR_MAKE_TARGET = "k2e"

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

 SERIAL_CONSOLE = ""
 SERIAL_CONSOLES = "115200;ttyS0 115200;ttyO0"
--- a/conf/machine/k2e-hs-evm.conf
+++ b/conf/machine/k2e-hs-evm.conf
@@ -0,0 +1,14 @@
+#@TYPE: Machine
+#@NAME: Keystone 2 K2E HS EVM
+#@DESCRIPTION: Machine configuration for the TI Keystone 2 K2E HS EVM
+
+require conf/machine/k2e-evm.conf
+
+UBOOT_MACHINE = "k2e_hs_evm_config"
+
+UBOOT_ENTRYPOINT = "0x82000000"
+UBOOT_LOADADDRESS = "0x82000000"
+UBOOT_RD_LOADADDRESS = "0x84000000"
+UBOOT_RD_ENTRYPOINT = "0x84000000"
+
+TI_SECURE_DEV_PKG = "${TI_SECURE_DEV_PKG_CAT}/k2e"
--- a/conf/machine/k2g-evm.conf
+++ b/conf/machine/k2g-evm.conf
@@ -2,7 +2,7 @@
 #@NAME: Keystone 2 K2G machine
 #@DESCRIPTION: Machine configuration for the TI Keystone 2 K2G EVM

-require conf/machine/include/keystone.inc
+require conf/machine/include/k2g.inc

 MACHINE_FEATURES += "alsa opencl"

@@ -10,7 +10,7 @@ UBOOT_MACHINE = "k2g_evm_config"

 BOOT_MONITOR_MAKE_TARGET = "k2g"

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

 SERIAL_CONSOLE = ""
 SERIAL_CONSOLES = "115200;ttyS0 115200;ttyO0"
--- a/conf/machine/k2g-ice.conf
+++ b/conf/machine/k2g-ice.conf
@@ -0,0 +1,7 @@
+#@TYPE: Machine
+#@NAME: Keystone 2 K2G ICE machine
+#@DESCRIPTION: Machine configuration for the TI Keystone 2 K2G ICE
+
+require conf/machine/k2g-evm.conf
+
+UBOOT_MACHINE = "k2g_ice_config"
--- a/conf/machine/k2hk-evm.conf
+++ b/conf/machine/k2hk-evm.conf
@@ -10,7 +10,7 @@ UBOOT_MACHINE = "k2hk_evm_config"

 BOOT_MONITOR_MAKE_TARGET = "k2hk"

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

 SERIAL_CONSOLE = ""
 SERIAL_CONSOLES = "115200;ttyS0 115200;ttyO0"
--- a/conf/machine/k2l-evm.conf
+++ b/conf/machine/k2l-evm.conf
@@ -10,7 +10,7 @@ UBOOT_MACHINE = "k2l_evm_config"

 BOOT_MONITOR_MAKE_TARGET = "k2l"

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

 SERIAL_CONSOLE = ""
 SERIAL_CONSOLES = "115200;ttyS0 115200;ttyO0"
--- a/recipes-bsp/boot-monitor/boot-monitor_git.bb
+++ b/recipes-bsp/boot-monitor/boot-monitor_git.bb
@@ -5,16 +5,17 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=25fe219a6febf6e5bb45beda1b2eb315"
 COMPATIBLE_MACHINE = "keystone"
 PACKAGE_ARCH = "${MACHINE_ARCH}"

+DEPENDS = "u-boot-mkimage-native"
+
 SRC_URI = "git://git.ti.com/processor-firmware/ks2-boot-monitor.git;protocol=git;branch=${BRANCH}"

-PV = "3.0+git${SRCPV}"
-PR = "r1"
+PV = "4.0+git${SRCPV}"

 BRANCH = "master"

 S = "${WORKDIR}/git"

-SRCREV = "035329caed63abe7193c855ad5d561ae783b19d7"
+SRCREV = "cf8b431e8b3b2ee4a4aa08964d56d3ce1b11da24"

 BOOT_MONITOR_IMAGE  ?= "skern-${BOOT_MONITOR_MAKE_TARGET}.bin"

--- a/recipes-bsp/cm3-pm-firmware/am33x-cm3_git.bb
+++ b/recipes-bsp/cm3-pm-firmware/am33x-cm3_git.bb
@@ -1,29 +0,0 @@
-DESCRIPTION = "Cortex-M3 binary blob for suspend-resume"
-
-LICENSE = "TI-TSPA"
-LIC_FILES_CHKSUM = "file://License.txt;md5=7bdc54a749ab7a7dea999d25d99a41b8"
-
-PV = "1.9.0"
-PR = "r1"
-PE = "1"
-
-SRCREV = "d85e6a17da1025adac9ab7f97dd7aa2a58c517ce"
-BRANCH ?= "ti-v3.14.y"
-
-SRC_URI = "git://git.ti.com/processor-firmware/ti-amx3-cm3-pm-firmware.git;protocol=git;branch=${BRANCH}"
-
-S = "${WORKDIR}/git"
-
-FLOATABI = "${@bb.utils.contains("TUNE_FEATURES", "vfp", bb.utils.contains("TUNE_FEATURES", "callconvention-hard", " -mfloat-abi=hard", " -mfloat-abi=softfp", d), "" ,d)}"
-
-do_compile() {
-	make CROSS_COMPILE="${TARGET_PREFIX}" CC="${TARGET_PREFIX}gcc ${TOOLCHAIN_OPTIONS} ${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"
--- a/recipes-bsp/cm3-pm-firmware/amx3-cm3_git.bb
+++ b/recipes-bsp/cm3-pm-firmware/amx3-cm3_git.bb
@@ -3,10 +3,10 @@ DESCRIPTION = "Cortex-M3 binary blob for suspend-resume"
 LICENSE = "TI-TSPA"
 LIC_FILES_CHKSUM = "file://License.txt;md5=7bdc54a749ab7a7dea999d25d99a41b8"

-PV = "1.9.1"
-PR = "r3"
+PV = "1.9.2"
+PR = "r0"

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

 SRC_URI = "git://git.ti.com/processor-firmware/ti-amx3-cm3-pm-firmware.git;protocol=git;branch=${BRANCH}"
--- a/recipes-bsp/cmem/cmem.inc
+++ b/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 ?= "lu-next"
-# This corresponds to version 4.11.00.00_eng
-SRCREV = "852e97b5584cbdb6aa0fdef02a7c4e245409bcb6"
+BRANCH = "master"
+# This corresponds to version 4.12.00.00
+SRCREV = "d6d3e84c84d0e84a9b96c3f6f789ac642d03afcb"

-PV = "4.11.00.00+git${SRCPV}"
+PV = "4.12.00.00+git${SRCPV}"

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

--- a/recipes-bsp/common-csl-ip/common-csl-ip-rtos_git.bb
+++ b/recipes-bsp/common-csl-ip/common-csl-ip-rtos_git.bb
@@ -1,5 +1,5 @@
 require common-csl-ip.inc
-PR = "${INC_PR}.2"
+PR = "${INC_PR}.4"

 PACKAGE_ARCH = "${MACHINE_ARCH}"

@@ -7,20 +7,16 @@ inherit ti-pdk

 DEPENDS_remove = "${PN}"

-XDCARGS_ti33x = "am335x"
-XDCARGS_ti43x = "am437x"
-XDCARGS_omap-a15 = "am571x am572x"
-XDCARGS_k2hk-evm = "k2h k2k"
-XDCARGS_k2l-evm = "k2l"
-XDCARGS_k2e-evm = "k2e"
-XDCARGS_k2g-evm = "k2g"
+# Build with make instead of XDC
+XDCMAKE = "0"

-do_configure_append() {
-    # Create empty makefile
-    # If libraries are supported for this device, then this will be overwritten
-    cat > ${BUILD_DIR}/makefile << __EOF__
-# Nothing to do
-all:
+LIMSOCS_ti33x = "am335x"
+LIMSOCS_ti43x = "am437x"
+LIMSOCS_omap-a15 = "am571x am572x"
+LIMSOCS_k2hk-evm = "k2h k2k"
+LIMSOCS_k2l-evm = "k2l"
+LIMSOCS_k2e = "k2e"
+LIMSOCS_k2g = "k2g"

-__EOF__
-}
+export PDK_CSL_ROOT_PATH ="${WORKDIR}/build"
+export DEST_ROOT="${S}"
--- a/recipes-bsp/common-csl-ip/common-csl-ip.inc
+++ b/recipes-bsp/common-csl-ip/common-csl-ip.inc
@@ -4,7 +4,7 @@ LIC_FILES_CHKSUM = "file://COPYING.txt;md5=5857833e20836213677fac33f9aded21"

 COMPATIBLE_MACHINE = "keystone|dra7xx"

-PV = "3.3.0.2C"
+PV = "03.03.00.04B"
 INC_PR = "r0"

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

-# commit ID corresponds to DEV.CSL_PROCESSOR-SDK.03.03.00.02C
-CSL_SRCREV = "dc8aac00e86cd434865d750666ac551f2e238263"
+# Below commit ID corresponds to "DEV.CSL_PROCESSOR-SDK.03.03.00.04B"
+CSL_SRCREV = "a74dc132a21085214b49c3ae8884825d87b6dd2f"

 BRANCH="${CSL_GIT_BRANCH}"
 SRC_URI = "${CSL_GIT_URI};protocol=${CSL_GIT_PROTOCOL};branch=${BRANCH};destsuffix=${CSL_GIT_DESTSUFFIX}"
--- a/recipes-bsp/cppi-lld/cppi-lld-rtos_git.bb
+++ b/recipes-bsp/cppi-lld/cppi-lld-rtos_git.bb
@@ -8,6 +8,6 @@ DEPENDS_append = " rm-lld-rtos \
 "

 XDCARGS_k2hk-evm = "k2h k2k"
-XDCARGS_k2e-evm = "k2e"
+XDCARGS_k2e = "k2e"
 XDCARGS_k2l-evm = "k2l"
-XDCARGS_k2g-evm = "k2g"
+XDCARGS_k2g = "k2g"
--- a/recipes-bsp/cppi-lld/cppi-lld.inc
+++ b/recipes-bsp/cppi-lld/cppi-lld.inc
@@ -22,6 +22,6 @@ INC_PR = "r1"
 DEVICELIST = "k2h k2k k2l k2e"
 DEVICELIST_k2hk-evm = "k2h k2k"
 DEVICELIST_k2l-evm  = "k2l"
-DEVICELIST_k2e-evm  = "k2e"
+DEVICELIST_k2e  = "k2e"

 S = "${WORKDIR}/${CPPI_LLD_GIT_DESTSUFFIX}"
--- a/recipes-bsp/dfe-lld/dfe-lld.inc
+++ b/recipes-bsp/dfe-lld/dfe-lld.inc
@@ -7,14 +7,14 @@ 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.07
-DFE_LLD_SRCREV = "7a85310ee5e406f50a4c118610e07aade7d3cee2"
+# Below commit ID corresponds to "DEV.DFE_LLD.01.00.00.08"
+DFE_LLD_SRCREV = "d51482ef18889bbbd8e9cdc207c6fe9e27b1ab03"

 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.7"
+PV = "1.0.0.8"
 INC_PR = "r0"

 COMPATIBLE_MACHINE = "k2l-evm"
--- a/recipes-bsp/dsptop/debugss-module-drv_git.bb
+++ b/recipes-bsp/dsptop/debugss-module-drv_git.bb
@@ -14,7 +14,7 @@ inherit module
 PLATFORM = ""
 PLATFORM_dra7xx = "DRA7xx_PLATFORM"
 PLATFORM_keystone = "KEYSTONE_PLATFORM"
-PLATFORM_k2e-evm = "K2E_PLATFORM"
+PLATFORM_k2e = "K2E_PLATFORM"

 EXTRA_OEMAKE = "'PLATFORM=${PLATFORM}' KVERSION=${KERNEL_VERSION} KERNEL_SRC=${STAGING_KERNEL_DIR}"

--- a/recipes-bsp/dsptop/dsptop.inc
+++ b/recipes-bsp/dsptop/dsptop.inc
@@ -1,6 +1,6 @@
-# This corresponds to version 1.3.0
-SRCREV = "4d92879b632ba70402b61fa65cc58f5373eb5217"
-PV = "1.3.0"
+# This corresponds to version 1.4.0
+SRCREV = "0aedcabdbbcbfc7558f70fc50afc95583302a087"
+PV = "1.4.0"
 INC_PR = "r0"

 SRC_URI = "git://git.ti.com/sdo-emu/dsptop.git;protocol=git;branch=${BRANCH}"
--- a/recipes-bsp/dsptop/libulm_git.bb
+++ b/recipes-bsp/dsptop/libulm_git.bb
@@ -14,7 +14,7 @@ DEVICE_keystone = "C66AK2Hxx"
 EXTRA_OEMAKE = "release DEVICE=${DEVICE} CROSS_COMPILE=${TARGET_PREFIX}"

 do_compile() {
-    oe_runmake arm XPORT_ONLY
+    oe_runmake arm XPORT_ONLY CC="${CC}"
    oe_runmake dsp C6X_C_DIR=${STAGING_DIR_NATIVE}/usr/share/ti/cgt-c6x/include
 }

--- a/recipes-bsp/edma3-lld/edma3-lld-rtos_git.bb
+++ b/recipes-bsp/edma3-lld/edma3-lld-rtos_git.bb
@@ -103,7 +103,6 @@ do_compile () {
            make PLATFORM=${p} TARGET=${t} FORMAT=${FORMAT}
        done
    done
-    sourceipk_do_create_srcipk
 }

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

-# The following commit corresponds to tag DEV_EDMA3_LLD_02_12_01_23A
-EDMA3_LLD_SRCREV = "84c84a82332b30ece3b00f7d769270466ae836e0"
+# Below commit ID corresponds to tag "DEV_EDMA3_LLD_02_12_01_25A"
+EDMA3_LLD_SRCREV = "b2d61c61dd048bdea35e9b2810647b4d419a82b5"

 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.23"
+PV = "2.12.01.25A"
 INC_PR = "r0"
--- a/recipes-bsp/gc320-drivers/ti-gc320-driver_5.0.11.p7.bb
+++ b/recipes-bsp/gc320-drivers/ti-gc320-driver_5.0.11.p7.bb
@@ -0,0 +1,24 @@
+DESCRIPTION = "Kernel drivers for the Vivante GC320 chipset found in TI SoCs"
+HOMEPAGE = "https://git.ti.com/graphics/ti-gc320-driver"
+LICENSE = "MIT | GPLv2"
+LIC_FILES_CHKSUM = "file://../LICENSE;md5=78d9818a51b9a8e9bb89dea418bac297"
+
+inherit module
+
+MACHINE_KERNEL_PR_append = "a"
+PR = "${MACHINE_KERNEL_PR}"
+
+# Need to branch out with ${PV} var
+BRANCH = "ti-${PV}-k4.4"
+
+SRCREV = "7a2b06ad1df46a274336f7ae0e24a9d67e72cd66"
+
+SRC_URI = "git://git.ti.com/graphics/ti-gc320-driver.git;protocol=git;branch=${BRANCH}"
+S = "${WORKDIR}/git/src"
+
+EXTRA_OEMAKE += "-f Kbuild AQROOT=${S} KERNEL_DIR=${STAGING_KERNEL_DIR} TOOLCHAIN_PATH=${TOOLCHAIN_PATH} CROSS_COMPILE=${TARGET_PREFIX} ARCH_TYPE=${TARGET_ARCH}"
+
+do_install() {
+    install -d ${D}/${base_libdir}/modules/${KERNEL_VERSION}/extra
+    install -m 644 ${S}/galcore.ko ${D}/${base_libdir}/modules/${KERNEL_VERSION}/extra
+}
--- a/recipes-bsp/hplib/hplib.inc
+++ b/recipes-bsp/hplib/hplib.inc
@@ -3,18 +3,18 @@ PACKAGE_ARCH = "${MACHINE_ARCH}"

 DEVICELIST_k2hk-evm = "k2h k2k"
 DEVICELIST_k2l-evm  = "k2l"
-DEVICELIST_k2e-evm  = "k2e"
+DEVICELIST_k2e  = "k2e"

 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.07"
-HPLIB_SRCREV = "74dde26bfcdeb248fae29eb883ac78db89263f9f"
+# Below Commit ID corresponds to "DEV.HPLIB.01.01.00.08"
+HPLIB_SRCREV = "5e9b27854f5d6f9f37a0ed8d7516d4874427cd8b"

 BRANCH = "${HPLIB_GIT_BRANCH}"
 SRC_URI = "${HPLIB_GIT_URI};protocol=${HPLIB_GIT_PROTOCOL};branch=${BRANCH}"
 SRCREV = "${HPLIB_SRCREV}"

-PV = "01.01.00.07+git${SRCPV}"
+PV = "01.01.00.08+git${SRCPV}"
 INC_PR = "r0"
--- a/recipes-bsp/hyplnk-lld/hyplnk-lld.inc
+++ b/recipes-bsp/hyplnk-lld/hyplnk-lld.inc
@@ -1,7 +1,7 @@
 DESCRIPTION = "TI Hyperlink Low Level Driver"
 LICENSE = "BSD-3-Clause"

-COMPATIBLE_MACHINE = "k2hk-evm|k2e-evm"
+COMPATIBLE_MACHINE = "k2hk-evm|k2e"
 PACKAGE_ARCH = "${MACHINE_ARCH}"

 LLDNAME="hyplnk"
@@ -24,6 +24,6 @@ PV = "2.1.0.6"
 INC_PR = "r0"

 DEVICELIST_k2hk-evm = "k2h k2k"
-DEVICELIST_k2e-evm  = "k2e"
+DEVICELIST_k2e  = "k2e"

 S = "${WORKDIR}/${HYPLNK_GIT_DESTSUFFIX}"
--- a/recipes-bsp/ipumm-fw/ipumm-fw_3.00.08.02.bb
+++ b/recipes-bsp/ipumm-fw/ipumm-fw_3.00.08.02.bb
@@ -1,35 +0,0 @@
-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"
--- a/recipes-bsp/ipumm-fw/ipumm-fw_git.bb
+++ b/recipes-bsp/ipumm-fw/ipumm-fw_git.bb
@@ -9,7 +9,7 @@ python __anonymous() {
 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"
+LIC_FILES_CHKSUM = "file://Texas_Instruments_ipumm_Manifest.pdf;md5=e3e7d6efc7aca87789775198c4ca9f8e"

 COMPATIBLE_MACHINE = "dra7xx"

@@ -17,11 +17,12 @@ RDEPENDS_${PN} = " libdce"

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

-SRCREV = "1627fec802da688fe44c6b0cac43ff811b08f064"
+SRCREV = "cd93550ed32c7849de91288e7d90cba3bd89614b"

 S = "${WORKDIR}/git"

-PV = "3.00.10.01"
+PV = "3.00.12.00"
+PR = "r0"

 require recipes-ti/includes/ti-paths.inc
 require recipes-ti/includes/ti-staging.inc
@@ -53,10 +54,12 @@ do_compile() {
 }

 TARGET = "dra7-ipu2-fw.xem4"
+TARGET_MAP = "platform/ti/dce/baseimage/package/cfg/out/ipu/release/ipu.xem4.map"

 do_install() {
    install -d ${D}${base_libdir}/firmware
    install -m 0644 ${S}/${TARGET} ${D}${base_libdir}/firmware/${TARGET}.${BPN}
+    install -m 0644 ${S}/${TARGET_MAP} ${D}${base_libdir}/firmware/${TARGET}.map
 }

 ALTERNATIVE_${PN} = "dra7-ipu2-fw.xem4"
@@ -65,5 +68,3 @@ ALTERNATIVE_TARGET[dra7-ipu2-fw.xem4] = "${base_libdir}/firmware/${TARGET}.${BPN
 ALTERNATIVE_PRIORITY = "20"

 FILES_${PN} += "${base_libdir}/firmware/*"
-
-PR = "r1"
--- a/recipes-bsp/mmap-lld/mmap-lld-test_git.bb
+++ b/recipes-bsp/mmap-lld/mmap-lld-test_git.bb
@@ -9,9 +9,9 @@ DEPENDS="common-csl-ip mmap-lld"
 RDEPENDS_${PN}="uio-module-drv"

 DEVICELIST_k2hk-evm = "k2h k2k"
-DEVICELIST_k2e-evm  = "k2e"
-DEVICELIST_k2l-evm  = "k2l"
-DEVICELIST_k2g-evm  = "k2g"
+DEVICELIST_k2e = "k2e"
+DEVICELIST_k2l-evm = "k2l"
+DEVICELIST_k2g = "k2g"

 CHOICELIST = " yes \
               no \
--- a/recipes-bsp/netcp-pa-fw/netcp-pa-fw_git.bb
+++ b/recipes-bsp/netcp-pa-fw/netcp-pa-fw_git.bb
@@ -8,7 +8,7 @@ PR = "r0"

 CLEANBROKEN = "1"

-COMPATIBLE_MACHINE = "k2hk-evm|k2l-evm|k2e-evm"
+COMPATIBLE_MACHINE = "k2hk-evm|k2l-evm|k2e"

 PACKAGE_ARCH = "${MACHINE_ARCH}"

--- a/recipes-bsp/nwal-lld/nwal-lld.inc
+++ b/recipes-bsp/nwal-lld/nwal-lld.inc
@@ -23,6 +23,6 @@ S = "${BASEDIR}/ti/drv/nwal"

 DEVICELIST_k2hk-evm = "k2h k2k"
 DEVICELIST_k2l-evm  = "k2l"
-DEVICELIST_k2e-evm  = "k2e"
+DEVICELIST_k2e  = "k2e"

 CHOICELIST = "yes no"
--- a/recipes-bsp/pa-lld/files/0001-makefile_armv7-fix-missing-separator-error.patch
+++ b/recipes-bsp/pa-lld/files/0001-makefile_armv7-fix-missing-separator-error.patch
@@ -1,30 +0,0 @@
-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
-
--- a/recipes-bsp/pa-lld/pa-lld.inc
+++ b/recipes-bsp/pa-lld/pa-lld.inc
@@ -9,25 +9,24 @@ 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.08A"
-PA_LLD_SRCREV = "9294e42fd5763555c28e46b51246bab439fd552e"
+# Below Commit ID corresponds to "DEV.PA_LLD.03.00.02.00"
+PA_LLD_SRCREV = "dca2a281c0c57f3b3018a93fae5485825a33042c"

 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"
+SRC_URI = "${PA_LLD_GIT_URI};destsuffix=${PA_LLD_GIT_DESTSUFFIX};protocol=${PA_LLD_GIT_PROTOCOL};branch=${BRANCH}"
 SRCREV = "${PA_LLD_SRCREV}"

-PV = "03.00.01.08"
-INC_PR = "r1"
+PV = "03.00.02.00"
+INC_PR = "r0"

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

 DEVICELIST = "k2h k2k k2l k2e"
 DEVICELIST_k2hk-evm = "k2h k2k"
 DEVICELIST_k2l-evm = "k2l"
-DEVICELIST_k2e-evm = "k2e"
+DEVICELIST_k2e = "k2e"

 LIBPA = "libpa"
 LIBPA_k2hk-evm = "libpa"
-LIBPA_k2e-evm = "libpa2"
+LIBPA_k2e = "libpa2"
 LIBPA_k2l-evm = "libpa2"
--- a/recipes-bsp/pktlib/pktlib-rtos_git.bb
+++ b/recipes-bsp/pktlib/pktlib-rtos_git.bb
@@ -9,5 +9,5 @@ DEPENDS_append = " rm-lld-rtos \
 "

 XDCARGS_k2hk-evm = "k2h k2k"
-XDCARGS_k2e-evm = "k2e"
+XDCARGS_k2e = "k2e"
 XDCARGS_k2l-evm = "k2l"
--- a/recipes-bsp/powervr-drivers/ti-sgx-ddk-km_1.14.3699939.bb
+++ b/recipes-bsp/powervr-drivers/ti-sgx-ddk-km_1.14.3699939.bb
@@ -25,12 +25,14 @@ BRANCH = "ti-img-sgx/${PV}/k4.4"
 SRC_URI = "git://git.ti.com/graphics/omap5-sgx-ddk-linux.git;protocol=git;branch=${BRANCH}"
 S = "${WORKDIR}/git"

-SRCREV = "c8d280c2842bf4b1fdc63f5efd89595807c0a254"
+SRCREV = "e68719ba7c54602c710b6615cd665f5b7f47f85e"

 TARGET_PRODUCT_omap-a15 = "jacinto6evm"
 TARGET_PRODUCT_ti33x = "ti335x"
 TARGET_PRODUCT_ti43x = "ti437x"

+PARALLEL_MAKE = ""
+
 EXTRA_OEMAKE += 'KERNELDIR="${STAGING_KERNEL_DIR}" TARGET_PRODUCT=${TARGET_PRODUCT}'

 do_compile_prepend() {
--- a/recipes-bsp/pru/pru-icss_git.bb
+++ b/recipes-bsp/pru/pru-icss_git.bb
@@ -2,20 +2,20 @@ 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-v5.0-Manifest.html;md5=eec933459cb42544706e35289de38e03"
+LIC_FILES_CHKSUM = "file://PRU-Package-v5.0-Manifest.html;md5=a86a37c8b6396ad0ad6ae752f1aa8fcc"

 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 = "913cf232ebe655603d3385de2b9cde4af7af5308"
+SRCREV = "4efd227bebd8eb0bc12f40fac043dc9c26d4f8c3"

-PV = "5.0.0"
-PR = "r0"
+PV = "5.1.0"
+PR = "r1"

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

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

 PACKAGES_prepend = " \
@@ -39,7 +39,7 @@ SUBDIRS = "examples pru_cape/pru_fw lib/src labs"
 PLATFORM_ti33x = "am335x"
 PLATFORM_ti43x = "am437x"
 PLATFORM_omap-a15 = "am572x"
-PLATFORM_k2g-evm = "k2g"
+PLATFORM_k2g = "k2g"

 do_compile() {
    for dir in ${SUBDIRS}
@@ -84,7 +84,7 @@ do_install_append_omap-a15() {
    done
 }

-do_install_append_k2g-evm() {
+do_install_append_k2g() {
    for i in 0 1
    do
        for j in 0 1
@@ -102,7 +102,7 @@ FILES_${PN}-rpmsg-echo = "/lib/firmware/pru/PRU_RPMsg_Echo_Interrupt*"
 PRU_ICSS_ALTERNATIVES_ti33x    = "am335x-pru0-fw am335x-pru1-fw"
 PRU_ICSS_ALTERNATIVES_ti43x    = "am437x-pru0_0-fw am437x-pru0_1-fw am437x-pru1_0-fw am437x-pru1_1-fw"
 PRU_ICSS_ALTERNATIVES_omap-a15 = "am57xx-pru1_0-fw am57xx-pru1_1-fw am57xx-pru2_0-fw am57xx-pru2_1-fw"
-PRU_ICSS_ALTERNATIVES_k2g-evm  = "k2g-pru0_0-fw k2g-pru0_1-fw k2g-pru1_0-fw k2g-pru1_1-fw"
+PRU_ICSS_ALTERNATIVES_k2g      = "k2g-pru0_0-fw k2g-pru0_1-fw k2g-pru1_0-fw k2g-pru1_1-fw"

 # Set up link names for the firmwares
 ALTERNATIVE_LINK_NAME[am335x-pru0-fw] = "/lib/firmware/am335x-pru0-fw"
--- a/recipes-bsp/prueth-fw/prueth-fw_git.bb
+++ b/recipes-bsp/prueth-fw/prueth-fw_git.bb
@@ -1,21 +1,18 @@
-DESCRIPTION = "PRU Ethernet firmware for AM57xx, AM437x and AM335x"
+DESCRIPTION = "PRU Ethernet firmware for AM57xx, AM437x, AM335x and K2G"

 LICENSE = "TI-TFL"
 LIC_FILES_CHKSUM = "file://LICENSE.ti;md5=b5aebf0668bdf95621259288c4a46d76"

-PV_am57xx-evm = "1.0.0"
-PV_am437x-evm = "2.1.2"
-PV_am335x-evm = "2.1.2"
-
-PR = "r2"
+PV = "3.1.4"
+PR = "r1"

 CLEANBROKEN = "1"

-COMPATIBLE_MACHINE = "am57xx-evm|am437x-evm|am335x-evm"
+COMPATIBLE_MACHINE = "am57xx-evm|am437x-evm|am335x-evm|k2g"

 PACKAGE_ARCH = "${MACHINE_ARCH}"

-SRCREV = "4096bf1129c4a707069e685edd44ca64bd51421d"
+SRCREV = "4ed1022c62bfe4ed4c66112024c8ee1301e9439d"
 BRANCH ?= "ti-linux-firmware-4.1.y"

 SRC_URI = "git://git.ti.com/processor-firmware/ti-linux-firmware.git;protocol=git;branch=${BRANCH}"
@@ -25,6 +22,7 @@ S = "${WORKDIR}/git"
 TARGET_am57xx-evm = "am57xx-pru0-prueth-fw.elf am57xx-pru1-prueth-fw.elf"
 TARGET_am437x-evm = "am437x-pru0-prueth-fw.elf am437x-pru1-prueth-fw.elf"
 TARGET_am335x-evm = "am335x-pru0-prueth-fw.elf am335x-pru1-prueth-fw.elf"
+TARGET_k2g = "k2g-pru0-prueth-fw.elf k2g-pru1-prueth-fw.elf"

 do_install() {
 	install -d ${D}${base_libdir}/firmware/ti-pruss
--- a/recipes-bsp/qmss-lld/qmss-lld-rtos_git.bb
+++ b/recipes-bsp/qmss-lld/qmss-lld-rtos_git.bb
@@ -8,5 +8,5 @@ DEPENDS_append = " rm-lld-rtos"

 XDCARGS_k2hk-evm = "k2h k2k"
 XDCARGS_k2l-evm = "k2l"
-XDCARGS_k2e-evm = "k2e"
-XDCARGS_k2g-evm = "k2g"
+XDCARGS_k2e = "k2e"
+XDCARGS_k2g = "k2g"
--- a/recipes-bsp/qmss-lld/qmss-lld.inc
+++ b/recipes-bsp/qmss-lld/qmss-lld.inc
@@ -9,19 +9,19 @@ 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.14A
-QMSS_LLD_SRCREV = "8fc6a846e509d6ad8499e1de68abd912d7947069"
+# commit ID corresponding to "DEV.QMSS_LLD.02.01.00.14B"
+QMSS_LLD_SRCREV = "04095405680f4ec92eeef9312ba04f7808b1c813"

 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.14"
-INC_PR = "r1"
+PV = "02.01.00.14B"
+INC_PR = "r0"

 DEVICELIST = "k2h k2k k2l k2e"
 DEVICELIST_k2hk-evm = "k2h k2k"
 DEVICELIST_k2l-evm = "k2l"
-DEVICELIST_k2e-evm = "k2e"
+DEVICELIST_k2e = "k2e"

 S = "${WORKDIR}/${QMSS_LLD_GIT_DESTSUFFIX}"
--- a/recipes-bsp/rm-lld/rm-lld-rtos_git.bb
+++ b/recipes-bsp/rm-lld/rm-lld-rtos_git.bb
@@ -7,6 +7,6 @@ PR = "${INC_PR}.0"
 PACKAGE_ARCH = "${MACHINE_ARCH}"

 XDCARGS_k2hk-evm = "k2h k2k"
-XDCARGS_k2e-evm = "k2e"
+XDCARGS_k2e = "k2e"
 XDCARGS_k2l-evm = "k2l"
-XDCARGS_k2g-evm = "k2g"
+XDCARGS_k2g = "k2g"
--- a/recipes-bsp/rm-lld/rm-lld.inc
+++ b/recipes-bsp/rm-lld/rm-lld.inc
@@ -7,15 +7,15 @@ 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.02.00.01
-RM_LLD_SRCREV = "841f2df9726f456d6c026c0aa03095699962d048"
+# Below commit ID corresponds to "DEV.RM_LLD.02.02.00.02"
+RM_LLD_SRCREV = "6165053f88d1ccb5083f797d24800d5400804647"

 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.02.00.01"
-INC_PR = "r0"
+PV = "02.02.00.02"
+INC_PR = "r1"

 COMPATIBLE_MACHINE = "keystone"

--- a/recipes-bsp/sa-lld/sa-lld-test_git.bb
+++ b/recipes-bsp/sa-lld/sa-lld-test_git.bb
@@ -10,7 +10,7 @@ PACKAGE_ARCH = "${MACHINE_ARCH}"

 DEVICELIST_k2hk-evm = "k2h k2k"
 DEVICELIST_k2l-evm  = "k2l"
-DEVICELIST_k2e-evm  = "k2e"
+DEVICELIST_k2e  = "k2e"

 CHOICELIST = "no yes"

--- a/recipes-bsp/sa-lld/sa-lld.inc
+++ b/recipes-bsp/sa-lld/sa-lld.inc
@@ -8,14 +8,14 @@ SA_LLD_GIT_PROTOCOL = "git"
 SA_LLD_GIT_BRANCH = "master"
 SA_LLD_GIT_DESTSUFFIX = "git/ti/drv/sa"

-# Following commit DEV.SA_LLD.03.00.00.13A
-SA_LLD_SRCREV = "5918d9a519789c34368388c49869cb857d6255f7"
+# Below commit ID corresponds to "DEV.SA_LLD.03.00.00.15"
+SA_LLD_SRCREV = "59dbcc8b1ed05d81161bc4c472bed8916a004728"

 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.13"
-INC_PR = "r1"
+PV = "03.00.00.15"
+INC_PR = "r0"

 S = "${WORKDIR}/${SA_LLD_GIT_DESTSUFFIX}"
--- a/recipes-bsp/serdes-fw/serdes-fw_git.bb
+++ b/recipes-bsp/serdes-fw/serdes-fw_git.bb
@@ -3,8 +3,7 @@ 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"
+PV = "3.3.0.2c"

 CLEANBROKEN = "1"

@@ -12,25 +11,19 @@ COMPATIBLE_MACHINE = "keystone"

 PACKAGE_ARCH = "${MACHINE_ARCH}"

-SRCREV = "8756d98081e1011a1334b0769f13ffb31d3b41bd"
+SRCREV = "8d861bd8f8f792df60b6873989ff208766fbebae"
 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"
+TARGET = "ks2_pcie_serdes.bin ks2_gbe_serdes.bin 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}
+	for f in ${TARGET}; do
+		install -m 0644 ${S}/ti-keystone/$f ${D}${base_libdir}/firmware/$f
+	done
 }

 FILES_${PN} = "${base_libdir}/firmware"
--- a/recipes-bsp/srio-lld/srio-lld.inc
+++ b/recipes-bsp/srio-lld/srio-lld.inc
@@ -8,15 +8,15 @@ 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.15
-SRIO_LLD_SRCREV = "b773a7d08225c30737abc45ebc92a186bac08797"
+# commit ID corresponding to "DEV.SRIO_LLD.02.00.00.16"
+SRIO_LLD_SRCREV = "70664382b7baf0fc52b3504cc58d6d0d720cc639"

 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.15"
-INC_PR = "r0"
+PV = "02.00.00.16"
+INC_PR = "r1"

 DEVICELIST = "k2h k2k"

--- a/recipes-bsp/ti-sci-fw/ti-sci-fw_git.bb
+++ b/recipes-bsp/ti-sci-fw/ti-sci-fw_git.bb
@@ -3,16 +3,16 @@ DESCRIPTION = "TI SCI firmware"
 LICENSE = "TI-TFL"
 LIC_FILES_CHKSUM = "file://LICENCE.ti-keystone;md5=3a86335d32864b0bef996bee26cc0f2c"

-PV = "0.1.1.12"
+PV = "0.1.1.37"
 PR = "r0"

 CLEANBROKEN = "1"

-COMPATIBLE_MACHINE = "k2g-evm"
+COMPATIBLE_MACHINE = "k2g"

 PACKAGE_ARCH = "${MACHINE_ARCH}"

-SRCREV = "89c279adfdd0e58f002ba6f0c26a14869b2d74cb"
+SRCREV = "9fe8861924a990dcd48ada5099df592273c2e166"
 BRANCH ?= "ti-linux-firmware-4.1.y"

 SRC_URI = "git://git.ti.com/processor-firmware/ti-linux-firmware.git;protocol=git;branch=${BRANCH}"
--- a/recipes-bsp/traceframework/traceframework.inc
+++ b/recipes-bsp/traceframework/traceframework.inc
@@ -22,7 +22,7 @@ INC_PR = "r1"
 DEVICELIST = "k2k k2h k2e k2l"
 DEVICELIST_tci6614-evm = "c6614"
 DEVICELIST_k2hk-evm    = "k2k k2h"
-DEVICELIST_k2e-evm     = "k2e"
+DEVICELIST_k2e     = "k2e"
 DEVICELIST_k2l-evm     = "k2l"

 S = "${WORKDIR}/${TRACEFRAMEWORK_GIT_DESTSUFFIX}"
--- a/recipes-bsp/u-boot/u-boot-ti-staging_2014.07.bb
+++ b/recipes-bsp/u-boot/u-boot-ti-staging_2014.07.bb
@@ -1,20 +0,0 @@
-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=025bf9f768cbcb1a165dbe1a110babfb"
-
-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 = "fb6ab76dad21e12b12d0f824fcfa2609a26ec695"
-
-SPL_BINARY = "MLO"
-SPL_UART_BINARY = "u-boot-spl.bin"
--- a/recipes-bsp/u-boot/u-boot-ti-staging_2015.07.bb
+++ b/recipes-bsp/u-boot/u-boot-ti-staging_2015.07.bb
@@ -1,78 +0,0 @@
-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 = "r25"
-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 = "46c915c96358c426bb1f4dd1e25a9a805d93a24e"
-
-# Support for secure devices - detailed info is in doc/README.ti-secure
-TI_SECURE_DEV_PKG ?= ""
-TI_SECURE_DEV_PKG_dra7xx-hs-evm = "${TI_SECURE_DEV_PKG_DRA7}"
-TI_SECURE_DEV_PKG_am437x-hs-evm = "${TI_SECURE_DEV_PKG_AM4}"
-export TI_SECURE_DEV_PKG
-
-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_compile_append_am437x-hs-evm () {
-	if [ -f ${S}/u-boot-spl_HS_ISSW ]; then
-		rm -rf ${S}/MLO
-		cp ${S}/u-boot-spl_HS_ISSW ${S}/MLO
-	fi
-}
-
-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}
-}
--- a/recipes-bsp/u-boot/u-boot-ti-staging_2016.05.bb
+++ b/recipes-bsp/u-boot/u-boot-ti-staging_2016.05.bb
@@ -7,23 +7,21 @@ DESCRIPTION = "u-boot bootloader for TI devices"

 LIC_FILES_CHKSUM = "file://Licenses/README;md5=a2c678cfd4a4d97135585cad908541c6"

-PR = "r8"
+PR = "r26"
 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-2016.05"

-SRCREV = "b31e958440b381a4316ebceeb4c8286da4c561db"
+SRCREV = "6c5519b6fc09274d28d653a9a3cabf7dc74883ca"

 # Support for secure devices - detailed info is in doc/README.ti-secure
 TI_SECURE_DEV_PKG ?= ""
-TI_SECURE_DEV_PKG_dra7xx-hs-evm = "${TI_SECURE_DEV_PKG_DRA7}"
-TI_SECURE_DEV_PKG_am57xx-hs-evm = "${TI_SECURE_DEV_PKG_DRA7}"
-TI_SECURE_DEV_PKG_am437x-hs-evm = "${TI_SECURE_DEV_PKG_AM4}"
 export TI_SECURE_DEV_PKG

 SPL_BINARY = "MLO"
+SPL_BINARY_k2e-hs-evm = ""
 SPL_UART_BINARY = "u-boot-spl.bin"

 # Keystone specifics
@@ -43,6 +41,16 @@ 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"

+# HS XLD
+UBOOT_HS_XLD_BINARY = "u-boot-spl_HS_X-LOADER"
+UBOOT_HS_XLD_IMAGE = "u-boot-spl_HS_X-LOADER-${MACHINE}-${PV}-${PR}"
+UBOOT_HS_XLD_SYMLINK = "u-boot-spl_HS_X-LOADER-${MACHINE}"
+
+# HS MLO
+UBOOT_HS_MLO_BINARY = "u-boot_HS_MLO"
+UBOOT_HS_MLO_IMAGE = "u-boot_HS_MLO-${MACHINE}-${PV}-${PR}"
+UBOOT_HS_MLO_SYMLINK = "u-boot_HS_MLO-${MACHINE}"
+
 do_compile_append_am437x-hs-evm () {
 	if [ -f ${S}/u-boot-spl_HS_ISSW ]; then
 		rm -rf ${S}/MLO
@@ -50,6 +58,32 @@ do_compile_append_am437x-hs-evm () {
 	fi
 }

+do_install_append () {
+	if [ -f ${S}/${UBOOT_HS_XLD_BINARY} ]; then
+		install ${S}/${UBOOT_HS_XLD_BINARY} ${D}/boot/${UBOOT_HS_XLD_IMAGE}
+		ln -sf ${UBOOT_HS_XLD_IMAGE} ${D}/boot/${UBOOT_HS_XLD_BINARY}
+	fi
+	if [ -f ${S}/${UBOOT_HS_MLO_BINARY} ]; then
+		install ${S}/${UBOOT_HS_MLO_BINARY} ${D}/boot/${UBOOT_HS_MLO_IMAGE}
+		ln -sf ${UBOOT_HS_MLO_IMAGE} ${D}/boot/${UBOOT_HS_MLO_BINARY}
+	fi
+}
+
+do_deploy_append () {
+	if [ -f ${S}/${UBOOT_HS_XLD_BINARY} ]; then
+		install ${S}/${UBOOT_HS_XLD_BINARY} ${DEPLOYDIR}/${UBOOT_HS_XLD_IMAGE}
+		rm -f ${UBOOT_HS_XLD_BINARY} ${UBOOT_HS_XLD_SYMLINK}
+		ln -sf ${UBOOT_HS_XLD_IMAGE} ${UBOOT_HS_XLD_SYMLINK}
+		ln -sf ${UBOOT_HS_XLD_IMAGE} ${UBOOT_HS_XLD_BINARY}
+	fi
+	if [ -f ${S}/${UBOOT_HS_MLO_BINARY} ]; then
+		install ${S}/${UBOOT_HS_MLO_BINARY} ${DEPLOYDIR}/${UBOOT_HS_MLO_IMAGE}
+		rm -f ${UBOOT_HS_MLO_BINARY} ${UBOOT_HS_MLO_SYMLINK}
+		ln -sf ${UBOOT_HS_MLO_IMAGE} ${UBOOT_HS_MLO_SYMLINK}
+		ln -sf ${UBOOT_HS_MLO_IMAGE} ${UBOOT_HS_MLO_BINARY}
+	fi
+}
+
 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}
--- a/recipes-bsp/uio-module-drv/uio-module-drv-test_git.bb
+++ b/recipes-bsp/uio-module-drv/uio-module-drv-test_git.bb
@@ -2,12 +2,12 @@ DESCRIPTION = "Test code for user space IO (UIO) driver"

 include uio-module-drv.inc

-PR = "r1"
+PR = "r2"

-COMPATIBLE_MACHINE = "keystone|am57xx-evm"
+COMPATIBLE_MACHINE = "keystone|omap-a15"
 PACKAGE_ARCH = "${MACHINE_ARCH}"

-DEVICE_NAME_am57xx-evm = "am57xx"
+DEVICE_NAME_omap-a15 = "am57xx"
 DEVICE_NAME_keystone = "keystone"
 RDEPENDS_${PN} = "uio-module-drv"

@@ -25,6 +25,6 @@ do_install_append_keystone () {
 	install -c -m 755 ${S}/test/uio_cic2_int_multithread_test ${D}${bindir}/.
 }

-do_install_append_am57xx-evm () {
+do_install_append_omap-a15 () {
 	install -c -m 755 ${S}/test/prussdrv_test/test/pruss_uio_test ${D}${bindir}/.
 }
--- a/recipes-connectivity/uim/uim_8.5.bb
+++ b/recipes-connectivity/uim/uim_8.5.bb
@@ -12,8 +12,6 @@ SRC_URI = "git://git.ti.com/ti-bt/uim.git"

 S = "${WORKDIR}/git"

-EXTRA_OEMAKE = "CC=${TARGET_PREFIX}gcc"
-
 do_install() {
 	install -d ${D}${bindir}
 	install -m 0755 uim ${D}${bindir}
--- a/recipes-graphics/libgal/ti-gc320-libs_5.0.11.p7.bb
+++ b/recipes-graphics/libgal/ti-gc320-libs_5.0.11.p7.bb
@@ -0,0 +1,39 @@
+DESCRIPTION = "Userspace libraries for GC320 chipset on TI SoCs"
+HOMEPAGE = "https://git.ti.com/graphics/ti-gc320-libs"
+LICENSE = "TI-TSPA"
+LIC_FILES_CHKSUM = "file://Manifest.html;md5=4d759c4e533af6aaeff2af7f405697c2"
+
+PACKAGE_ARCH = "${MACHINE_ARCH}"
+
+CLEANBROKEN = "1"
+
+BRANCH = "ti-${PV}"
+
+SRC_URI = "git://git.ti.com/graphics/ti-gc320-libs.git;protocol=git;branch=${BRANCH}"
+SRCREV = "ab0ca5bff345f6c13807fea3c4acabf5f2b9b10a"
+
+# There's only hardfp version available
+python __anonymous() {
+    tunes = bb.data.getVar("TUNE_FEATURES", d, 1)
+    if not tunes:
+        return
+    pkgn = bb.data.getVar("PN", d, 1)
+    pkgv = bb.data.getVar("PV", d, 1)
+    if "callconvention-hard" not in tunes:
+        bb.warn("%s-%s ONLY supports hardfp mode for now" % (pkgn, pkgv))
+        raise bb.parse.SkipPackage("%s-%s ONLY supports hardfp mode for now" % (pkgn, pkgv))
+}
+
+TARGET_PRODUCT_omap-a15 = "jacinto6evm"
+
+PR = "r1"
+
+S = "${WORKDIR}/git"
+
+EXTRA_OEMAKE += "DESTDIR=${D} TARGET_PRODUCT=${TARGET_PRODUCT} LIBDIR=${libdir}"
+
+do_install() {
+    oe_runmake install
+}
+
+INSANE_SKIP_${PN} += "ldflags"
--- a/recipes-graphics/libgles/ti-sgx-ddk-um_1.14.3699939.bb
+++ b/recipes-graphics/libgles/ti-sgx-ddk-um_1.14.3699939.bb
@@ -8,7 +8,7 @@ PACKAGE_ARCH = "${MACHINE_ARCH}"
 BRANCH = "ti-img-sgx/${PV}"

 SRC_URI = "git://git.ti.com/graphics/omap5-sgx-ddk-um-linux.git;protocol=git;branch=${BRANCH}"
-SRCREV = "54ba970e33d3c13f726d7c035f3b5c3dcb74afdc"
+SRCREV = "fccafce7d0a023e36c064ccbaa7d33e89252ea00"

 # There's only hardfp version available
 python __anonymous() {
@@ -31,7 +31,7 @@ INITSCRIPT_PARAMS = "defaults 8"

 inherit update-rc.d

-PR = "r12"
+PR = "r16"
 PROVIDES += "virtual/egl virtual/libgles1 virtual/libgles2 omap5-sgx-ddk-um-linux"

 DEPENDS += "libdrm udev libgbm wayland libffi"
@@ -63,7 +63,7 @@ FILES_${PN} +=  "${includedir}/*"
 FILES_${PN} +=  "${sysconfdir}/*"

 PACKAGES =+ "${PN}-plugins"
-FILES_${PN}-plugins = "${libdir}/libsrv_init.so ${libdir}/libsrv_um.so ${libdir}/libglslcompiler.so ${libdir}/libGLESv2.so ${libdir}/libpvrDRMWSEGL.so  ${libdir}/libpvrGBMWSEGL.so  ${libdir}/libpvrws_WAYLAND.so"
+FILES_${PN}-plugins = "${libdir}/libsrv_init.so ${libdir}/libsrv_um.so ${libdir}/libglslcompiler.so ${libdir}/libPVRScopeServices.so ${libdir}/libGLESv2.so ${libdir}/libpvrDRMWSEGL.so  ${libdir}/libpvrGBMWSEGL.so  ${libdir}/libpvrws_WAYLAND.so"
 RDEPENDS_${PN} += "${PN}-plugins"

 ALLOW_EMPTY_${PN}-plugins = "1"
--- a/recipes-kernel/kselftests/kselftests_4.4.bb
+++ b/recipes-kernel/kselftests/kselftests_4.4.bb
@@ -4,14 +4,14 @@ 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"
+SRC_URI[md5sum] = "9a78fa2eb6c68ca5a40ed5af08142599"
+SRC_URI[sha256sum] = "401d7c8fef594999a460d10c72c5a94e9c2e1022f16795ec51746b0d165418b2"

 S = "${WORKDIR}/linux-${PV}"

 PACKAGE_ARCH = "${MACHINE_ARCH}"

-DEPENDS = "virtual/kernel popt"
+DEPENDS = "popt"

 inherit kernel-arch

--- a/recipes-kernel/linux/cmem.inc
+++ b/recipes-kernel/linux/cmem.inc
@@ -1,18 +1,80 @@
-SRC_URI += "file://cmem.dtsi"
+# Add concept of machine variants to split DTBs into subsets
+#
+# Use these for temporary overrides
+CMEM_MACHINE = "${MACHINE}"
+CMEM_MACHINE_am57xx-evm = "am571x am572x"
+CMEM_MACHINE_am57xx-hs-evm = "am571x am572x"
+CMEM_MACHINE_dra7xx-evm = "dra72x dra74x"
+CMEM_MACHINE_dra7xx-hs-evm = "dra72x dra74x"

+# Set cmem.dtsi per machine or machine variant
+CMEM_DTSI = "cmem.dtsi"
+CMEM_DTSI_am571x = "cmem-am571x.dtsi"
+CMEM_DTSI_dra72x = "cmem-dra72x.dtsi"
+
+# Split device trees between variants
+CMEM_DEVICETREE = "${KERNEL_DEVICETREE}"
+CMEM_DEVICETREE_am571x = "am571x-idk.dtb am571x-idk-lcd-osd.dtb am571x-idk-lcd-osd101t2587.dtb"
+CMEM_DEVICETREE_am572x = "am57xx-beagle-x15.dtb am57xx-beagle-x15-revb1.dtb am57xx-evm.dtb am57xx-evm-reva3.dtb am572x-idk.dtb \
+                          am572x-idk-lcd-osd.dtb am572x-idk-lcd-osd101t2587.dtb"
+CMEM_DEVICETREE_dra72x = "dra72-evm.dtb dra72-evm-lcd-lg.dtb dra72-evm-lcd-osd.dtb dra72-evm-lcd-osd101t2587.dtb \
+                          dra72-evm-revc.dtb dra72-evm-revc-lcd-osd101t2045.dtb dra72-evm-revc-lcd-osd101t2587.dtb"
+CMEM_DEVICETREE_dra74x = "dra7-evm.dtb dra7-evm-lcd-lg.dtb dra7-evm-lcd-osd.dtb dra7-evm-lcd-osd101t2587.dtb"
+
+# Flag to enable CMEM injection
 RESERVE_CMEM ?= "0"

-do_setup_cmem() {
-    if [ "${RESERVE_CMEM}" == "1" ]
-    then
-        cp ${WORKDIR}/cmem.dtsi ${S}/arch/arm/boot/dts/${MACHINE}-cmem.dtsi
+# Need to patch main keystone dtsi files sram entry
+SRC_URI_append_keystone = "${@base_conditional("RESERVE_CMEM", "1", " file://0001-ARM-dts-keystone-Remove-reg-entry-from-the-sram-node.patch", "", d)}"

-        for dtb in ${KERNEL_DEVICETREE}
-        do
-            dts=`echo $dtb | sed -e 's|dtb$|dts|'`
-            echo "#include \"${MACHINE}-cmem.dtsi\"" >> ${S}/arch/arm/boot/dts/$dts
-        done
-    fi
+# Add correct cmem.dtsi to SRC_URI for each variant for a given machine
+python() {
+    old_overrides = d.getVar('OVERRIDES', False)
+
+    # Initialize with empty string to simplify logic to append to SRC_URI
+    cmem_dtsi = set([''])
+
+    for cmem_machine in (d.getVar('CMEM_MACHINE', True) or '').split():
+        # Create copy of data for additional override
+        localdata = bb.data.createCopy(d)
+        localdata.setVar('OVERRIDES', '%s:%s' % (cmem_machine, old_overrides))
+        bb.data.update_data(localdata)
+
+        cmem_dtsi.add(localdata.getVar('CMEM_DTSI', True))
+
+    d.appendVar('SRC_URI', ' file://'.join(cmem_dtsi))
+}
+
+python do_setup_cmem() {
+    import shutil
+
+    old_overrides = d.getVar('OVERRIDES', False)
+
+    if d.getVar('RESERVE_CMEM', True) is '1':
+        for cmem_machine in (d.getVar('CMEM_MACHINE', True) or '').split():
+            # Create copy of data for additional override
+            localdata = bb.data.createCopy(d)
+            localdata.setVar('OVERRIDES', '%s:%s' % (cmem_machine, old_overrides))
+            bb.data.update_data(localdata)
+
+            # Get source directory and dtsi filename
+            src_dir  = localdata.getVar('WORKDIR', True)
+            src_dtsi = localdata.getVar('CMEM_DTSI', True)
+
+            # Get destination directory and destination dtsi filename which adds
+            #   the MACHINE prefix.
+            dst_dir  = os.path.join(localdata.getVar('S', True), 'arch/arm/boot/dts')
+            dst_dtsi = localdata.expand('${MACHINE}-${CMEM_DTSI}')
+
+            # Copy cmem.dtsi into source tree
+            shutil.copy(os.path.join(src_dir,src_dtsi), os.path.join(dst_dir,dst_dtsi))
+
+            # Inject dtsi into each dts in list
+            for dtb in (localdata.getVar('CMEM_DEVICETREE', True) or '').split():
+                dts = dtb[:-4] + '.dts'
+
+                with open(os.path.join(dst_dir,dts), 'a') as dts_file:
+                    dts_file.write('\n#include "%s"\n' % dst_dtsi)
 }

 do_patch[postfuncs] += "do_setup_cmem"
--- a/recipes-kernel/linux/files/0001-ARM-dts-keystone-Remove-reg-entry-from-the-sram-node.patch
+++ b/recipes-kernel/linux/files/0001-ARM-dts-keystone-Remove-reg-entry-from-the-sram-node.patch
@@ -0,0 +1,79 @@
+From c7e576590e45f9fb86a9d74fa66b4fd4f8eca803 Mon Sep 17 00:00:00 2001
+From: Sam Nelson <sam.nelson@ti.com>
+Date: Fri, 11 Nov 2016 10:32:48 -0500
+Subject: [PATCH] ARM: dts: keystone: Remove reg entry from the sram node
+
+Currently the reg entry reserves the whole MSMC ram range to be used
+only through the mmio-sram driver. (See LCPD-7801)
+
+Given that other modules (like CMEM) also currently reserve memory from
+MSMC, the reg entry which takes over the whole memory breaks those
+functionality. So currently recommending to remove this for now.
+Still the ranges entry will capture the total memory available.
+
+This will allow module like CMEM to reserve and use a non-overlapping
+section of memory not marked reserved by the sub nodes here.
+
+Resolves current issue with CMEM module reporting error allocating MSMC
+memory.
+
+Signed-off-by: Sam Nelson <sam.nelson@ti.com>
+Signed-off-by: Denys Dmytriyenko <denys@ti.com>
+---
+ arch/arm/boot/dts/keystone-k2e.dtsi  | 1 -
+ arch/arm/boot/dts/keystone-k2g.dtsi  | 1 -
+ arch/arm/boot/dts/keystone-k2hk.dtsi | 1 -
+ arch/arm/boot/dts/keystone-k2l.dtsi  | 1 -
+ 4 files changed, 4 deletions(-)
+
+diff --git a/arch/arm/boot/dts/keystone-k2e.dtsi b/arch/arm/boot/dts/keystone-k2e.dtsi
+index 553c423..5b9252a 100644
+--- a/arch/arm/boot/dts/keystone-k2e.dtsi
+++ b/arch/arm/boot/dts/keystone-k2e.dtsi
+@@ -98,7 +98,6 @@
+ 
+ 		msm_ram: msmram@0c000000 {
+ 			compatible = "mmio-sram";
+-			reg = <0x0c000000 0x200000>;
+ 			ranges = <0x0 0x0c000000 0x200000>;
+ 			#address-cells = <1>;
+ 			#size-cells = <1>;
+diff --git a/arch/arm/boot/dts/keystone-k2g.dtsi b/arch/arm/boot/dts/keystone-k2g.dtsi
+index 45faf40..e953d82 100644
+--- a/arch/arm/boot/dts/keystone-k2g.dtsi
+++ b/arch/arm/boot/dts/keystone-k2g.dtsi
+@@ -99,7 +99,6 @@
+ 
+ 		msm_ram: msmram@0c000000 {
+ 			compatible = "mmio-sram";
+-			reg = <0x0c000000 0x100000>;
+ 			ranges = <0x0 0x0c000000 0x100000>;
+ 			#address-cells = <1>;
+ 			#size-cells = <1>;
+diff --git a/arch/arm/boot/dts/keystone-k2hk.dtsi b/arch/arm/boot/dts/keystone-k2hk.dtsi
+index edca6aa..f3f1932 100644
+--- a/arch/arm/boot/dts/keystone-k2hk.dtsi
+++ b/arch/arm/boot/dts/keystone-k2hk.dtsi
+@@ -111,7 +111,6 @@
+ 
+ 		msm_ram: msmram@0c000000 {
+ 			compatible = "mmio-sram";
+-			reg = <0x0c000000 0x600000>;
+ 			ranges = <0x0 0x0c000000 0x600000>;
+ 			#address-cells = <1>;
+ 			#size-cells = <1>;
+diff --git a/arch/arm/boot/dts/keystone-k2l.dtsi b/arch/arm/boot/dts/keystone-k2l.dtsi
+index 76caff6..4ee7439 100644
+--- a/arch/arm/boot/dts/keystone-k2l.dtsi
+++ b/arch/arm/boot/dts/keystone-k2l.dtsi
+@@ -284,7 +284,6 @@
+ 
+ 		msm_ram: msmram@0c000000 {
+ 			compatible = "mmio-sram";
+-			reg = <0x0c000000 0x200000>;
+ 			ranges = <0x0 0x0c000000 0x200000>;
+ 			#address-cells = <1>;
+ 			#size-cells = <1>;
+-- 
+2.7.4
+
--- a/recipes-kernel/linux/files/dra7xx/cmem-am571x.dtsi
+++ b/recipes-kernel/linux/files/dra7xx/cmem-am571x.dtsi
@@ -0,0 +1,29 @@
+/ {
+        reserved-memory {
+                #address-cells = <2>;
+                #size-cells = <2>;
+                ranges;
+
+                cmem_block_mem_0: cmem_block_mem@a0000000 {
+                        reg = <0x0 0xa0000000 0x0 0x0c000000>;
+                        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 0x0c000000>;
+                };
+        };
+};
--- a/recipes-kernel/linux/files/dra7xx/cmem-dra72x.dtsi
+++ b/recipes-kernel/linux/files/dra7xx/cmem-dra72x.dtsi
@@ -0,0 +1,29 @@
+/ {
+        reserved-memory {
+                #address-cells = <2>;
+                #size-cells = <2>;
+                ranges;
+
+                cmem_block_mem_0: cmem_block_mem@a0000000 {
+                        reg = <0x0 0xa0000000 0x0 0x0c000000>;
+                        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 0x0c000000>;
+                };
+        };
+};
--- a/recipes-kernel/linux/files/k2e-evm/cmem.dtsi
+++ b/recipes-kernel/linux/files/k2e-evm/cmem.dtsi
@@ -12,8 +12,8 @@
 			status = "okay";
 		};

-		cmem_block_mem_1: cmem_block_mem@00c100000 {
-			reg = <0x00000000 0x0c000000 0x00000000 0x00180000>;
+		cmem_block_mem_1: cmem_block_mem@00c080000 {
+			reg = <0x00000000 0x0c080000 0x00000000 0x000c0000>;
 			no-map;
 			status = "okay";
 		};
--- a/recipes-kernel/linux/files/k2e-evm/k2e-uio.dtsi
+++ b/recipes-kernel/linux/files/k2e-evm/k2e-uio.dtsi
--- a/recipes-kernel/linux/files/k2g-evm/cmem.dtsi
+++ b/recipes-kernel/linux/files/k2g-evm/cmem.dtsi
--- a/recipes-kernel/linux/files/k2l-evm/cmem.dtsi
+++ b/recipes-kernel/linux/files/k2l-evm/cmem.dtsi
@@ -12,8 +12,8 @@
 			status = "okay";
 		};

-		cmem_block_mem_1: cmem_block_mem@00c100000 {
-			reg = <0x00000000 0x0c000000 0x00000000 0x00180000>;
+		cmem_block_mem_1: cmem_block_mem@00c080000 {
+			reg = <0x00000000 0x0c080000 0x00000000 0x000c0000>;
 			no-map;
 			status = "okay";
 		};
--- a/recipes-kernel/linux/linux-ti-staging-4.4/k2g-evm/defconfig
+++ b/recipes-kernel/linux/linux-ti-staging-4.4/k2g-evm/defconfig
--- a/recipes-kernel/linux/linux-ti-staging-rt-4.4/k2g-evm/defconfig
+++ b/recipes-kernel/linux/linux-ti-staging-rt-4.4/k2g-evm/defconfig
--- a/recipes-kernel/linux/linux-ti-staging-rt_4.4.bb
+++ b/recipes-kernel/linux/linux-ti-staging-rt_4.4.bb
@@ -6,4 +6,4 @@ FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}-4.4:"

 BRANCH = "ti-rt-linux-4.4.y"

-SRCREV = "15267e879ed4a76c73c40f2e305a20f9d93252ff"
+SRCREV = "dd8a2ec8d0acf6431e7f67b4cebf44171cfa837d"
--- a/recipes-kernel/linux/linux-ti-staging-systest-4.4/defconfig
+++ b/recipes-kernel/linux/linux-ti-staging-systest-4.4/defconfig
@@ -1 +1 @@
-use-tisdk-config=ti_sdk_dbg_omap2_release
+use-tisdk-config=ti_sdk_omap2_debug
--- a/recipes-kernel/linux/linux-ti-staging-systest-4.4/dra7xx/defconfig
+++ b/recipes-kernel/linux/linux-ti-staging-systest-4.4/dra7xx/defconfig
@@ -1 +1 @@
-use-tisdk-config=ti_sdk_dbg_dra7x_release
+use-tisdk-config=ti_sdk_dra7x_debug
--- a/recipes-kernel/linux/linux-ti-staging-systest-4.4/k2g-evm/defconfig
+++ b/recipes-kernel/linux/linux-ti-staging-systest-4.4/k2g-evm/defconfig
@@ -1 +0,0 @@
-use-tisdk-config=ti_sdk_dbg_k2g_release
--- a/recipes-kernel/linux/linux-ti-staging-systest-4.4/k2g/defconfig
+++ b/recipes-kernel/linux/linux-ti-staging-systest-4.4/k2g/defconfig
@@ -0,0 +1 @@
+use-tisdk-config=ti_sdk_k2g_debug
--- a/recipes-kernel/linux/linux-ti-staging-systest-4.4/keystone/defconfig
+++ b/recipes-kernel/linux/linux-ti-staging-systest-4.4/keystone/defconfig
@@ -1 +1 @@
-use-tisdk-config=ti_sdk_dbg_keystone_release
+use-tisdk-config=ti_sdk_keystone_debug
--- a/recipes-kernel/linux/linux-ti-staging-systest-4.4/ti33x/defconfig
+++ b/recipes-kernel/linux/linux-ti-staging-systest-4.4/ti33x/defconfig
@@ -1 +1 @@
-use-tisdk-config=ti_sdk_dbg_am3x_release
+use-tisdk-config=ti_sdk_am3x_debug
--- a/recipes-kernel/linux/linux-ti-staging-systest-4.4/ti43x/defconfig
+++ b/recipes-kernel/linux/linux-ti-staging-systest-4.4/ti43x/defconfig
@@ -1 +1 @@
-use-tisdk-config=ti_sdk_dbg_am4x_release
+use-tisdk-config=ti_sdk_am4x_debug
--- a/recipes-kernel/linux/linux-ti-staging_4.4.bb
+++ b/recipes-kernel/linux/linux-ti-staging_4.4.bb
@@ -29,20 +29,24 @@ RDEPENDS_kernel-base_append_dra7xx = " vpdma-fw"
 RDEPENDS_kernel-base_append_keystone = " boot-monitor"

 # Install ti-sci-fw into /boot dir of rootfs
-RDEPENDS_kernel-base_append_k2g-evm = " ti-sci-fw"
+RDEPENDS_kernel-base_append_k2g = " ti-sci-fw"

 # Add run-time dependency for SerDes firmware to the rootfs
 RDEPENDS_kernel-base_append_keystone = " serdes-fw"

+# Add run-time dependency for QMSS PDSP firmware to the rootfs
+RDEPENDS_kernel-base_append_keystone = " qmss-pdsp-fw"
+
 # Add run-time dependency for NETCP PA firmware to the rootfs
 RDEPENDS_kernel-base_append_k2hk-evm = " netcp-pa-fw"
-RDEPENDS_kernel-base_append_k2e-evm = " netcp-pa-fw"
+RDEPENDS_kernel-base_append_k2e = " netcp-pa-fw"
 RDEPENDS_kernel-base_append_k2l-evm = " netcp-pa-fw"

 # Add run-time dependency for PRU Ethernet firmware to the rootfs
 RDEPENDS_kernel-base_append_am57xx-evm = " prueth-fw"
 RDEPENDS_kernel-base_append_am437x-evm = " prueth-fw"
 RDEPENDS_kernel-base_append_am335x-evm = " prueth-fw"
+RDEPENDS_kernel-base_append_k2g = " prueth-fw"

 # Default is to package all dtb files for ti33x devices unless building
 # for the specific beaglebone machine.
@@ -50,11 +54,15 @@ KERNEL_DEVICETREE_ti33x = "am335x-evm.dtb am335x-evmsk.dtb am335x-bone.dtb am335
 KERNEL_DEVICETREE_ti43x = "am43x-epos-evm.dtb am437x-gp-evm.dtb am437x-gp-evm-hdmi.dtb am437x-sk-evm.dtb am437x-idk-evm.dtb"
 KERNEL_DEVICETREE_beaglebone = "am335x-bone.dtb am335x-boneblack.dtb am335x-bonegreen.dtb"
 KERNEL_DEVICETREE_omap5-evm = "omap5-uevm.dtb"
-KERNEL_DEVICETREE_dra7xx-evm = "dra7-evm.dtb dra7-evm-lcd-lg.dtb dra7-evm-lcd-osd.dtb dra7-evm-lcd-osd101t2587.dtb dra72-evm.dtb dra72-evm-revc.dtb \
-                                dra72-evm-lcd-lg.dtb dra72-evm-lcd-osd.dtb dra72-evm-lcd-osd101t2587.dtb"
+KERNEL_DEVICETREE_dra7xx-evm = "dra7-evm.dtb dra7-evm-lcd-lg.dtb dra7-evm-lcd-osd.dtb dra7-evm-lcd-osd101t2587.dtb \
+                                dra72-evm.dtb dra72-evm-lcd-lg.dtb dra72-evm-lcd-osd.dtb dra72-evm-lcd-osd101t2587.dtb \
+                                dra72-evm-revc.dtb dra72-evm-revc-lcd-osd101t2045.dtb dra72-evm-revc-lcd-osd101t2587.dtb \
+                                dra71-evm.dtb dra71-evm-lcd-auo-g101evn01.0.dtb"
 KERNEL_DEVICETREE_dra7xx-hs-evm = "${KERNEL_DEVICETREE_dra7xx-evm}"
-KERNEL_DEVICETREE_am57xx-evm = "am57xx-beagle-x15.dtb am57xx-beagle-x15-revb1.dtb am57xx-evm.dtb am57xx-evm-reva3.dtb am571x-idk.dtb am572x-idk.dtb \
-                                am571x-idk-lcd-osd.dtb am572x-idk-lcd-osd.dtb am571x-idk-lcd-osd101t2587.dtb am572x-idk-lcd-osd101t2587.dtb"
+KERNEL_DEVICETREE_am57xx-evm = "am57xx-beagle-x15.dtb am57xx-beagle-x15-revb1.dtb \
+                                am57xx-evm.dtb am57xx-evm-reva3.dtb \
+                                am571x-idk.dtb am571x-idk-lcd-osd.dtb am571x-idk-lcd-osd101t2587.dtb \
+                                am572x-idk.dtb am572x-idk-lcd-osd.dtb am572x-idk-lcd-osd101t2587.dtb"
 KERNEL_DEVICETREE_am57xx-hs-evm = "${KERNEL_DEVICETREE_am57xx-evm}"
 KERNEL_DEVICETREE_omap3 = "omap3-beagle.dtb omap3-beagle-xm.dtb omap3-beagle-xm-ab.dtb omap3-evm.dtb omap3-evm-37xx.dtb am3517-evm.dtb"
 KERNEL_DEVICETREE_am3517-evm = "am3517-evm.dtb"
@@ -62,8 +70,8 @@ KERNEL_DEVICETREE_am37x-evm = "omap3-evm-37xx.dtb"
 KERNEL_DEVICETREE_beagleboard = "omap3-beagle.dtb omap3-beagle-xm.dtb omap3-beagle-xm-ab.dtb"
 KERNEL_DEVICETREE_pandaboard = "omap4-panda.dtb omap4-panda-a4.dtb omap4-panda-es.dtb"
 KERNEL_DEVICETREE_k2hk-evm = "keystone-k2hk-evm.dtb"
-KERNEL_DEVICETREE_k2e-evm = "keystone-k2e-evm.dtb"
-KERNEL_DEVICETREE_k2g-evm = "keystone-k2g-evm.dtb"
+KERNEL_DEVICETREE_k2e = "keystone-k2e-evm.dtb"
+KERNEL_DEVICETREE_k2g = "keystone-k2g-evm.dtb keystone-k2g-evm-lcd.dtb keystone-k2g-ice.dtb"
 KERNEL_DEVICETREE_k2l-evm = "keystone-k2l-evm.dtb"

 COMPATIBLE_MACHINE = "ti33x|ti43x|omap-a15|omap3|omap4|keystone"
@@ -72,11 +80,11 @@ S = "${WORKDIR}/git"

 BRANCH = "ti-lsk-linux-4.4.y"

-SRCREV = "6580f85400b48d55d06f11d6b75c056399123a72"
-PV = "4.4.13+git${SRCPV}"
+SRCREV = "33a812efb875d4dd31d1705fa6144ed11324a6eb"
+PV = "4.4.32+git${SRCPV}"

 # Append to the MACHINE_KERNEL_PR so that a new SRCREV will cause a rebuild
-MACHINE_KERNEL_PR_append = "b"
+MACHINE_KERNEL_PR_append = "a"
 PR = "${MACHINE_KERNEL_PR}"

 KERNEL_GIT_URI = "git://git.ti.com/ti-linux-kernel/ti-linux-kernel.git"
--- a/recipes-kernel/linux/ti-uio.inc
+++ b/recipes-kernel/linux/ti-uio.inc
@@ -1,14 +1,14 @@
 SRC_URI_append_keystone = " file://keystone-uio.dtsi"
 SRC_URI_append_k2hk-evm = " file://k2hk-uio.dtsi"
 SRC_URI_append_k2l-evm = " file://k2l-uio.dtsi"
-SRC_URI_append_k2e-evm = " file://k2e-uio.dtsi"
+SRC_URI_append_k2e = " file://k2e-uio.dtsi"
 SRC_URI_append_am57xx-evm = " file://am572x-pru-uio.dtsi"

 DTSI_LIST = ""
 DTSI_LIST_append_keystone = " keystone-uio.dtsi"
 DTSI_LIST_append_k2hk-evm = " k2hk-uio.dtsi"
 DTSI_LIST_append_k2l-evm = " k2l-uio.dtsi"
-DTSI_LIST_append_k2e-evm = " k2e-uio.dtsi"
+DTSI_LIST_append_k2e = " k2e-uio.dtsi"

 KERNEL_DEVICETREE_append_am57xx-evm = "${@base_conditional("ENABLE_TI_UIO_DEVICES", "1", " am572x-idk-pru-excl-uio.dtb", "", d)}"

--- a/recipes-multimedia/libdce/libdce_3.00.12.00.bb
+++ b/recipes-multimedia/libdce/libdce_3.00.12.00.bb
@@ -7,9 +7,7 @@ inherit autotools pkgconfig
 DEPENDS = "libdrm ti-ipc"

 SRC_URI = "git://git.omapzoom.org/repo/libdce.git;protocol=git"
-SRCREV = "f83e785d2b98404fed9e3a6264bf4945c65abd12"
+SRCREV = "1b1b5a2e5e995f607c22651579b49aa98d08610a"

 S = "${WORKDIR}/git"
 EXTRA_OECONF += "IPC_HEADERS=${STAGING_INCDIR}/ti/ipc/mm"
-
-PR = "r1"
--- a/recipes-ti/devtools/gcc-arm-none-eabi-native_4.9.2015q3.bb
+++ b/recipes-ti/devtools/gcc-arm-none-eabi-native_4.9.2015q3.bb
@@ -6,12 +6,12 @@ LIC_FILES_CHKSUM = "file://share/doc/gcc-arm-none-eabi/license.txt;md5=cba77c7fd
 inherit native
 require recipes-ti/includes/ti-paths.inc

-SRC_URI = "https://launchpad.net/gcc-arm-embedded/4.8/4.8-2014-q3-update/+download/gcc-arm-none-eabi-4_8-2014q3-20140805-linux.tar.bz2;name=gcc-arm-none"
+SRC_URI = "https://launchpad.net/gcc-arm-embedded/4.9/4.9-2015-q3-update/+download/gcc-arm-none-eabi-4_9-2015q3-20150921-linux.tar.bz2;name=gcc-arm-none"

-SRC_URI[gcc-arm-none.md5sum] = "acc8c8ff45f8801e2155934214309a87"
-SRC_URI[gcc-arm-none.sha256sum] = "e33d7546de1e02844239c72b3ef5563f472fcd6b4637419d513770ae13f551c0"
+SRC_URI[gcc-arm-none.md5sum] = "8a4a74872830f80c788c944877d3ad8c"
+SRC_URI[gcc-arm-none.sha256sum] = "c50078bfbd29e6c15615900e746f4d0acde917338e55860b0f145f57387c12ab"

-S = "${WORKDIR}/gcc-arm-none-eabi-4_8-2014q3"
+S = "${WORKDIR}/gcc-arm-none-eabi-4_9-2015q3"

 do_install() {
    install -d ${D}${GCC_ARM_NONE_TOOLCHAIN_RECIPE}
--- a/recipes-ti/devtools/ti-ccsv6-native_6.1.3.00034.bb
+++ b/recipes-ti/devtools/ti-ccsv6-native_6.1.3.00034.bb
@@ -20,8 +20,8 @@ BINFILE = "CCS${PV}_linux/ccs_setup_${PV}.bin"
 TI_BIN_UNPK_ARGS = "--mode unattended --prefix ${WORKDIR}"
 TI_BIN_UNPK_CMDS = ""

-SRC_URI[ccsv6.md5sum] = "d95121970f8bcee944bf8b8e576bf3ec"
-SRC_URI[ccsv6.sha256sum] = "b785f040de8cccbc571923e34303fea92484677845df64a65abee2d3c248fa5b"
+SRC_URI[ccsv6.md5sum] = "ceaa5023c1a4b51bc637d3de1a15786b"
+SRC_URI[ccsv6.sha256sum] = "fb3205a21942da09684c871371513707c841c4fd8d88a62f6a7865b0a86cc492"

 do_install() {
    install -d ${D}${CCSV6_INSTALL_DIR_RECIPE}
--- a/recipes-ti/framework-components/ti-framework-components_3.40.01.04.bb
+++ b/recipes-ti/framework-components/ti-framework-components_3.40.01.04.bb
@@ -1,9 +0,0 @@
-require ti-framework-components.inc
-
-PV = "3_40_01_04"
-PR = "r0"
-
-LIC_FILES_CHKSUM = "file://framework_components_${PV}_Manifest.html;md5=806c3e4afd3bfbf7e5dc400ed1a0cc3c"
-
-SRC_URI[fctarball.md5sum] = "0e6b61cb6e1ad8b249d64f041c872192"
-SRC_URI[fctarball.sha256sum] = "eb38002092a7fc8f704fe9ea9de7f29108bc2533ba95f184706b2936dd24711c"
--- a/recipes-ti/framework-components/ti-framework-components_3.40.02.07.bb
+++ b/recipes-ti/framework-components/ti-framework-components_3.40.02.07.bb
@@ -0,0 +1,9 @@
+require ti-framework-components.inc
+
+PV = "3_40_02_07"
+PR = "r0"
+
+LIC_FILES_CHKSUM = "file://framework_components_${PV}_Manifest.html;md5=0dd131dd53300f517b14dba8824f8b0a"
+
+SRC_URI[fctarball.md5sum] = "36dd2312ea8d70aa2ae0a05a24dbf54e"
+SRC_URI[fctarball.sha256sum] = "69082a0f86d12c24b39a1293ec35cf8007b850479898d5ae485ec1e8cf2e8c72"
--- a/recipes-ti/includes/ti-eula-unpack.inc
+++ b/recipes-ti/includes/ti-eula-unpack.inc
@@ -9,7 +9,7 @@
 #  TI_BIN_UNPK_WDEXT  - This variable extends workdir path, if user wants to put
 #                       the output in some internal directory

-require ../includes/ti-unpack.inc
+require recipes-ti/includes/ti-unpack.inc

 TI_BIN_UNPK_ARGS = "--mode console"

--- a/recipes-ti/ipc/ipc-transport-common-rtos_git.bb
+++ b/recipes-ti/ipc/ipc-transport-common-rtos_git.bb
@@ -5,7 +5,7 @@ PR = "${INC_PR}.1"

 LIC_FILES_CHKSUM = "file://common_src/bench_common.h;beginline=1;endline=31;md5=a6ddfb26d2097041d513e3881f40e4e8"

-COMPATIBLE_MACHINE = "k2hk-evm|k2l-evm|k2e-evm"
+COMPATIBLE_MACHINE = "k2hk-evm|k2l-evm|k2e"

 IPC_TRANSPORT_COMMON_DESTSUFFIX = "git/c66/example"

--- a/recipes-ti/ipc/ipc-transport-qmss-rtos_git.bb
+++ b/recipes-ti/ipc/ipc-transport-qmss-rtos_git.bb
@@ -5,7 +5,7 @@ PR = "${INC_PR}.4"

 LIC_FILES_CHKSUM = "file://TransportQmss.xdc;beginline=1;endline=35;md5=ad783760d74a4cc5b8d4ad3d8a1f28a2"

-COMPATIBLE_MACHINE = "k2hk-evm|k2l-evm|k2e-evm"
+COMPATIBLE_MACHINE = "k2hk-evm|k2l-evm|k2e"

 DEPENDS_append = " qmss-lld-rtos \
                   cppi-lld-rtos \
@@ -18,7 +18,7 @@ IPC_TRANSPORT_QMSS_DESTSUFFIX = "git/c66/qmss"
 S = "${WORKDIR}/${IPC_TRANSPORT_QMSS_DESTSUFFIX}"

 XDCARGS_k2hk-evm = "k2h k2k"
-XDCARGS_k2e-evm = "k2e"
+XDCARGS_k2e = "k2e"
 XDCARGS_k2l-evm = "k2l"

 export IPC_INSTALL_PATH = "${IPC_INSTALL_DIR}"
--- a/recipes-ti/ipc/ipc-transport-qmss-test_git.bb
+++ b/recipes-ti/ipc/ipc-transport-qmss-test_git.bb
@@ -11,7 +11,7 @@ DEPENDS = "ipc-transport-qmss ti-ipc"
 CHOICELIST = "yes no"

 DEVICELIST_k2hk-evm = "k2h k2k"
-DEVICELIST_k2e-evm  = "k2e"
+DEVICELIST_k2e  = "k2e"
 DEVICELIST_k2l-evm  = "k2l"

 do_compile () {
--- a/recipes-ti/ipc/ti-ipc-rtos_git.bb
+++ b/recipes-ti/ipc/ti-ipc-rtos_git.bb
@@ -26,18 +26,18 @@ protocol=${TI_IPC_METADATA_GIT_PROTOCOL};\
 branch=${TI_IPC_METADATA_GIT_BRANCH};\
 name=${TI_IPC_METADATA_NAME}"

-# Corresponds to tag: 3.43.01.02
-SRCREV_ipc-examples = "c2324cdcda4f6641cade25f95fa30996fb94bca0"
+# Corresponds to tag: 3.44.00.00
+SRCREV_ipc-examples = "a934d057647af00401e4bfd1c6a4a0f6144441b7"

-# Corresponds to tag: 3.43.01.02
-SRCREV_ipc-metadata = "c3fc63be358c8c9a429366ebf54fe03812671129"
+# Corresponds to tag: 3.44.00.00
+SRCREV_ipc-metadata = "07a745d47ecd7b4b64860e7c5d0fbe4e89524f2e"

 S_ipc-examples = "${WORKDIR}/git/ipc-examples"
 S_ipc-metadata = "${WORKDIR}/git/ipc-metadata"

-PR = "${INC_PR}.0"
+PR = "${INC_PR}.3"

-DEPENDS = "ti-xdctools ti-sysbios doxygen-native"
+DEPENDS = "ti-xdctools ti-sysbios doxygen-native zip-native"
 DEPENDS_append_keystone = " ti-cgt6x-native \
                            gcc-arm-none-eabi-native \
 "
@@ -61,7 +61,6 @@ IPC_TARGETS_omap-a15 = "\
    ti.targets.elf.C66="${STAGING_DIR_NATIVE}/usr/share/ti/cgt-c6x" \
    ti.targets.elf.C66_big_endian="${STAGING_DIR_NATIVE}/usr/share/ti/cgt-c6x" \
    ti.targets.arm.elf.M4="${M4_TOOLCHAIN_INSTALL_DIR}" \
-    ti.targets.arm.elf.M4F="${M4_TOOLCHAIN_INSTALL_DIR}" \
 "

 IPC_TARGETS_keystone = " \
@@ -123,10 +122,6 @@ do_compile() {
  fi
 }

-do_compile_append() {
-  sourceipk_do_create_srcipk
-}
-
 do_install() {
  IPC_VERSION=`echo ${PV}${RELEASE_SUFFIX} | sed -e 's|\.|_|g'`
  # Copy docs and other meta files
--- a/Show More
+++ b/Show More