u-boot-ti-staging: also copy HS MLO variant

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

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"

conf/machine/am437x-hs-evm.conf

@@ -11,4 +11,4 @@ UBOOT_LOADADDRESS = "0x82000000"
 UBOOT_RD_LOADADDRESS = "0x84000000"
 UBOOT_RD_ENTRYPOINT = "0x84000000"
 
-TI_SECURE_DEV_PKG = "${TI_SECURE_DEV_PKG_AM4}"
+TI_SECURE_DEV_PKG = "${TI_SECURE_DEV_PKG_CAT}/am4x"

conf/machine/am57xx-hs-evm.conf

@@ -11,8 +11,8 @@ UBOOT_LOADADDRESS = "0x82000000"
 UBOOT_RD_LOADADDRESS = "0x84000000"
 UBOOT_RD_ENTRYPOINT = "0x84000000"
 
-TI_SECURE_DEV_PKG = "${TI_SECURE_DEV_PKG_DRA7}"
+TI_SECURE_DEV_PKG = "${TI_SECURE_DEV_PKG_AUTO}"
 
 OPTEEMACHINE = "ti"
-OPTEEFLAVOR = "am572x_evm"
+OPTEEFLAVOR = "am57xx_evm"
 OPTEEOUTPUTMACHINE = "ti"

conf/machine/dra7xx-hs-evm.conf

@@ -11,8 +11,8 @@ UBOOT_LOADADDRESS = "0x82000000"
 UBOOT_RD_LOADADDRESS = "0x84000000"
 UBOOT_RD_ENTRYPOINT = "0x84000000"
 
-TI_SECURE_DEV_PKG = "${TI_SECURE_DEV_PKG_DRA7}"
+TI_SECURE_DEV_PKG = "${TI_SECURE_DEV_PKG_AUTO}"
 
 OPTEEMACHINE = "ti"
-OPTEEFLAVOR = "dra7xx_evm dra72x_evm_revc"
+OPTEEFLAVOR = "dra7_evm dra72_evm_revc"
 OPTEEOUTPUTMACHINE = "ti"

conf/machine/include/k2e.inc

@@ -0,0 +1,2 @@
+require conf/machine/include/keystone.inc
+SOC_FAMILY_append = ":k2e"

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"
 

conf/machine/k2e-hs-evm.conf

@@ -11,4 +11,4 @@ UBOOT_LOADADDRESS = "0x82000000"
 UBOOT_RD_LOADADDRESS = "0x84000000"
 UBOOT_RD_ENTRYPOINT = "0x84000000"
 
-TI_SECURE_DEV_PKG = "${TI_SECURE_DEV_PKG_AM4}"
+TI_SECURE_DEV_PKG = "${TI_SECURE_DEV_PKG_CAT}/k2e"

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}"
 

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

@@ -1,5 +1,5 @@
 require common-csl-ip.inc
-PR = "${INC_PR}.3"
+PR = "${INC_PR}.4"
 
 PACKAGE_ARCH = "${MACHINE_ARCH}"
 
@@ -15,7 +15,7 @@ LIMSOCS_ti43x = "am437x"
 LIMSOCS_omap-a15 = "am571x am572x"
 LIMSOCS_k2hk-evm = "k2h k2k"
 LIMSOCS_k2l-evm = "k2l"
-LIMSOCS_k2e-evm = "k2e"
+LIMSOCS_k2e = "k2e"
 LIMSOCS_k2g-evm = "k2g"
 
 export PDK_CSL_ROOT_PATH ="${WORKDIR}/build"

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.3C"
+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"
 
-# Below commit ID corresponds to "DEV.CSL_PROCESSOR-SDK.03.03.00.03C"
-CSL_SRCREV = "ccd8dc29a5edce1a4d6409cb06b460bec6d3ecac"
+# 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}"

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"

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}"

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}"
 

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}"

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

@@ -6,12 +6,12 @@ EDMA3_LLD_GIT_URI = "git://git.ti.com/keystone-rtos/edma3_lld.git"
 EDMA3_LLD_GIT_PROTOCOL = "git"
 EDMA3_LLD_GIT_BRANCH = "master"
 
-# Below commit ID corresponds to tag "DEV_EDMA3_LLD_02_12_01_24"
-EDMA3_LLD_SRCREV = "e864a057032b070fc04628bac1345ecef01e2224"
+# 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.24"
+PV = "2.12.01.25A"
 INC_PR = "r0"

recipes-bsp/hplib/hplib.inc

@@ -3,7 +3,7 @@ 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"

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}"

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

@@ -9,7 +9,7 @@ DEPENDS="common-csl-ip mmap-lld"
 RDEPENDS_${PN}="uio-module-drv"
 
 DEVICELIST_k2hk-evm = "k2h k2k"
-DEVICELIST_k2e-evm  = "k2e"
+DEVICELIST_k2e  = "k2e"
 DEVICELIST_k2l-evm  = "k2l"
 DEVICELIST_k2g-evm  = "k2g"
 

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}"
 

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"

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
-

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.12"
-PA_LLD_SRCREV = "d3f3f5d93d3febc24099974bbc77e67c80a83b1e"
+# 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.12"
-INC_PR = "r2"
+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"

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"

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_k2e = "k2e"
 XDCARGS_k2g-evm = "k2g"

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}"

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"

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"
 

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"
 
-# Below commit ID corresponds to "DEV.SA_LLD.03.00.00.14"
-SA_LLD_SRCREV = "e0448f5172f9a4d945f9ad1b2a583574c378b5c7"
+# 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.14"
-INC_PR = "r2"
+PV = "03.00.00.15"
+INC_PR = "r0"
 
 S = "${WORKDIR}/${SA_LLD_GIT_DESTSUFFIX}"

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

@@ -3,7 +3,7 @@ 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.22"
 PR = "r0"
 
 CLEANBROKEN = "1"
@@ -12,7 +12,7 @@ COMPATIBLE_MACHINE = "k2g-evm"
 
 PACKAGE_ARCH = "${MACHINE_ARCH}"
 
-SRCREV = "89c279adfdd0e58f002ba6f0c26a14869b2d74cb"
+SRCREV = "43c9f88e3c9dc974cfcf9cf62befaf433ab1514b"
 BRANCH ?= "ti-linux-firmware-4.1.y"
 
 SRC_URI = "git://git.ti.com/processor-firmware/ti-linux-firmware.git;protocol=git;branch=${BRANCH}"

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}"

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"

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}
-}

recipes-bsp/u-boot/u-boot-ti-staging_2016.05.bb

@@ -7,20 +7,21 @@ DESCRIPTION = "u-boot bootloader for TI devices"
 
 LIC_FILES_CHKSUM = "file://Licenses/README;md5=a2c678cfd4a4d97135585cad908541c6"
 
-PR = "r15"
+PR = "r21"
 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 = "887fd1bf94087c13f30472fb7279690bb680e3ee"
+SRCREV = "bbfdf926a1ebd5620fa8e3e60b9e747d8de12254"
 
 # Support for secure devices - detailed info is in doc/README.ti-secure
 TI_SECURE_DEV_PKG ?= ""
 export TI_SECURE_DEV_PKG
 
 SPL_BINARY = "MLO"
+SPL_BINARY_k2e-hs-evm = ""
 SPL_UART_BINARY = "u-boot-spl.bin"
 
 # Keystone specifics
@@ -45,6 +46,11 @@ 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
@@ -57,6 +63,10 @@ do_install_append () {
 		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 () {
@@ -66,6 +76,12 @@ do_deploy_append () {
 		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 () {

recipes-kernel/linux/cmem.inc

@@ -1,18 +1,72 @@
-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"
 
+# Set cmem.dtsi per machine or machine variant
+CMEM_DTSI = "cmem.dtsi"
+CMEM_DTSI_am571x = "cmem-am571x.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"
+
+
+# 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
+# Add correct cmem.dtsi to SRC_URI for each variant for a given machine
+python() {
+    old_overrides = d.getVar('OVERRIDES', False)
 
-        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
+    # 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"

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>;
+                };
+        };
+};

recipes-kernel/linux/files/k2e/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";
 		};

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";
 		};

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 = "f8c45f6a24b969bfe5a734ebd721ab9c0a3d9f0c"
+SRCREV = "d124887cc93ce18aa3f0c39ed708a75a8f29d77e"

recipes-kernel/linux/linux-ti-staging_4.4.bb

@@ -39,7 +39,7 @@ 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
@@ -66,7 +66,7 @@ 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_k2e = "keystone-k2e-evm.dtb"
 KERNEL_DEVICETREE_k2g-evm = "keystone-k2g-evm.dtb"
 KERNEL_DEVICETREE_k2l-evm = "keystone-k2l-evm.dtb"
 
@@ -76,11 +76,11 @@ S = "${WORKDIR}/git"
 
 BRANCH = "ti-lsk-linux-4.4.y"
 
-SRCREV = "00f19d3e5347c2992fe0de52cabe5d379673973d"
-PV = "4.4.20+git${SRCPV}"
+SRCREV = "4cd9d100e608a1fea838bad79c9c413b3e756d23"
+PV = "4.4.23+git${SRCPV}"
 
 # Append to the MACHINE_KERNEL_PR so that a new SRCREV will cause a rebuild
-MACHINE_KERNEL_PR_append = "a"
+MACHINE_KERNEL_PR_append = "e"
 PR = "${MACHINE_KERNEL_PR}"
 
 KERNEL_GIT_URI = "git://git.ti.com/ti-linux-kernel/ti-linux-kernel.git"

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)}"
 

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}

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"
 

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}"

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 () {

recipes-ti/ipc/ti-ipc-rtos_git.bb

@@ -26,11 +26,11 @@ protocol=${TI_IPC_METADATA_GIT_PROTOCOL};\
 branch=${TI_IPC_METADATA_GIT_BRANCH};\
 name=${TI_IPC_METADATA_NAME}"
 
-# Corresponds to tag: 3.43.01.03
-SRCREV_ipc-examples = "e003640aa2ae8f5d433f6cda2172ecadffb5ac92"
+# Corresponds to tag: 3.43.02.04
+SRCREV_ipc-examples = "766ee598c790c95dad80f9e5db5051e35de4e18f"
 
-# Corresponds to tag: 3.43.01.03
-SRCREV_ipc-metadata = "b6dd82a450d75b9483a7cc9b619a30cf3cc25ae6"
+# Corresponds to tag: 3.43.02.04
+SRCREV_ipc-metadata = "394e8b9fda6981f4c485c4a48c0a13a0a3236390"
 
 S_ipc-examples = "${WORKDIR}/git/ipc-examples"
 S_ipc-metadata = "${WORKDIR}/git/ipc-metadata"
@@ -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 = " \

recipes-ti/ipc/ti-ipc.inc

@@ -8,15 +8,15 @@ TI_IPC_GIT_URI = "git://git.ti.com/ipc/ipcdev.git"
 TI_IPC_GIT_PROTOCOL = "git"
 TI_IPC_GIT_BRANCH = "3.43"
 
-#Corresponds to 3.43.01.03
-TI_IPC_SRCREV = "eb4e543f60cccf427d47900014bcf9a5ae413cd6"
+#Corresponds to 3.43.02.04
+TI_IPC_SRCREV = "c179a1f4a102fc0c2b72da4db87753c8e523d639"
 
 BRANCH = "${TI_IPC_GIT_BRANCH}"
 SRC_URI = "${TI_IPC_GIT_URI};protocol=${TI_IPC_GIT_PROTOCOL};branch=${BRANCH};name=ipcdev"
 SRCREV = "${TI_IPC_SRCREV}"
 
 S = "${WORKDIR}/git"
-PV = "3.43.01.03"
+PV = "3.43.02.04"
 INC_PR = "r0"
 
 PACKAGE_ARCH = "${MACHINE_ARCH}"
@@ -26,7 +26,7 @@ PLATFORM_omap5-evm = "OMAP54XX"
 PLATFORM_dra7xx = "DRA7XX"
 PLATFORM_k2hk-evm = "TCI6638"
 PLATFORM_k2l-evm = "TCI6630"
-PLATFORM_k2e-evm = "66AK2E"
+PLATFORM_k2e = "66AK2E"
 PLATFORM_k2g-evm = "66AK2G"
 
 ALT_PLATFORM_k2hk-evm = "TCI6636"

recipes-ti/ipc/ti-ipc_git.bb

@@ -16,7 +16,7 @@ DAEMON_omap5-evm = "lad_omap54xx_smp"
 DAEMON_dra7xx = "lad_dra7xx"
 DAEMON_k2hk-evm = "lad_tci6638"
 DAEMON_k2l-evm = "lad_tci6630"
-DAEMON_k2e-evm = "lad_66ak2e"
+DAEMON_k2e = "lad_66ak2e"
 DAEMON_k2g-evm = "lad_66ak2g"
 
 inherit autotools-brokensep pkgconfig update-rc.d

recipes-ti/mpm-transport/mpm-transport_git.bb

@@ -6,7 +6,7 @@ COMPATIBLE_MACHINE = "keystone"
 
 DEPENDS = "common-csl-ip edma3-lld mmap-lld cmem rm-lld qmss-lld cppi-lld uio-module-drv syslog-ng"
 DEPENDS_append_k2hk-evm = " hyplnk-lld srio-lld"
-DEPENDS_append_k2e-evm = " hyplnk-lld"
+DEPENDS_append_k2e = " hyplnk-lld"
 
 RDEPENDS_${PN} = "syslog-ng"
 
@@ -15,15 +15,15 @@ PACKAGE_ARCH = "${MACHINE_ARCH}"
 SRC_URI = "git://git.ti.com/keystone-linux/mpm-transport.git;protocol=git;branch=${BRANCH}"
 
 BRANCH = "master"
-# This commit corresponds to tag DEV.MPM-TRANSPORT-02.00.01.02
-SRCREV = "5c1f177b8d5802227dfe7e86fc026620e1e10189"
+# This commit corresponds to tag DEV.MPM-TRANSPORT-02.00.02.00
+SRCREV = "696a9ec37559b671860ef393194c6032b7b6d9ef"
 
-PV = "2.0.1.2"
+PV = "2.0.2.0"
 PR = "r0"
 
 EXTRA_OEMAKE = "PDK_INSTALL_PATH=${STAGING_INCDIR}"
 EXTRA_OEMAKE_append_k2hk-evm += "HYPLNK_TRANSPORT=true SRIO_TRANSPORT=true"
-EXTRA_OEMAKE_append_k2e-evm += "HYPLNK_TRANSPORT=true"
+EXTRA_OEMAKE_append_k2e += "HYPLNK_TRANSPORT=true"
 
 S = "${WORKDIR}/git"
 

recipes-ti/netapi/netapi.inc

@@ -25,7 +25,7 @@ INC_PR = "r0"
 
 DEVICELIST_k2hk-evm = "k2h k2k"
 DEVICELIST_k2l-evm  = "k2l"
-DEVICELIST_k2e-evm  = "k2e"
+DEVICELIST_k2e  = "k2e"
 
 CHOICELIST = "yes no"
 

recipes-ti/openmp-rtos/openmp-rtos_git.bb

@@ -4,7 +4,7 @@ LICENSE = "BSD"
 
 require recipes-ti/includes/ti-paths.inc
 
-PV = "2_03_01_00"
+PV = "2_04_00_01"
 PR = "r0"
 
 OPENMP_RTOS_GIT_URI = "git://git.ti.com/openmp/ti-openmp-dsp-runtime.git"
@@ -15,13 +15,13 @@ BRANCH = "${OPENMP_RTOS_GIT_BRANCH}"
 SRC_URI = "${OPENMP_RTOS_GIT_URI};protocol=${OPENMP_RTOS_GIT_PROTOCOL};branch=${BRANCH} \
 "
 
-SRCREV = "a73b7b5a79a6ca9390388079b09a1cf5795bd7fc"
+SRCREV = "0a16ee27f0f61d4042327c71cff9ed52e5435777"
 
 LIC_FILES_CHKSUM = "file://docs/license/omp_manifest_template.html;md5=61a6972303c0447b7c056195d7ebafee"
 
 DEPENDS = "common-csl-ip-rtos ti-xdctools ti-ipc-rtos ti-sysbios ti-cgt6x-native libulm zip-native"
 DEPENDS_append_k2hk-evm = " qmss-lld-rtos cppi-lld-rtos"
-DEPENDS_append_k2e-evm = " qmss-lld-rtos cppi-lld-rtos"
+DEPENDS_append_k2e = " qmss-lld-rtos cppi-lld-rtos"
 DEPENDS_append_k2l-evm = " qmss-lld-rtos cppi-lld-rtos"
 
 COMPATIBLE_MACHINE = "keystone|omap-a15"

recipes-ti/ti-pdk-build/ti-pdk-build-rtos_git.bb

@@ -4,15 +4,15 @@ LIC_FILES_CHKSUM = "file://makerules/env.mk;beginline=1;endline=31;md5=10503e8de
 
 require recipes-ti/includes/ti-paths.inc
 
-PV = "01.00.00.00A"
-PR = "r4"
+PV = "01.00.00.02B"
+PR = "r0"
 
 PDK_BUILD_GIT_URI = "git://git.ti.com/keystone-rtos/processor-pdk-build.git"
 PDK_BUILD_GIT_PROTOCOL = "git"
 PDK_BUILD_GIT_BRANCH = "master"
 
-# Below Commit ID corresponds to "DEV.PDK_BUILD.01.00.00.00A"
-PDK_BUILD_SRCREV = "8a026319765cc125e2daef709841bb3ce1a8d325"
+# Below Commit ID corresponds to "DEV.PDK_BUILD.01.00.00.02B"
+PDK_BUILD_SRCREV = "28a1bf6dba6d4eb6d80bfe37c5a5f17941754192"
 
 BRANCH = "${PDK_BUILD_GIT_BRANCH}"
 SRC_URI = "${PDK_BUILD_GIT_URI};protocol=${PDK_BUILD_GIT_PROTOCOL};branch=${BRANCH}"
@@ -32,10 +32,12 @@ do_compile() {
 do_install() {
     install -d ${D}${PDK_INSTALL_DIR_RECIPE}/packages/ti/build
     install -d ${D}${PDK_INSTALL_DIR_RECIPE}/packages/ti/build/makerules
+    install -d ${D}${PDK_INSTALL_DIR_RECIPE}/packages/ti/build/am335x
     install -d ${D}${PDK_INSTALL_DIR_RECIPE}/packages/ti/build/am571x
     install -d ${D}${PDK_INSTALL_DIR_RECIPE}/packages/ti/build/am572x
     
     install -m 0755 Rules.make ${D}${PDK_INSTALL_DIR_RECIPE}/packages/ti/build
+    install -m 0755 comp_top.mk ${D}${PDK_INSTALL_DIR_RECIPE}/packages/ti/build
 
     sed -i -e "s|c\:/ti/ccsv5/utils/cygwin|\$(XDC_INSTALL_PATH)/bin|g" \
         ${D}${PDK_INSTALL_DIR_RECIPE}/packages/ti/build/Rules.make
@@ -52,6 +54,8 @@ do_install() {
     install -m 0755 makerules/rules_a9.mk ${D}${PDK_INSTALL_DIR_RECIPE}/packages/ti/build/makerules
     install -m 0755 makerules/rules_m4.mk ${D}${PDK_INSTALL_DIR_RECIPE}/packages/ti/build/makerules
     install -m 0755 makerules/rules_ti_cgt_arm.mk ${D}${PDK_INSTALL_DIR_RECIPE}/packages/ti/build/makerules
+    install -m 0755 am335x/config_am335x_a8.bld ${D}${PDK_INSTALL_DIR_RECIPE}/packages/ti/build/am335x
+    install -m 0755 am335x/mem_segment_definition_1024mb_bios.xs ${D}${PDK_INSTALL_DIR_RECIPE}/packages/ti/build/am335x
     install -m 0755 am571x/config_am571x.bld ${D}${PDK_INSTALL_DIR_RECIPE}/packages/ti/build/am571x
     install -m 0755 am571x/config_am571x_c66.bld ${D}${PDK_INSTALL_DIR_RECIPE}/packages/ti/build/am571x
     install -m 0755 am571x/config_am571x_a15.bld ${D}${PDK_INSTALL_DIR_RECIPE}/packages/ti/build/am571x