linux-ti-staging: update with opp core fix

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

README

@@ -8,7 +8,7 @@ This layer depends on:
 
 URI: git://git.openembedded.org/openembedded-core
 layers: meta
-branch: master
+branch: krogoth
 
 
 The base BSP part of meta-ti should work with different OpenEmbedded/Yocto
@@ -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>

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"

conf/layer.conf

@@ -11,8 +11,8 @@ BBFILE_PRIORITY_meta-ti = "6"
 LICENSE_PATH += "${LAYERDIR}/licenses"
 
 SIGGEN_EXCLUDERECIPES_ABISAFE += " \
-    omapdrm-pvr \
-    omap5-sgx-ddk-um-linux \
+    ti-sgx-ddk-km \
+    ti-sgx-ddk-um \
     ti-ipc \
     ti-ipc-rtos \
     cmem-mod \

conf/machine/am335x-evm.conf

@@ -9,10 +9,10 @@ XSERVER += "xf86-input-tslib"
 MACHINE_GUI_CLASS = "smallscreen"
 MACHINE_FEATURES += "touchscreen"
 
-IMAGE_FSTYPES += "ubi tar.gz tar.xz"
+IMAGE_FSTYPES += "ubifs ubi tar.xz"
 
 SERIAL_CONSOLE = ""
-SERIAL_CONSOLES = "115200;ttyS0 115200;ttyS3"
+SERIAL_CONSOLES = "115200;ttyS0 115200;ttyO0 115200;ttyS3 115200;ttyO3"
 SERIAL_CONSOLES_CHECK = "${SERIAL_CONSOLES}"
 
 # UBI information.  Note that this is board and kernel specific.  Changes
@@ -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 4600"
+MKUBIFS_ARGS = "-F -m 2048 -e 126976 -c 5700"
 
 # do ubiattach /dev/ubi_ctrl -m 7 -O 2048
 # from dmesg:

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-evm.conf

@@ -9,9 +9,11 @@ XSERVER += "xf86-input-tslib"
 MACHINE_GUI_CLASS = "smallscreen"
 MACHINE_FEATURES += "touchscreen"
 
-IMAGE_FSTYPES += "ubi tar.gz tar.xz"
+IMAGE_FSTYPES += "ubifs ubi tar.xz"
 
-SERIAL_CONSOLE = "115200 ttyO0"
+SERIAL_CONSOLE = ""
+SERIAL_CONSOLES = "115200;ttyS0 115200;ttyO0"
+SERIAL_CONSOLES_CHECK = "${SERIAL_CONSOLES}"
 
 # UBI information.  Note that this is board and kernel specific.  Changes
 # in your kernel port may require changes in these variables.  For more
@@ -24,7 +26,7 @@ SERIAL_CONSOLE = "115200 ttyO0"
 # UBI: logical eraseblock size:    253952 bytes
 # from ubiattach stdout:
 # UBI device number 0, total 994 LEBs
-MKUBIFS_ARGS = "-F -m 4096 -e 253952 -c 2200"
+MKUBIFS_ARGS = "-F -m 4096 -e 253952 -c 2700"
 
 # do ubiattach /dev/ubi_ctrl -m 11 -O 4096
 # from dmesg:

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"

conf/machine/am57xx-evm.conf

@@ -6,9 +6,11 @@ require conf/machine/include/dra7xx.inc
 
 MACHINE_FEATURES += "touchscreen"
 
-IMAGE_FSTYPES += "ubi tar.gz tar.xz"
+IMAGE_FSTYPES += "tar.xz"
 
-SERIAL_CONSOLE = "115200 ttyO2"
+SERIAL_CONSOLE = ""
+SERIAL_CONSOLES = "115200;ttyS2 115200;ttyO2"
+SERIAL_CONSOLES_CHECK = "${SERIAL_CONSOLES}"
 
 UBOOT_MACHINE = "am57xx_evm_config"
 

conf/machine/am57xx-hs-evm.conf

@@ -0,0 +1,18 @@
+#@TYPE: Machine
+#@NAME: AM57xx HS EVM
+#@DESCRIPTION: Machine configuration for the TI AM57xx HS EVM
+
+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}/am5x"
+
+OPTEEMACHINE = "ti"
+OPTEEFLAVOR = "am57xx"
+OPTEEOUTPUTMACHINE = "ti"

conf/machine/dra7xx-evm.conf

@@ -6,9 +6,11 @@ require conf/machine/include/dra7xx.inc
 
 MACHINE_FEATURES += "touchscreen"
 
-IMAGE_FSTYPES += "ubi tar.gz tar.xz"
+IMAGE_FSTYPES += "tar.xz"
 
-SERIAL_CONSOLE = "115200 ttyO0"
+SERIAL_CONSOLE = ""
+SERIAL_CONSOLES = "115200;ttyS0 115200;ttyO0"
+SERIAL_CONSOLES_CHECK = "${SERIAL_CONSOLES}"
 
 UBOOT_MACHINE = "dra7xx_evm_config"
 

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}/dra7"
+
+OPTEEMACHINE = "ti"
+OPTEEFLAVOR = "dra7xx"
+OPTEEOUTPUTMACHINE = "ti"

conf/machine/include/dra7xx.inc

@@ -1,4 +1,4 @@
 require conf/machine/include/omap-a15.inc
 SOC_FAMILY_append = ":dra7xx"
 
-MACHINE_FEATURES += "pci"
+MACHINE_FEATURES += "pci opencl"

conf/machine/include/k2e.inc

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

conf/machine/include/k2g.inc

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

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"

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

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"

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"

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"

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"

conf/machine/k2e-evm.conf

@@ -2,15 +2,19 @@
 #@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"
 
 UBOOT_MACHINE = "k2e_evm_config"
 
 BOOT_MONITOR_MAKE_TARGET = "k2e"
 
-IMAGE_FSTYPES += "ubi tar.gz tar.xz cpio"
+IMAGE_FSTYPES += "ubifs ubi tar.xz"
 
-SERIAL_CONSOLE = "115200 ttyS0"
+SERIAL_CONSOLE = ""
+SERIAL_CONSOLES = "115200;ttyS0 115200;ttyO0"
+SERIAL_CONSOLES_CHECK = "${SERIAL_CONSOLES}"
 
 SYSVINIT_ENABLED_GETTYS = ""
 

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"

conf/machine/k2g-evm.conf

@@ -2,17 +2,19 @@
 #@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"
+MACHINE_FEATURES += "alsa opencl"
 
 UBOOT_MACHINE = "k2g_evm_config"
 
 BOOT_MONITOR_MAKE_TARGET = "k2g"
 
-IMAGE_FSTYPES += "ubi tar.gz tar.xz cpio"
+IMAGE_FSTYPES += "ubifs ubi tar.xz"
 
-SERIAL_CONSOLE = "115200 ttyS0"
+SERIAL_CONSOLE = ""
+SERIAL_CONSOLES = "115200;ttyS0 115200;ttyO0"
+SERIAL_CONSOLES_CHECK = "${SERIAL_CONSOLES}"
 
 SYSVINIT_ENABLED_GETTYS = ""
 

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"

conf/machine/k2hk-evm.conf

@@ -4,13 +4,17 @@
 
 require conf/machine/include/keystone.inc
 
+MACHINE_FEATURES += "opencl"
+
 UBOOT_MACHINE = "k2hk_evm_config"
 
 BOOT_MONITOR_MAKE_TARGET = "k2hk"
 
-IMAGE_FSTYPES += "ubi tar.gz tar.xz cpio"
+IMAGE_FSTYPES += "ubifs ubi tar.xz"
 
-SERIAL_CONSOLE = "115200 ttyS0"
+SERIAL_CONSOLE = ""
+SERIAL_CONSOLES = "115200;ttyS0 115200;ttyO0"
+SERIAL_CONSOLES_CHECK = "${SERIAL_CONSOLES}"
 
 SYSVINIT_ENABLED_GETTYS = ""
 

conf/machine/k2l-evm.conf

@@ -4,13 +4,17 @@
 
 require conf/machine/include/keystone.inc
 
+MACHINE_FEATURES += "opencl"
+
 UBOOT_MACHINE = "k2l_evm_config"
 
 BOOT_MONITOR_MAKE_TARGET = "k2l"
 
-IMAGE_FSTYPES += "ubi tar.gz tar.xz cpio"
+IMAGE_FSTYPES += "ubifs ubi tar.xz"
 
-SERIAL_CONSOLE = "115200 ttyS0"
+SERIAL_CONSOLE = ""
+SERIAL_CONSOLES = "115200;ttyS0 115200;ttyO0"
+SERIAL_CONSOLES_CHECK = "${SERIAL_CONSOLES}"
 
 SYSVINIT_ENABLED_GETTYS = ""
 

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

@@ -5,20 +5,21 @@ 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"
 
-FLOATABI = "${@base_contains("TUNE_FEATURES", "vfp", base_contains("TUNE_FEATURES", "callconvention-hard", " -mfloat-abi=hard", " -mfloat-abi=softfp", d), "" ,d)}"
+FLOATABI = "${@bb.utils.contains("TUNE_FEATURES", "vfp", bb.utils.contains("TUNE_FEATURES", "callconvention-hard", " -mfloat-abi=hard", " -mfloat-abi=softfp", d), "" ,d)}"
 
 EXTRA_OEMAKE = "CROSS_COMPILE=${TARGET_PREFIX} CC="${TARGET_PREFIX}gcc ${TOOLCHAIN_OPTIONS} ${FLOATABI}" LD="${TARGET_PREFIX}gcc ${TOOLCHAIN_OPTIONS} ${FLOATABI}""
 

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

@@ -1,29 +0,0 @@
-DESCRIPTION = "Cortex-M3 binary blob for suspend-resume"
-
-LICENSE = "BSD-3-Clause"
-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 = "${@base_contains("TUNE_FEATURES", "vfp", base_contains("TUNE_FEATURES", "callconvention-hard", " -mfloat-abi=hard", " -mfloat-abi=softfp", d), "" ,d)}"
-
-do_compile() {
-	make CROSS_COMPILE="${TARGET_PREFIX}" CC="${TARGET_PREFIX}gcc ${TOOLCHAIN_OPTIONS} ${FLOATABI}"
-}
-
-do_install() {
-	install -d ${D}${base_libdir}/firmware
-	install -m 0644 bin/am335x-pm-firmware.elf ${D}${base_libdir}/firmware/
-	install -m 0644 bin/*-scale-data.bin ${D}${base_libdir}/firmware/
-}
-
-FILES_${PN} += "${base_libdir}/firmware"

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

@@ -1,19 +1,19 @@
 DESCRIPTION = "Cortex-M3 binary blob for suspend-resume"
 
-LICENSE = "BSD-3-Clause"
+LICENSE = "TI-TSPA"
 LIC_FILES_CHKSUM = "file://License.txt;md5=7bdc54a749ab7a7dea999d25d99a41b8"
 
-PV = "1.9.1"
-PR = "r2"
+PV = "1.9.2"
+PR = "r0"
 
-SRCREV = "730f0695ca2dda65abcff5763e8f108517bc0d43"
+SRCREV = "7eb9c0856a9e8b3b42bf64f761da135852b8eea7"
 BRANCH ?= "ti-v4.1.y"
 
 SRC_URI = "git://git.ti.com/processor-firmware/ti-amx3-cm3-pm-firmware.git;protocol=git;branch=${BRANCH}"
 
 S = "${WORKDIR}/git"
 
-FLOATABI = "${@base_contains("TUNE_FEATURES", "vfp", base_contains("TUNE_FEATURES", "callconvention-hard", " -mfloat-abi=hard", " -mfloat-abi=softfp", d), "" ,d)}"
+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}"

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.10.02.05_eng
-SRCREV = "8df44102413c2d653341c5b7e6caee882e206d8c"
+BRANCH = "lu-next"
+# This corresponds to version 4.13.00.01_eng
+SRCREV = "1389059f01eabc1e853a384f0e5f51c4f3e4f197"
 
-PV = "4.10.02.05+git${SRCPV}"
+PV = "4.13.00.01+git${SRCPV}"
 
 SRC_URI = "git://git.ti.com/ipc/ludev.git;protocol=git;branch=${BRANCH}"
 

recipes-bsp/cmem/cmem_git.bb

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

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

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.05A"
 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.05A"
+CSL_SRCREV = "811646f507d985dac04544c60c965cadf5e26a4f"
 
 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"
+XDCARGS_k2g = "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/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"

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

@@ -6,7 +6,7 @@ COMPATIBLE_MACHINE = "dra7xx"
 
 SRC_URI = "git://git.ti.com/glsdk/dspdce.git;protocol=git"
 
-SRCREV = "88705fd4584edd1289e4bb50658def936de90433"
+SRCREV = "3b9cea492f23d7dabb9ffa0e69631b858ba8e90a"
 
 PV = "1.00.00.06"
 
@@ -15,7 +15,7 @@ S = "${WORKDIR}/git"
 require recipes-ti/includes/ti-paths.inc
 require recipes-ti/includes/ti-staging.inc
 
-PR = "r2"
+PR = "r3"
 inherit update-alternatives
 
 DEPENDS = "ti-xdctools ti-sysbios ti-codec-engine ti-framework-components ti-xdais ti-ipc-rtos ti-osal ti-cgt6x-native"

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/dsptop/dsptop_git.bb

@@ -4,7 +4,7 @@ LIC_FILES_CHKSUM = "file://debian/copyright;md5=309825aa8f5edfcf2c44912ac094b979
 
 DEPENDS = "libulm ncurses"
 
-PR = "${INC_PR}.1"
+PR = "${INC_PR}.2"
 
 S = "${WORKDIR}/git/dsptop"
 
@@ -12,7 +12,7 @@ DEVICE = ""
 DEVICE_dra7xx = "DRA7xx"
 DEVICE_keystone = "C66AK2Hxx"
 
-EXTRA_OEMAKE = "release DEVICE=${DEVICE} CROSS_COMPILE=${TARGET_PREFIX}"
+EXTRA_OEMAKE = "release DEVICE=${DEVICE} CROSS_COMPILE=${TARGET_PREFIX} CC="${CC}""
 
 do_install() {
     oe_runmake install DESTDIR=${D}

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
 }
 

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

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_02_26"
+EDMA3_LLD_SRCREV = "1c67565620f5a5305cf3293bba669c6aa1a7e40a"
 
 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.02.26"
 INC_PR = "r0"

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 = "b"
+PR = "${MACHINE_KERNEL_PR}"
+
+# Need to branch out with ${PV} var
+BRANCH = "ti-${PV}-k4.4"
+
+SRCREV = "65887c911db495fb66c6847c8b6eadc76c7470f4"
+
+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
+}

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

@@ -0,0 +1,29 @@
+DESCRIPTION = "Goodix GT9271 config firmware"
+
+LICENSE = "BSD-3-Clause"
+LIC_FILES_CHKSUM = "file://LICENCE.Spectrum-GT9271;md5=2a6de6be7af1fe46370c684daf27c852"
+
+PV = "1.0.0.0"
+PR = "r0"
+
+CLEANBROKEN = "1"
+
+COMPATIBLE_MACHINE = "dra7xx"
+
+PACKAGE_ARCH = "${MACHINE_ARCH}"
+
+SRCREV = "f1a8d1d0131f83bd1a775cde7075eb67c070892c"
+BRANCH ?= "ti-linux-firmware-4.1.y"
+
+SRC_URI = "git://git.ti.com/processor-firmware/ti-linux-firmware.git;protocol=git;branch=${BRANCH}"
+
+S = "${WORKDIR}/git"
+ORIGIN = "DRA71x-RevA-GT9271_SpecDig_Config.bin"
+TARGET = "goodix_9271_cfg.bin"
+
+do_install() {
+	install -d ${D}${base_libdir}/firmware
+	install -m 0644 ${S}/ti-evm/${ORIGIN} ${D}${base_libdir}/firmware/${TARGET}
+}
+
+FILES_${PN} = "${base_libdir}/firmware"

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"

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

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=5cc572579f07af266ab57fc17d762c7f"
 
 COMPATIBLE_MACHINE = "dra7xx"
 
@@ -17,11 +17,12 @@ RDEPENDS_${PN} = " libdce"
 
 SRC_URI = "git://git.ti.com/ivimm/ipumm.git;protocol=git"
 
-SRCREV = "c579a48d3b201fe276e406add64512eb5e90e75f"
+SRCREV = "fd441443a4289c801a0c8d9f00b6966f7fe3476c"
 
 S = "${WORKDIR}/git"
 
-PV = "3.00.10.00"
+PV = "3.00.13.00"
+PR = "r5"
 
 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"

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 \

recipes-bsp/netcp-pa-fw/netcp-pa-fw_git.bb

@@ -3,16 +3,16 @@ DESCRIPTION = "NETCP PA firmware for Keystone"
 LICENSE = "TI-TFL"
 LIC_FILES_CHKSUM = "file://LICENCE.ti-keystone;md5=3a86335d32864b0bef996bee26cc0f2c"
 
-PV = "3.0.1.8"
+PV = "3.0.1.17"
 PR = "r0"
 
 CLEANBROKEN = "1"
 
-COMPATIBLE_MACHINE = "k2hk-evm|k2l-evm|k2e-evm"
+COMPATIBLE_MACHINE = "k2hk-evm|k2l-evm|k2e"
 
 PACKAGE_ARCH = "${MACHINE_ARCH}"
 
-SRCREV = "dd8db49ed57f8ac448451cc5e54973c71a99faea"
+SRCREV = "f43b4f61315e3642e05edb9c58b098f9cc69fdb6"
 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/nwal-lld/nwal-lld.inc

@@ -8,21 +8,21 @@ NWAL_LLD_GIT_URI = "git://git.ti.com/keystone-rtos/nwal-lld.git"
 NWAL_LLD_GIT_PROTOCOL = "git"
 NWAL_LLD_GIT_BRANCH = "master"
 
-# Below commit ID corresponds to "DEV.NWAL.02.01.00.10A"
-NWAL_LLD_SRCREV = "e7ed8c5abc4b93b99a5f45699eef8f3b8ca51d1e"
+# Below commit ID corresponds to "DEV.NWAL.02.01.00.11A"
+NWAL_LLD_SRCREV = "a93303e3d682d7161030113b72c3e1adf755bf89"
 
 BRANCH = "${NWAL_LLD_GIT_BRANCH}"
 SRC_URI = "${NWAL_LLD_GIT_URI};protocol=${NWAL_LLD_GIT_PROTOCOL};branch=${BRANCH}"
 SRCREV = "${NWAL_LLD_SRCREV}"
 
-PV = "02.01.00.10"
-INC_PR = "r1"
+PV = "02.01.00.11A"
+INC_PR = "r0"
 
 BASEDIR = "${WORKDIR}/git"
 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/osal/osal-test_git.bb

@@ -0,0 +1,20 @@
+DESCRIPTION = "TI OSAL tests"
+
+DEPENDS="common-csl-ip osal"
+
+include osal.inc
+
+PR = "${INC_PR}.0"
+
+S = "${WORKDIR}/${OSAL_GIT_DESTSUFFIX}"
+
+do_compile () {
+#   Build the tests
+    make -f makefile_armv7 clean PDK_INSTALL_PATH=${STAGING_INCDIR}
+    make -f makefile_armv7 tests PDK_INSTALL_PATH=${STAGING_INCDIR} OSAL_SRC_DIR=${S}
+}
+
+do_install () {
+#   Install the binary
+    make -f makefile_armv7 installbin PDK_INSTALL_PATH=${STAGING_INCDIR} INSTALL_BIN_BASE_DIR=${D}${bindir} OSAL_SRC_DIR=${S}
+}

recipes-bsp/osal/osal.inc

@@ -0,0 +1,20 @@
+LICENSE = "BSD-3-Clause"
+LIC_FILES_CHKSUM = "file://osal.h;beginline=1;endline=31;md5=8cbd8efb1460e4f16e6b00c8a7686be4"
+
+COMPATIBLE_MACHINE = "ti33x|ti43x|omap-a15|keystone"
+PACKAGE_ARCH = "${MACHINE_ARCH}"
+
+OSAL_GIT_URI = "git://git.ti.com/keystone-rtos/osal.git"
+OSAL_GIT_PROTOCOL = "git"
+OSAL_GIT_BRANCH = "master"
+OSAL_GIT_DESTSUFFIX = "git/ti/osal"
+
+# Below commit ID corresponds to "DEV.OSAL.01.00.00.05E"
+OSAL_SRCREV = "5125c71d756530513500b463d3301d03dee04497"
+
+BRANCH = "${OSAL_GIT_BRANCH}"
+SRC_URI = "${OSAL_GIT_URI};destsuffix=${OSAL_GIT_DESTSUFFIX};protocol=${OSAL_GIT_PROTOCOL};branch=${BRANCH}"
+
+SRCREV = "${OSAL_SRCREV}"
+PV = "01.00.00.05E"
+INC_PR = "r0"

recipes-bsp/osal/osal_git.bb

@@ -0,0 +1,20 @@
+DESCRIPTION = "TI OSAL library for Linux"
+
+DEPENDS="common-csl-ip"
+
+include osal.inc
+
+PR = "${INC_PR}.0"
+
+S = "${WORKDIR}/${OSAL_GIT_DESTSUFFIX}"
+
+do_compile () {
+#   Build the lib
+    make -f makefile_armv7 clean PDK_INSTALL_PATH=${STAGING_INCDIR}
+    make -f makefile_armv7 lib PDK_INSTALL_PATH=${STAGING_INCDIR}
+}
+
+do_install () {
+#   Install the lib
+    make -f makefile_armv7 install PDK_INSTALL_PATH=${STAGING_INCDIR} INSTALL_INC_BASE_DIR=${D}${includedir} INSTALL_LIB_BASE_DIR=${D}${libdir}
+}

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.08A"
-PA_LLD_SRCREV = "9294e42fd5763555c28e46b51246bab439fd552e"
+# Below Commit ID corresponds to "DEV.PA_LLD.03.00.02.01"
+PA_LLD_SRCREV = "e95de49323678a55072c90fb213b94f96cf494b1"
 
 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.01"
+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/powervr-drivers/omap3-sgx-modules-5.01.01.01/0001-PoC-GFX-SDK-Make-5_01_01_01-work-against-3.14-LTS.patch

@@ -1,52 +0,0 @@
-From e2db38959a70d1be604a297276a0b0c2ac219bf5 Mon Sep 17 00:00:00 2001
-From: Darren Etheridge <detheridge@ti.com>
-Date: Tue, 29 Jul 2014 16:06:17 -0500
-Subject: [PATCH 1/4] PoC: GFX: SDK: Make 5_01_01_01 work against 3.14 LTS
-
-An API rename is the main change.  Also hacked in some function prototypes
-for enabling use of the tilcdc DRM driver instead of the fbdev driver on
-AM335x.  However this all really needs a good cleanup as it is hacky at
-the moment.
-
-Signed-off-by: Darren Etheridge <detheridge@ti.com>
----
- GFX_Linux_KM/services4/3rdparty/dc_ti335x_linux/omaplfb_linux.c | 5 +++++
- GFX_Linux_KM/services4/srvkm/env/linux/mutils.h                 | 6 +++++-
- 2 files changed, 10 insertions(+), 1 deletion(-)
-
-diff --git a/GFX_Linux_KM/services4/3rdparty/dc_ti335x_linux/omaplfb_linux.c b/GFX_Linux_KM/services4/3rdparty/dc_ti335x_linux/omaplfb_linux.c
-index 5c3fc48..3857b95 100644
---- a/GFX_Linux_KM/services4/3rdparty/dc_ti335x_linux/omaplfb_linux.c
-+++ b/GFX_Linux_KM/services4/3rdparty/dc_ti335x_linux/omaplfb_linux.c
-@@ -93,6 +93,11 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- #include <linux/mutex.h>
- 
- #include <video/da8xx-fb.h>
-+/* used by SGX OMAPLFB drvier */
-+typedef void (*vsync_callback_t)(void *arg);
-+int register_vsync_cb(vsync_callback_t handler, void *arg, int idx);
-+int unregister_vsync_cb(vsync_callback_t handler, void *arg, int idx);
-+
- #if defined(PVR_OMAPLFB_DRM_FB)
- #if (LINUX_VERSION_CODE < KERNEL_VERSION(3,0,0))
- #include <plat/display.h>
-diff --git a/GFX_Linux_KM/services4/srvkm/env/linux/mutils.h b/GFX_Linux_KM/services4/srvkm/env/linux/mutils.h
-index 31e0dac..90ec41c 100644
---- a/GFX_Linux_KM/services4/srvkm/env/linux/mutils.h
-+++ b/GFX_Linux_KM/services4/srvkm/env/linux/mutils.h
-@@ -79,7 +79,11 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- 	#define	IOREMAP(pa, bytes)	ioremap_cache(pa, bytes)
- #else	
- 	#if defined(__arm__) && (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0))
--		#define	IOREMAP(pa, bytes)	ioremap_cached(pa, bytes)
-+		#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,13,0))
-+			#define	IOREMAP(pa, bytes)	ioremap_cache(pa, bytes)
-+		#else
-+			#define	IOREMAP(pa, bytes)	ioremap_cached(pa, bytes)
-+		#endif
- 	#else
- 		#define IOREMAP(pa, bytes)	ioremap(pa, bytes)
- 	#endif
--- 
-1.9.1
-

recipes-bsp/powervr-drivers/omap3-sgx-modules-5.01.01.01/0002-SGX-linux-use-platform-data-to-provide-reset-info.patch

@@ -1,121 +0,0 @@
-From 7886ef77e4b48a7edd14acbcbe48f6a898251e78 Mon Sep 17 00:00:00 2001
-From: Darren Etheridge <detheridge@ti.com>
-Date: Fri, 25 Jul 2014 16:03:14 -0500
-Subject: [PATCH 2/5] SGX: linux: use platform data to provide reset info
-
-In ti-linux-3.14.y we will not have a reset driver unlike ti-linux-3.12.y
-so this commit removes the dependency on the reset driver and instead
-uses the platform data that in a dt environment is configured in
-mach-omap2/pdata-quirks.c
-
-Signed-off-by: Darren Etheridge <detheridge@ti.com>
----
- GFX_Linux_KM/services4/srvkm/env/linux/module.c | 34 ++++++++++++++++++++-----
- 1 file changed, 28 insertions(+), 6 deletions(-)
-
-diff --git a/GFX_Linux_KM/services4/srvkm/env/linux/module.c b/GFX_Linux_KM/services4/srvkm/env/linux/module.c
-index e03dc00..90e16ce 100644
---- a/GFX_Linux_KM/services4/srvkm/env/linux/module.c
-+++ b/GFX_Linux_KM/services4/srvkm/env/linux/module.c
-@@ -47,6 +47,10 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- #endif
- #endif
- 
-+#ifndef CONFIG_RESET_CONTROLLER
-+#include <linux/platform_data/sgx-omap.h>
-+#endif
-+
- #if defined(SUPPORT_DRI_DRM) && !defined(SUPPORT_DRI_DRM_PLUGIN)
- #define	PVR_MOD_STATIC
- #else
-@@ -344,9 +348,11 @@ static LDM_DRV powervr_driver = {
- LDM_DEV *gpsPVRLDMDev;
- 
- #if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,11,0))
-+#ifdef CONFIG_RESET_CONTROLLER
- struct reset_control *rstc;
- bool already_deasserted = false;
- #endif
-+#endif
- 
- #if defined(MODULE) && defined(PVR_LDM_PLATFORM_MODULE) && \
- 	!defined(PVR_USE_PRE_REGISTERED_PLATFORM_DEV)
-@@ -388,11 +394,14 @@ static int __devinit PVRSRVDriverProbe(LDM_DEV *pDevice, const struct pci_device
- #endif
- {
- 	SYS_DATA *psSysData;
--	int ret;	
-+	int ret;
-+	struct device *dev = &pDevice->dev;
-+	struct gfx_sgx_platform_data *pdata = dev->platform_data;
-+
- 	PVR_TRACE(("PVRSRVDriverProbe(pDevice=%p)", pDevice));
- #if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,11,0))
-+#ifdef CONFIG_RESET_CONTROLLER
- 	rstc = reset_control_get(&pDevice->dev, NULL);
--
- 	if (IS_ERR(rstc)) 
- 	{
- 		dev_err(&pDevice->dev, "%s: error: reset_control_get\n", __func__);
-@@ -403,7 +412,7 @@ static int __devinit PVRSRVDriverProbe(LDM_DEV *pDevice, const struct pci_device
- 
- 	if (ret < 0)
- 	{
--		dev_err(&pDevice->dev, "%s: error: reset_control_clear_reset\n", __func__);
-+		dev_err(dev, "%s: error: reset_control_clear_reset\n", __func__);
- 		return ret;
- 	}
- 
-@@ -413,11 +422,22 @@ static int __devinit PVRSRVDriverProbe(LDM_DEV *pDevice, const struct pci_device
- 	{
- 		already_deasserted = true;
- 	}
--	else if (ret < 0) 
-+	else if (ret < 0)
- 	{
--		dev_err(&pDevice->dev, "%s: error: reset_control_deassert\n", __func__);
-+		dev_err(dev, "%s: error: reset_control_deassert\n", __func__);
- 		return ret;
- 	}
-+#else
-+	if (pdata && pdata->deassert_reset) {
-+		ret = pdata->deassert_reset(pDevice, pdata->reset_name);
-+		if (ret) {
-+			dev_err(dev, "Unable to reset SGX!\n");
-+		}
-+	} else {
-+		dev_err(dev, "SGX Platform data missing deassert_reset!\n");
-+		return -ENODEV;
-+	}
-+#endif  /* CONFIG_RESET_CONTROLLER */
- #endif
- 
- #if 0   /* INTEGRATION_POINT */
-@@ -432,7 +452,7 @@ static int __devinit PVRSRVDriverProbe(LDM_DEV *pDevice, const struct pci_device
- 	{
- 		return -EINVAL;
- 	}
--#endif	
-+#endif
- 	/* SysInitialise only designed to be called once.
- 	 */
- 	psSysData = SysAcquireDataNoCheck();
-@@ -445,6 +465,7 @@ static int __devinit PVRSRVDriverProbe(LDM_DEV *pDevice, const struct pci_device
- 		}
- 	}
- #if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,11,0))
-+#ifdef CONFIG_RESET_CONTROLLER
-         if (!already_deasserted)
-         {
-                 ret = reset_control_is_reset(rstc);
-@@ -454,6 +475,7 @@ static int __devinit PVRSRVDriverProbe(LDM_DEV *pDevice, const struct pci_device
-                 }
-         }
-         reset_control_put(rstc);
-+#endif /* CONFIG_RESET_CONTROLLER */
- #endif
- 
- 	return PVRSRVIONClientCreate();
--- 
-1.9.1
-

recipes-bsp/powervr-drivers/omap3-sgx-modules-5.01.01.01/0003-SGX-displayclass-am335x-am437x-fix-mutex-deadlock-wa.patch

@@ -1,153 +0,0 @@
-From cf5156ff82e14fe01a194f9fa9a9adc528ac72f0 Mon Sep 17 00:00:00 2001
-From: Darren Etheridge <detheridge@ti.com>
-Date: Tue, 29 Jul 2014 15:39:56 -0500
-Subject: [PATCH 3/4] SGX: displayclass: am335x, am437x - fix mutex deadlock
- warning
-
-Rearrange the locking semantics in the Unblank screen function to
-remove the kernel warning about a possible deadlock scenario.
-
-The warning presents itself on the console like this:
-[ 2976.202979] ======================================================
-[ 2976.202983] [ INFO: possible circular locking dependency detected ]
-[ 2976.202994] 3.14.11-00997-gb20d0ac-dirty #53 Tainted: G           O
-[ 2976.202997] -------------------------------------------------------
-[ 2976.203005] OGLES2Chameleon/1203 is trying to acquire lock:
-[ 2976.203058]  (console_lock){+.+.+.}, at: [<bf07a310>]
-OMAPLFBUnblankDisplay+0x24/0xbc [omaplfb]
-[ 2976.203062]
-[ 2976.203062] but task is already holding lock:
-[ 2976.203087]  (&fb_info->lock){+.+.+.}, at: [<c0312358>]
-lock_fb_info+0x18/0x3c
-[ 2976.203090]
-[ 2976.203090] which lock already depends on the new lock.
-[ 2976.203090]
-[ 2976.203093]
-[ 2976.203093] the existing dependency chain (in reverse order) is:
-[ 2976.203101]
-[ 2976.203101] -> #1 (&fb_info->lock){+.+.+.}:
-[ 2976.203112]        [<c0312358>] lock_fb_info+0x18/0x3c
-[ 2976.203124]        [<c0313a7c>] register_framebuffer+0x174/0x26c
-[ 2976.203146]        [<c033c314>] omapfb_create_framebuffers+0x48c/0x7ac
-[ 2976.203157]        [<c033d3c4>] omapfb_probe+0x4d4/0x848
-[ 2976.203170]        [<c0381cc8>] platform_drv_probe+0x18/0x48
-[ 2976.203189]        [<c038096c>] driver_probe_device+0x10c/0x238
-[ 2976.203199]        [<c0380b2c>] __driver_attach+0x94/0x98
-[ 2976.203208]        [<c037f0f0>] bus_for_each_dev+0x54/0x88
-[ 2976.203216]        [<c03800f0>] bus_add_driver+0xd8/0x1d8
-[ 2976.203223]        [<c038115c>] driver_register+0x78/0xf4
-[ 2976.203234]        [<c0008968>] do_one_initcall+0xe4/0x144
-[ 2976.203250]        [<c07d3c18>] kernel_init_freeable+0xfc/0x1cc
-[ 2976.203261]        [<c0563260>] kernel_init+0x8/0xec
-[ 2976.203275]        [<c000e648>] ret_from_fork+0x14/0x2c
-[ 2976.203284]
-[ 2976.203284] -> #0 (console_lock){+.+.+.}:
-[ 2976.203301]        [<c008bc00>] console_lock+0x4c/0x60
-[ 2976.203328]        [<bf07a310>] OMAPLFBUnblankDisplay+0x24/0xbc [omaplfb]
-[ 2976.203340]        [<bf0797f4>] OpenDCDevice+0x60/0x78 [omaplfb]
-[ 2976.203459]        [<bf041ac0>] PVRSRVOpenDCDeviceKM+0xec/0x178 [pvrsrvkm]
-[ 2976.203654]        [<bf05645c>] PVRSRVOpenDCDeviceBW+0x6c/0xac [pvrsrvkm]
-[ 2976.203811]        [<bf056d10>] BridgedDispatchKM+0xf4/0x14c [pvrsrvkm]
-[ 2976.203966]        [<bf04f304>] PVRSRV_BridgeDispatchKM+0xf0/0x204
-[pvrsrvkm]
-[ 2976.203987]        [<c0129500>] do_vfs_ioctl+0x78/0x61c
-[ 2976.203997]        [<c0129b08>] SyS_ioctl+0x64/0x74
-[ 2976.204013]        [<c000e580>] ret_fast_syscall+0x0/0x48
-[ 2976.204016]
-[ 2976.204016] other info that might help us debug this:
-[ 2976.204016]
-[ 2976.204019]  Possible unsafe locking scenario:
-[ 2976.204019]
-[ 2976.204022]        CPU0                    CPU1
-[ 2976.204024]        ----                    ----
-[ 2976.204030]   lock(&fb_info->lock);
-[ 2976.204036]                                lock(console_lock);
-[ 2976.204041]                                lock(&fb_info->lock);
-[ 2976.204046]   lock(console_lock);
-[ 2976.204048]
-[ 2976.204048]  *** DEADLOCK ***
-[ 2976.204048]
-[ 2976.204055] 2 locks held by OGLES2Chameleon/1203:
-[ 2976.204217]  #0:  (psPVRSRVMutex#2/1){+.+.+.}, at: [<bf04f238>]
-PVRSRV_BridgeDispatchKM+0x24/0x204 [pvrsrvkm]
-[ 2976.204240]  #1:  (&fb_info->lock){+.+.+.}, at: [<c0312358>]
-lock_fb_info+0x18/0x3c
-
-Signed-off-by: Darren Etheridge <detheridge@ti.com>
----
- GFX_Linux_KM/services4/3rdparty/dc_ti335x_linux/omaplfb_linux.c | 8 +++++---
- GFX_Linux_KM/services4/3rdparty/dc_ti43xx_linux/omaplfb_linux.c | 7 +++++--
- 2 files changed, 10 insertions(+), 5 deletions(-)
-
-diff --git a/GFX_Linux_KM/services4/3rdparty/dc_ti335x_linux/omaplfb_linux.c b/GFX_Linux_KM/services4/3rdparty/dc_ti335x_linux/omaplfb_linux.c
-index 3857b95..a5cc7d0 100644
---- a/GFX_Linux_KM/services4/3rdparty/dc_ti335x_linux/omaplfb_linux.c
-+++ b/GFX_Linux_KM/services4/3rdparty/dc_ti335x_linux/omaplfb_linux.c
-@@ -812,10 +812,13 @@ static OMAPLFB_ERROR OMAPLFBBlankOrUnblankDisplay(OMAPLFB_DEVINFO *psDevInfo, IM
- {
- #ifdef FBDEV_PRESENT
- 	int res;
-+
-+	OMAPLFB_CONSOLE_LOCK();
- 	if (!lock_fb_info(psDevInfo->psLINFBInfo))
- 	{
- 		printk(KERN_ERR DRIVER_PREFIX
- 			": %s: Device %u: Couldn't lock FB info\n", __FUNCTION__,  psDevInfo->uiFBDevID);
-+		OMAPLFB_CONSOLE_UNLOCK();
- 		return (OMAPLFB_ERROR_GENERIC);
- 	}
- 
-@@ -825,14 +828,13 @@ static OMAPLFB_ERROR OMAPLFBBlankOrUnblankDisplay(OMAPLFB_DEVINFO *psDevInfo, IM
- 	* notification.
- 	*/
- 
--
--	OMAPLFB_CONSOLE_LOCK();
- 	psDevInfo->psLINFBInfo->flags |= FBINFO_MISC_USEREVENT;
- 	res = fb_blank(psDevInfo->psLINFBInfo, bBlank ? 1 : 0);
- 	psDevInfo->psLINFBInfo->flags &= ~FBINFO_MISC_USEREVENT;
- 
--	OMAPLFB_CONSOLE_UNLOCK();
- 	unlock_fb_info(psDevInfo->psLINFBInfo);
-+	OMAPLFB_CONSOLE_UNLOCK();
-+
- 	if (res != 0 && res != -EINVAL)
- 	{
- 		printk(KERN_ERR DRIVER_PREFIX
-diff --git a/GFX_Linux_KM/services4/3rdparty/dc_ti43xx_linux/omaplfb_linux.c b/GFX_Linux_KM/services4/3rdparty/dc_ti43xx_linux/omaplfb_linux.c
-index c79dbd0..58b8640 100755
---- a/GFX_Linux_KM/services4/3rdparty/dc_ti43xx_linux/omaplfb_linux.c
-+++ b/GFX_Linux_KM/services4/3rdparty/dc_ti43xx_linux/omaplfb_linux.c
-@@ -948,10 +948,13 @@ static OMAPLFB_ERROR OMAPLFBBlankOrUnblankDisplay(OMAPLFB_DEVINFO *psDevInfo, IM
- {
- #ifdef FBDEV_PRESENT
- 	int res;
-+
-+	OMAPLFB_CONSOLE_LOCK();
- 	if (!lock_fb_info(psDevInfo->psLINFBInfo))
- 	{
- 		printk(KERN_ERR DRIVER_PREFIX
- 		": %s: Device %u: Couldn't lock FB info\n", __FUNCTION__,  psDevInfo->uiFBDevID);
-+		OMAPLFB_CONSOLE_UNLOCK();
- 		return (OMAPLFB_ERROR_GENERIC);
- 	}
- 
-@@ -961,13 +964,13 @@ static OMAPLFB_ERROR OMAPLFBBlankOrUnblankDisplay(OMAPLFB_DEVINFO *psDevInfo, IM
- 	* notification.
- 	*/
- 
--	OMAPLFB_CONSOLE_LOCK();
- 	psDevInfo->psLINFBInfo->flags |= FBINFO_MISC_USEREVENT;
- 	res = fb_blank(psDevInfo->psLINFBInfo, bBlank ? 1 : 0);
- 	psDevInfo->psLINFBInfo->flags &= ~FBINFO_MISC_USEREVENT;
- 
--	OMAPLFB_CONSOLE_UNLOCK();
- 	unlock_fb_info(psDevInfo->psLINFBInfo);
-+	OMAPLFB_CONSOLE_UNLOCK();
-+
- 	if (res != 0 && res != -EINVAL)
- 	{
- 		printk(KERN_ERR DRIVER_PREFIX
--- 
-1.9.1
-

recipes-bsp/powervr-drivers/omap3-sgx-modules-5.01.01.01/0004-SGX-linux-make-it-building-against-ti-linux-3.14.y.patch

@@ -1,45 +0,0 @@
-From c9258e090aec91e70efa814e5a38048b0c45754a Mon Sep 17 00:00:00 2001
-From: Darren Etheridge <detheridge@ti.com>
-Date: Tue, 29 Jul 2014 15:54:14 -0500
-Subject: [PATCH 4/4] SGX: linux: make it building against ti-linux-3.14.y
-
-The fbdev drivers moved into their own directory under drivers/video.
-All of the omap2 dss stuff moved there as well so update the Makefile
-to point to the right place.
-
-Keep the old directory around to not break builds against older kernel.
-
-Signed-off-by: Darren Etheridge <detheridge@ti.com>
-Signed-off-by: Denys Dmytriyenko <denys@ti.com>
----
- GFX_Linux_KM/services4/3rdparty/dc_ti335x_linux/Kbuild | 1 +
- GFX_Linux_KM/services4/3rdparty/dc_ti43xx_linux/Kbuild | 1 +
- 2 files changed, 2 insertions(+)
-
-diff --git a/GFX_Linux_KM/services4/3rdparty/dc_ti335x_linux/Kbuild b/GFX_Linux_KM/services4/3rdparty/dc_ti335x_linux/Kbuild
-index 1ae2359..9e0c843 100755
---- a/GFX_Linux_KM/services4/3rdparty/dc_ti335x_linux/Kbuild
-+++ b/GFX_Linux_KM/services4/3rdparty/dc_ti335x_linux/Kbuild
-@@ -15,6 +15,7 @@ EXTRA_CFLAGS =	-DLINUX \
- 		-I$(PVR_BUILD_DIR)/services4/include \
- 		-I$(PVR_BUILD_DIR)/services4/system/$(PVR_SYSTEM) \
- 		-I$(KERNELDIR)/drivers/video/omap2 \
-+		-I$(KERNELDIR)/drivers/video/fbdev/omap2 \
- 		-I$(PVR_BUILD_DIR)/services4/system/include \
- 		$(SYS_CFLAGS.1) \
- 
-diff --git a/GFX_Linux_KM/services4/3rdparty/dc_ti43xx_linux/Kbuild b/GFX_Linux_KM/services4/3rdparty/dc_ti43xx_linux/Kbuild
-index 1ae2359..9e0c843 100755
---- a/GFX_Linux_KM/services4/3rdparty/dc_ti43xx_linux/Kbuild
-+++ b/GFX_Linux_KM/services4/3rdparty/dc_ti43xx_linux/Kbuild
-@@ -15,6 +15,7 @@ EXTRA_CFLAGS =	-DLINUX \
- 		-I$(PVR_BUILD_DIR)/services4/include \
- 		-I$(PVR_BUILD_DIR)/services4/system/$(PVR_SYSTEM) \
- 		-I$(KERNELDIR)/drivers/video/omap2 \
-+		-I$(KERNELDIR)/drivers/video/fbdev/omap2 \
- 		-I$(PVR_BUILD_DIR)/services4/system/include \
- 		$(SYS_CFLAGS.1) \
- 
--- 
-2.0.2
-

recipes-bsp/powervr-drivers/omap3-sgx-modules-x11_4.09.00.01.bb

@@ -1,81 +0,0 @@
-DESCRIPTION = "Kernel drivers for the PowerVR SGX chipset found in the omap3 SoCs (for X11)"
-LICENSE = "GPLv2"
-LIC_FILES_CHKSUM = "file://COPYING;md5=ea5743acf520dd81ca172e69f818a3d4"
-
-TI_BIN_UNPK_CMDS="Y: qY:workdir:Y"
-require ../../recipes-ti/includes/ti-eula-unpack.inc
-
-SGXPV = "4_09_00_01"
-IMGPV = "1.9.2188537"
-
-inherit module
-
-MACHINE_KERNEL_PR_append = "d"
-PR = "${MACHINE_KERNEL_PR}"
-
-# Select the corresponding hardfp/softfp filename and checksums based on tune flags
-BINFILE_SOFTFP = "Graphics_SDK_setuplinux_${SGXPV}_minimal_demos.bin"
-MD5SUM_SOFTFP = "bd35e9d8843aff3a2aca9d41e7db1c7d"
-SHA256SUM_SOFTFP = "eb37f75ddde4640b09e760fa86e689beb394330ecdf68786188c34f249247647"
-
-BINFILE_HARDFP = "Graphics_SDK_setuplinux_${SGXPV}_hardfp_minimal_demos.bin"
-MD5SUM_HARDFP = "c9f656dce062d1ab10afffd4dfb71b67"
-SHA256SUM_HARDFP = "dbfeba8e1298f139495816334edec1455e6b49b1e11bd1b2aa0a888e5788bb6b"
-
-BINFILE = "${@base_contains('TUNE_FEATURES', 'callconvention-hard', '${BINFILE_HARDFP}', '${BINFILE_SOFTFP}', d)}"
-
-SRC_URI = "http://software-dl.ti.com/dsps/dsps_public_sw/sdo_sb/targetcontent/gfxsdk/${SGXPV}/exports/${BINFILE}"
-
-SRC_URI[md5sum] := "${@base_contains('TUNE_FEATURES', 'callconvention-hard', '${MD5SUM_HARDFP}', '${MD5SUM_SOFTFP}', d)}"
-SRC_URI[sha256sum] := "${@base_contains('TUNE_FEATURES', 'callconvention-hard', '${SHA256SUM_HARDFP}', '${SHA256SUM_SOFTFP}', d)}"
-
-TI_BIN_UNPK_WDEXT="/Graphics_SDK_${SGXPV}"
-S = "${WORKDIR}${TI_BIN_UNPK_WDEXT}/GFX_Linux_KM"
-
-PVRBUILD = "release"
-export KERNELDIR = "${STAGING_KERNEL_DIR}"
-
-INHIBIT_PACKAGE_STRIP = "1"
-
-TI_PLATFORM_omap3 = "omap3630"
-TI_PLATFORM_ti814x = "ti81xx"
-TI_PLATFORM_ti816x = "ti81xx"
-TI_PLATFORM_ti33x = "ti335x"
-
-MODULESLOCATION_omap3 = "dc_omapfb3_linux"
-MODULESLOCATION_ti814x = "dc_ti81xx_linux"
-MODULESLOCATION_ti816x = "dc_ti81xx_linux"
-MODULESLOCATION_ti33x = "dc_ti335x_linux"
-
-export SUPPORT_XORG ?= "1"
-
-MAKE_TARGETS = " BUILD=${PVRBUILD} TI_PLATFORM=${TI_PLATFORM} SUPPORT_XORG=${SUPPORT_XORG}"
-
-do_compile() {
-	export TOOLCHAIN="${TOOLCHAIN_PATH}"
-	export PLAT_CC="${CC}"
-	export PLAT_CPP="${CXX}"
-	export PLAR_AR="${AR}"
-	for kernelver in ${WORKDIR}/../../${PREFERRED_PROVIDER_virtual/kernel}/* ; do
-		cp -f $kernelver/git/drivers/gpu/drm/*.c ${S}/services4/3rdparty/linux_drm/
-	done
-	if [ $(echo -e "${KERNEL_VERSION}\n3.3" | sort --version-sort | head -1) = "3.3" ] ; then
-		cp -f ${S}/services4/3rdparty/linux_drm/Kbuild_3.3 \
-			${S}/services4/3rdparty/linux_drm/Kbuild || true
-	else 
-		if [ $(echo -e "${KERNEL_VERSION}\n3.2" | sort --version-sort | head -1) = "3.2" ] ; then
-			cp -f ${S}/services4/3rdparty/linux_drm/Kbuild_3.2 \
-				${S}/services4/3rdparty/linux_drm/Kbuild || true
-		fi
-	fi
-	oe_runmake BUILD=${PVRBUILD} TI_PLATFORM=${TI_PLATFORM} SUPPORT_XORG=${SUPPORT_XORG}
-}
-
-do_install() {
-    mkdir -p ${D}/lib/modules/${KERNEL_VERSION}/kernel/drivers/gpu/pvr
-    cp  ${S}/pvrsrvkm.ko \
-         ${S}/services4/3rdparty/bufferclass_ti/bufferclass_ti.ko \
-        ${D}/lib/modules/${KERNEL_VERSION}/kernel/drivers/gpu/pvr
-
-    cp ${S}/services4/3rdparty/linux_drm/drm.ko ${D}/lib/modules/${KERNEL_VERSION}/kernel/drivers/gpu/pvr
-}

recipes-bsp/powervr-drivers/omap3-sgx-modules/Compile-fixes-for-38-kernel.patch

@@ -1,346 +0,0 @@
---- GFX_Linux_KM/services4/3rdparty/dc_omap3430_linux/omaplfb_displayclass.c-orig	2011-03-08 04:27:35.000000000 -0800
-+++ GFX_Linux_KM/services4/3rdparty/dc_omap3430_linux/omaplfb_displayclass.c	2011-03-17 13:11:31.000000000 -0700
-@@ -235,9 +235,20 @@ static OMAP_ERROR UnblankDisplay(OMAPLFB
- {
- 	int res;
- 
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,38)
-+	console_lock();
-+#else
- 	acquire_console_sem();
-+#endif
-+
- 	res = fb_blank(psDevInfo->psLINFBInfo, 0);
-+
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,38)
-+	console_unlock();
-+#else
- 	release_console_sem();
-+#endif
-+
- #if !defined (CONFIG_OMAP2_DSS)
- 	if (res != 0 && res != -EINVAL)
- 	{
-@@ -1118,7 +1129,11 @@ static OMAP_ERROR InitDev(OMAPLFB_DEVINF
- 	OMAP_ERROR eError = OMAP_ERROR_GENERIC;
- 	unsigned long FBSize;
- 
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,38)
-+	console_lock();
-+#else
- 	acquire_console_sem();
-+#endif
- 
- 	if (fb_idx < 0 || fb_idx >= num_registered_fb)
- 	{
-@@ -1254,7 +1269,11 @@ static OMAP_ERROR InitDev(OMAPLFB_DEVINF
- errModPut:
- 	module_put(psLINFBOwner);
- errRelSem:
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,38)
-+	console_unlock();
-+#else
- 	release_console_sem();
-+#endif
- 	return eError;
- }
- 
-@@ -1263,7 +1282,11 @@ static void DeInitDev(OMAPLFB_DEVINFO *p
- 	struct fb_info *psLINFBInfo = psDevInfo->psLINFBInfo;
- 	struct module *psLINFBOwner;
- 
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,38)
-+	console_lock();
-+#else
- 	acquire_console_sem();
-+#endif
- 
- 	psLINFBOwner = psLINFBInfo->fbops->owner;
- 
-@@ -1274,7 +1297,11 @@ static void DeInitDev(OMAPLFB_DEVINFO *p
- 
- 	module_put(psLINFBOwner);
- 
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,38)
-+	console_unlock();
-+#else
- 	release_console_sem();
-+#endif
- }
- 
- OMAP_ERROR OMAPLFBInit(void)
---- GFX_Linux_KM/services4/3rdparty/dc_omap3430_linux/omaplfb_linux.c-orig	2011-03-08 04:27:35.000000000 -0800
-+++ GFX_Linux_KM/services4/3rdparty/dc_omap3430_linux/omaplfb_linux.c	2011-03-17 13:40:15.000000000 -0700
-@@ -24,11 +24,14 @@
-  *
-  ******************************************************************************/
- 
-+#include <linux/version.h>
-+
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,38)
- #ifndef AUTOCONF_INCLUDED
- #include <linux/config.h>
- #endif
-+#endif
- 
--#include <linux/version.h>
- #include <linux/module.h>
- 
- #include <linux/pci.h>
---- GFX_Linux_KM/services4/srvkm/common/resman.c-orig	2011-03-08 04:27:36.000000000 -0800
-+++ GFX_Linux_KM/services4/srvkm/common/resman.c	2011-03-17 14:20:07.000000000 -0700
-@@ -24,15 +24,17 @@
-  *
-  ******************************************************************************/
- 
-+#include <linux/version.h>
- #include "services_headers.h"
- #include "resman.h"
- 
- #ifdef __linux__
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,38)
- #ifndef AUTOCONF_INCLUDED
-  #include <linux/config.h>
- #endif
-+#endif
- 
--#include <linux/version.h>
- #include <linux/sched.h>
- #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,9)
- #include <linux/hardirq.h>
---- GFX_Linux_KM/services4/srvkm/env/linux/pvr_debug.c-orig	2011-03-08 04:27:36.000000000 -0800
-+++ GFX_Linux_KM/services4/srvkm/env/linux/pvr_debug.c	2011-03-17 14:33:09.000000000 -0700
-@@ -24,9 +24,13 @@
-  *
-  ******************************************************************************/
- 
-+#include <linux/version.h>
-+
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,38)
- #ifndef AUTOCONF_INCLUDED
-  #include <linux/config.h>
- #endif
-+#endif
- 
- #include <asm/io.h>
- #include <asm/uaccess.h>
---- GFX_Linux_KM/services4/srvkm/env/linux/pvr_uaccess.h-orig	2011-03-08 04:27:36.000000000 -0800
-+++ GFX_Linux_KM/services4/srvkm/env/linux/pvr_uaccess.h	2011-03-17 14:39:14.000000000 -0700
-@@ -27,11 +27,14 @@
- #ifndef __PVR_UACCESS_H__
- #define __PVR_UACCESS_H__
- 
-+#include <linux/version.h>
-+
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,38)
- #ifndef AUTOCONF_INCLUDED
-  #include <linux/config.h>
- #endif
-+#endif
- 
--#include <linux/version.h>
- #include <asm/uaccess.h>
- 
- static inline unsigned long pvr_copy_to_user(void __user *pvTo, const void *pvFrom, unsigned long ulBytes)
---- GFX_Linux_KM/services4/srvkm/env/linux/mm.c-orig	2011-03-08 04:27:36.000000000 -0800
-+++ GFX_Linux_KM/services4/srvkm/env/linux/mm.c	2011-03-17 14:46:23.000000000 -0700
-@@ -24,11 +24,14 @@
-  *
-  ******************************************************************************/
- 
-+#include <linux/version.h>
-+
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,38)
- #ifndef AUTOCONF_INCLUDED
-  #include <linux/config.h>
- #endif
-+#endif
- 
--#include <linux/version.h>
- #include <linux/mm.h>
- #include <linux/vmalloc.h>
- #include <asm/io.h>
---- GFX_Linux_KM/services4/srvkm/env/linux/mutils.h-orig	2011-03-08 04:27:36.000000000 -0800
-+++ GFX_Linux_KM/services4/srvkm/env/linux/mutils.h	2011-03-17 14:54:37.000000000 -0700
-@@ -27,11 +27,13 @@
- #ifndef __IMG_LINUX_MUTILS_H__
- #define __IMG_LINUX_MUTILS_H__
- 
-+#include <linux/version.h>
-+
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,38)
- #ifndef AUTOCONF_INCLUDED
- #include <linux/config.h>
- #endif
--
--#include <linux/version.h>
-+#endif
- 
- #if !(defined(__i386__) && (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,26)))
- #if defined(SUPPORT_LINUX_X86_PAT)
---- GFX_Linux_KM/services4/srvkm/env/linux/mm.h-orig	2011-03-08 04:27:36.000000000 -0800
-+++ GFX_Linux_KM/services4/srvkm/env/linux/mm.h	2011-03-17 15:33:56.000000000 -0700
-@@ -27,11 +27,14 @@
- #ifndef __IMG_LINUX_MM_H__
- #define __IMG_LINUX_MM_H__
- 
-+#include <linux/version.h>
-+
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,38)
- #ifndef AUTOCONF_INCLUDED
-  #include <linux/config.h>
- #endif
-+#endif
- 
--#include <linux/version.h>
- #include <linux/slab.h>
- #include <linux/mm.h>
- #include <linux/list.h>
---- GFX_Linux_KM/services4/srvkm/env/linux/mmap.c-orig	2011-03-17 20:39:31.000000000 -0700
-+++ GFX_Linux_KM/services4/srvkm/env/linux/mmap.c	2011-03-17 20:40:00.000000000 -0700
-@@ -24,11 +24,14 @@
-  *
-  ******************************************************************************/
- 
-+#include <linux/version.h>
-+
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,38)
- #ifndef AUTOCONF_INCLUDED
-  #include <linux/config.h>
- #endif
-+#endif
- 
--#include <linux/version.h>
- #include <linux/mm.h>
- #include <linux/module.h>
- #include <linux/vmalloc.h>
---- GFX_Linux_KM/services4/srvkm/env/linux/proc.c-orig	2011-03-08 04:27:36.000000000 -0800
-+++ GFX_Linux_KM/services4/srvkm/env/linux/proc.c	2011-03-17 21:01:35.000000000 -0700
-@@ -24,13 +24,16 @@
-  *
-  ******************************************************************************/
- 
-+#include <linux/version.h>
-+
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,38)
- #ifndef AUTOCONF_INCLUDED
-  #include <linux/config.h>
- #endif
-+#endif
- 
- #include <linux/init.h>
- #include <linux/module.h>
--#include <linux/version.h>
- #include <linux/fs.h>
- #include <linux/proc_fs.h>
- #include <linux/seq_file.h>
---- GFX_Linux_KM/services4/srvkm/env/linux/module.c-orig	2011-03-08 04:27:36.000000000 -0800
-+++ GFX_Linux_KM/services4/srvkm/env/linux/module.c	2011-03-17 21:32:19.000000000 -0700
-@@ -24,9 +24,13 @@
-  *
-  ******************************************************************************/
- 
-+#include <linux/version.h>
-+
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,38)
- #ifndef AUTOCONF_INCLUDED
-  #include <linux/config.h>
- #endif
-+#endif
- 
- #if !defined(SUPPORT_DRI_DRM)
- 	
-@@ -44,7 +48,6 @@
- #include <linux/init.h>
- #include <linux/kernel.h>
- #include <linux/module.h>
--#include <linux/version.h>
- #include <linux/fs.h>
- #include <linux/proc_fs.h>
- 
---- GFX_Linux_KM/services4/srvkm/env/linux/event.c-orig	2011-03-08 04:27:36.000000000 -0800
-+++ GFX_Linux_KM/services4/srvkm/env/linux/event.c	2011-03-18 08:51:42.000000000 -0700
-@@ -24,11 +24,14 @@
-  *
-  ******************************************************************************/
- 
-+#include <linux/version.h>
-+
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,38)
- #ifndef AUTOCONF_INCLUDED
-  #include <linux/config.h>
- #endif
-+#endif
- 
--#include <linux/version.h>
- #include <asm/io.h>
- #include <asm/page.h>
- #if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,22))
---- GFX_Linux_KM/services4/srvkm/env/linux/osfunc.c-orig	2011-03-08 04:27:36.000000000 -0800
-+++ GFX_Linux_KM/services4/srvkm/env/linux/osfunc.c	2011-03-18 08:58:16.000000000 -0700
-@@ -24,11 +24,14 @@
-  *
-  ******************************************************************************/
- 
-+#include <linux/version.h>
-+
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,38)
- #ifndef AUTOCONF_INCLUDED
-  #include <linux/config.h>
- #endif
-+#endif
- 
--#include <linux/version.h>
- #include <asm/io.h>
- #include <asm/page.h>
- #if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,22))
---- GFX_Linux_KM/services4/srvkm/env/linux/pvr_drm.c-orig	2011-03-08 04:27:36.000000000 -0800
-+++ GFX_Linux_KM/services4/srvkm/env/linux/pvr_drm.c	2011-03-18 09:01:06.000000000 -0700
-@@ -26,14 +26,17 @@
- 
- #if defined(SUPPORT_DRI_DRM)
- 
-+#include <linux/version.h>
-+
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,38)
- #ifndef AUTOCONF_INCLUDED
-  #include <linux/config.h>
- #endif
-+#endif
- 
- #include <linux/init.h>
- #include <linux/kernel.h>
- #include <linux/module.h>
--#include <linux/version.h>
- #include <linux/fs.h>
- #include <linux/proc_fs.h>
- #include <asm/ioctl.h>
---- GFX_Linux_KM/services4/srvkm/env/linux/mutils.c-orig	2011-03-08 04:27:36.000000000 -0800
-+++ GFX_Linux_KM/services4/srvkm/env/linux/mutils.c	2011-03-18 09:08:12.000000000 -0700
-@@ -24,10 +24,13 @@
-  *
-  ******************************************************************************/
- 
-+#include <linux/version.h>
-+
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,38)
- #ifndef AUTOCONF_INCLUDED
- #include <linux/config.h>
- #endif
--#include <linux/version.h>
-+#endif
- 
- #include <linux/spinlock.h>
- #include <linux/mm.h>
---- GFX_Linux_KM/services4/srvkm/env/linux/pvr_debug.c-orig	2011-03-31 13:46:48.000000000 -0700
-+++ GFX_Linux_KM/services4/srvkm/env/linux/pvr_debug.c	2011-03-31 15:14:10.000000000 -0700
-@@ -76,7 +76,8 @@ static IMG_CHAR gszBufferIRQ[PVR_MAX_MSG
- static PVRSRV_LINUX_MUTEX gsDebugMutexNonIRQ;
- 
-  
--static spinlock_t gsDebugLockIRQ = SPIN_LOCK_UNLOCKED;
-+static DEFINE_SPINLOCK(gsDebugLockIRQ);
-+
- 
- #if !defined (USE_SPIN_LOCK)  
- #define	USE_SPIN_LOCK (in_interrupt() || !preemptible())

recipes-bsp/powervr-drivers/omap3-sgx-modules/kernel-30.patch

@@ -1,38 +0,0 @@
-From: Steve Sakoman
-Subject: omap3-sgx-modules: Fix build for Linux 3.0
-
-This patch implements the header change from plat/display.h to video/omapdss.h
-
-Signed-off-by: Steve Sakoman <steve at sakoman.com>
-
---- GFX_Linux_KM/services4/3rdparty/dc_omap3430_linux/omaplfb_linux.c-orig	2011-08-01 07:21:45.000000000 -0700
-+++ GFX_Linux_KM/services4/3rdparty/dc_omap3430_linux/omaplfb_linux.c	2011-08-01 07:29:32.000000000 -0700
-@@ -47,12 +47,12 @@
- #if defined (SUPPORT_TI_DSS_FW)
- #include <asm/io.h>
- 
--#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,6,26))
--#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,6,31))
-+#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,6,39)))
-+#include <video/omapdss.h>
-+#elif (LINUX_VERSION_CODE > KERNEL_VERSION(2,6,31))
- #include <plat/display.h>
--#else 
-+#elif (LINUX_VERSION_CODE > KERNEL_VERSION(2,6,26))
- #include <mach/display.h>
--#endif 
- #else 
- #include <asm/arch-omap/display.h>
- #endif 
-@@ -64,7 +64,11 @@ extern int omap_dispc_request_irq(unsign
- extern void omap_dispc_free_irq(unsigned long, void (*)(void *), void *);
- extern void omap_dispc_set_plane_base(int plane, IMG_UINT32 phys_addr);
- #else
-+#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,6,39))
-+#include <video/omapdss.h>
-+#else
- #include <plat/display.h>
-+#endif
- #include <linux/console.h>
- #include <linux/fb.h>
- static omap_dispc_isr_t *pOMAPLFBVSyncISRHandle = NULL;

recipes-bsp/powervr-drivers/omap3-sgx-modules_4.05.00.03.bb

@@ -1,39 +0,0 @@
-DESCRIPTION = "Kernel drivers for the PowerVR SGX chipset found in the omap3 SoCs"
-LICENSE = "GPLv2"
-LIC_FILES_CHKSUM = "file://COPYING;md5=21228a42e27d1d104b31a83f7c9da935"
-
-TI_BIN_UNPK_CMDS="Y: qY:workdir:Y"
-require ../../recipes-ti/includes/ti-eula-unpack.inc
-
-SGXPV = "4_05_00_03"
-BINFILE := "Graphics_SDK_setuplinux_${SGXPV}.bin"
-
-inherit module
-
-MACHINE_KERNEL_PR_append = "c"
-PR = "${MACHINE_KERNEL_PR}"
-
-DEFAULT_PREFERENCE_omap3 = "99"
-
-SRC_URI = "http://software-dl.ti.com/dsps/dsps_public_sw/sdo_sb/targetcontent/gfxsdk/${SGXPV}/exports/Graphics_SDK_setuplinux_${SGXPV}.bin \
-          "
-SRC_URI[md5sum] = "0e651eaa92bb91760f0b40a17697a7dc"
-SRC_URI[sha256sum] = "bfe764a8959556195545d6fff76f63a489642f345c105bbbc309a3f243c2dd0e"
-TI_BIN_UNPK_WDEXT="/Graphics_SDK_${SGXPV}"
-S = "${WORKDIR}${TI_BIN_UNPK_WDEXT}/GFX_Linux_KM"
-
-PVRBUILD = "release"
-export KERNELDIR = "${STAGING_KERNEL_DIR}"
-
-INHIBIT_PACKAGE_STRIP = "1"
-
-TI_PLATFORM_omap3 = "omap3630"
-TI_PLATFORM_ti814x = "ti81xx"
-TI_PLATFORM_ti816x = "ti81xx"
-TI_PLATFORM_ti33x = "ti335x"
-
-MAKE_TARGETS = " BUILD=${PVRBUILD} TI_PLATFORM=${TI_PLATFORM}"
-
-do_install() {
-    make -C ${STAGING_KERNEL_DIR} SUBDIRS=${B} INSTALL_MOD_PATH=${D} PREFIX=${STAGING_DIR_HOST} modules_install
-}

recipes-bsp/powervr-drivers/omap3-sgx-modules_4.09.00.01.bb

@@ -1,53 +0,0 @@
-DESCRIPTION = "Kernel drivers for the PowerVR SGX chipset found in the omap3 SoCs"
-LICENSE = "GPLv2"
-LIC_FILES_CHKSUM = "file://COPYING;md5=ea5743acf520dd81ca172e69f818a3d4"
-
-TI_BIN_UNPK_CMDS="Y: qY:workdir:Y"
-require ../../recipes-ti/includes/ti-eula-unpack.inc
-
-SGXPV = "4_09_00_01"
-IMGPV = "1.9.2188537"
-
-inherit module
-
-MACHINE_KERNEL_PR_append = "d"
-PR = "${MACHINE_KERNEL_PR}"
-
-DEFAULT_PREFERENCE = "-1"
-
-# Select the corresponding hardfp/softfp filename and checksums based on tune flags
-BINFILE_SOFTFP = "Graphics_SDK_setuplinux_${SGXPV}_minimal_demos.bin"
-MD5SUM_SOFTFP = "bd35e9d8843aff3a2aca9d41e7db1c7d"
-SHA256SUM_SOFTFP = "eb37f75ddde4640b09e760fa86e689beb394330ecdf68786188c34f249247647"
-
-BINFILE_HARDFP = "Graphics_SDK_setuplinux_${SGXPV}_hardfp_minimal_demos.bin"
-MD5SUM_HARDFP = "c9f656dce062d1ab10afffd4dfb71b67"
-SHA256SUM_HARDFP = "dbfeba8e1298f139495816334edec1455e6b49b1e11bd1b2aa0a888e5788bb6b"
-
-BINFILE = "${@base_contains('TUNE_FEATURES', 'callconvention-hard', '${BINFILE_HARDFP}', '${BINFILE_SOFTFP}', d)}"
-
-SRC_URI = "http://software-dl.ti.com/dsps/dsps_public_sw/sdo_sb/targetcontent/gfxsdk/${SGXPV}/exports/${BINFILE}"
-
-SRC_URI[md5sum] := "${@base_contains('TUNE_FEATURES', 'callconvention-hard', '${MD5SUM_HARDFP}', '${MD5SUM_SOFTFP}', d)}"
-SRC_URI[sha256sum] := "${@base_contains('TUNE_FEATURES', 'callconvention-hard', '${SHA256SUM_HARDFP}', '${SHA256SUM_SOFTFP}', d)}"
-
-TI_BIN_UNPK_WDEXT="/Graphics_SDK_${SGXPV}"
-S = "${WORKDIR}${TI_BIN_UNPK_WDEXT}/GFX_Linux_KM"
-
-PVRBUILD = "release"
-export KERNELDIR = "${STAGING_KERNEL_DIR}"
-
-INHIBIT_PACKAGE_STRIP = "1"
-
-TI_PLATFORM_omap3 = "omap3630"
-TI_PLATFORM_ti814x = "ti81xx"
-TI_PLATFORM_ti816x = "ti81xx"
-TI_PLATFORM_ti33x = "ti335x"
-
-MAKE_TARGETS = " BUILD=${PVRBUILD} TI_PLATFORM=${TI_PLATFORM} SUPPORT_XORG=0"
-
-MAKE_TARGETS_append_ti33x = " PM_RUNTIME=1"
-
-do_install() {
-    make -C ${STAGING_KERNEL_DIR} SUBDIRS=${B} INSTALL_MOD_PATH=${D} PREFIX=${STAGING_DIR_HOST} modules_install
-}

recipes-bsp/powervr-drivers/omap3-sgx-modules_5.01.01.01.bb

@@ -1,62 +0,0 @@
-DESCRIPTION = "Kernel drivers for the PowerVR SGX chipset found in the omap3 SoCs"
-LICENSE = "GPLv2"
-LIC_FILES_CHKSUM = "file://GPL-COPYING;md5=60422928ba677faaa13d6ab5f5baaa1e"
-
-TI_BIN_UNPK_CMDS="Y: qY:workdir:Y"
-require ../../recipes-ti/includes/ti-eula-unpack.inc
-
-SGXPV = "5_01_01_01"
-IMGPV = "1.10.2359475"
-
-inherit module
-
-MACHINE_KERNEL_PR_append = "d"
-PR = "${MACHINE_KERNEL_PR}"
-
-BINFILE_HARDFP = "Graphics_SDK_setuplinux_hardfp_${SGXPV}.bin"
-MD5SUM_HARDFP = "94acdbd20152c905939c2448d5e80a72"
-SHA256SUM_HARDFP = "7f647bf45a5ce8ba9aaa28c4afe85fced4275f9a4567a1886d4460b76c9051ae"
-
-# For now we only have hardfp version
-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))
-}
-
-BINFILE := "${BINFILE_HARDFP}"
-
-SRC_URI = "http://software-dl.ti.com/dsps/dsps_public_sw/gfxsdk/${SGXPV}/exports/${BINFILE}"
-
-SRC_URI += "file://0001-PoC-GFX-SDK-Make-5_01_01_01-work-against-3.14-LTS.patch;striplevel=2 \
-            file://0002-SGX-linux-use-platform-data-to-provide-reset-info.patch;striplevel=2 \
-            file://0003-SGX-displayclass-am335x-am437x-fix-mutex-deadlock-wa.patch;striplevel=2 \
-            file://0004-SGX-linux-make-it-building-against-ti-linux-3.14.y.patch;striplevel=2"
-
-SRC_URI[md5sum] := "${MD5SUM_HARDFP}"
-SRC_URI[sha256sum] := "${SHA256SUM_HARDFP}"
-
-TI_BIN_UNPK_WDEXT="/Graphics_SDK_${SGXPV}"
-S = "${WORKDIR}${TI_BIN_UNPK_WDEXT}/GFX_Linux_KM"
-
-PVRBUILD = "release"
-export KERNELDIR = "${STAGING_KERNEL_DIR}"
-
-INHIBIT_PACKAGE_STRIP = "1"
-
-TI_PLATFORM_omap3 = "omap3630"
-TI_PLATFORM_ti814x = "ti81xx"
-TI_PLATFORM_ti816x = "ti81xx"
-TI_PLATFORM_ti33x = "ti335x"
-TI_PLATFORM_ti43x = "ti43xx"
-
-MAKE_TARGETS = " BUILD=${PVRBUILD} TI_PLATFORM=${TI_PLATFORM} SUPPORT_XORG=${SUPPORT_XORG}"
-
-do_install() {
-    make -C ${STAGING_KERNEL_DIR} SUBDIRS=${B} INSTALL_MOD_PATH=${D} PREFIX=${STAGING_DIR_HOST} modules_install
-}

recipes-bsp/powervr-drivers/omap3-sgx-modules_5.01.01.02.bb

@@ -1,58 +0,0 @@
-DESCRIPTION = "Kernel drivers for the PowerVR SGX chipset found in the omap3 SoCs"
-LICENSE = "GPLv2"
-LIC_FILES_CHKSUM = "file://GPL-COPYING;md5=60422928ba677faaa13d6ab5f5baaa1e"
-
-TI_BIN_UNPK_CMDS="Y: qY:workdir:Y"
-require ../../recipes-ti/includes/ti-eula-unpack.inc
-
-SGXPV = "5_01_01_02"
-IMGPV = "1.10.2359475"
-
-inherit module
-
-MACHINE_KERNEL_PR_append = "b"
-PR = "${MACHINE_KERNEL_PR}"
-
-BINFILE_HARDFP = "Graphics_SDK_setuplinux_hardfp_${SGXPV}.bin"
-MD5SUM_HARDFP = "94bcb31ea7eb50df1dfa4037055b638e"
-SHA256SUM_HARDFP = "54641222cdb49b03f996cbd6412de227198d9e084f5647d706bbf4217e8cdb07"
-
-# For now we only have hardfp version
-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))
-}
-
-BINFILE := "${BINFILE_HARDFP}"
-
-SRC_URI = "http://software-dl.ti.com/dsps/dsps_public_sw/gfxsdk/${SGXPV}/exports/${BINFILE}"
-
-
-SRC_URI[md5sum] := "${MD5SUM_HARDFP}"
-SRC_URI[sha256sum] := "${SHA256SUM_HARDFP}"
-
-TI_BIN_UNPK_WDEXT="/Graphics_SDK_${SGXPV}"
-S = "${WORKDIR}${TI_BIN_UNPK_WDEXT}/GFX_Linux_KM"
-
-PVRBUILD = "release"
-export KERNELDIR = "${STAGING_KERNEL_DIR}"
-
-INHIBIT_PACKAGE_STRIP = "1"
-
-TI_PLATFORM_omap3 = "omap3630"
-TI_PLATFORM_ti814x = "ti81xx"
-TI_PLATFORM_ti816x = "ti81xx"
-TI_PLATFORM_ti33x = "ti335x"
-TI_PLATFORM_ti43x = "ti43xx"
-
-MAKE_TARGETS = " BUILD=${PVRBUILD} TI_PLATFORM=${TI_PLATFORM} SUPPORT_XORG=${SUPPORT_XORG}"
-
-do_install() {
-    make -C ${STAGING_KERNEL_DIR} SUBDIRS=${B} INSTALL_MOD_PATH=${D} PREFIX=${STAGING_DIR_HOST} modules_install
-}

recipes-bsp/powervr-drivers/ti-sgx-ddk-km_1.14.3699939.bb

@@ -7,17 +7,25 @@ inherit module
 
 COMPATIBLE_MACHINE = "ti33x|ti43x|omap-a15"
 
-MACHINE_KERNEL_PR_append = "i"
+MACHINE_KERNEL_PR_append = "l"
 PR = "${MACHINE_KERNEL_PR}"
 
 PACKAGE_ARCH = "${MACHINE_ARCH}"
 
-BRANCH = "ti-img-sgx/${PV}/k4.1"
+DEPENDS = "virtual/kernel"
+
+PROVIDES = "omapdrm-pvr"
+
+RPROVIDES_${PN} = "omapdrm-pvr"
+RREPLACES_${PN} = "omapdrm-pvr"
+RCONFLICTS_${PN} = "omapdrm-pvr"
+
+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 = "fed0756f1b8b9d526da2821635c7d742989d47c3"
+SRCREV = "fd47e44b18944cf7ade480ac67a9c0172619ff7e"
 
 TARGET_PRODUCT_omap-a15 = "jacinto6evm"
 TARGET_PRODUCT_ti33x = "ti335x"

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-v4.0-Manifest.html;md5=5ea937e4ff2c924a735d42e61ad8cbe3"
+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 = "804b548e69ef9fdf44445f6d0968d81cb8a1e7b4"
+SRCREV = "4efd227bebd8eb0bc12f40fac043dc9c26d4f8c3"
 
-PV = "4.0.2"
-PR = "r2"
+PV = "5.1.0"
+PR = "r1"
 
 require recipes-ti/includes/ti-paths.inc
 
-COMPATIBLE_MACHINE = "ti33x|ti43x|omap-a15"
+COMPATIBLE_MACHINE = "ti33x|ti43x|omap-a15|k2g"
 PACKAGE_ARCH = "${MACHINE_ARCH}"
 
 PACKAGES_prepend = " \
@@ -39,6 +39,7 @@ SUBDIRS = "examples pru_cape/pru_fw lib/src labs"
 PLATFORM_ti33x = "am335x"
 PLATFORM_ti43x = "am437x"
 PLATFORM_omap-a15 = "am572x"
+PLATFORM_k2g = "k2g"
 
 do_compile() {
     for dir in ${SUBDIRS}
@@ -64,8 +65,11 @@ do_install_append_ti33x() {
 do_install_append_ti43x() {
     for i in 0 1
     do
-        install -m 0644 ${S}/examples/am437x/PRU_RPMsg_Echo_Interrupt1_${i}/gen/PRU_RPMsg_Echo_Interrupt1_${i}.out \
-                        ${D}/lib/firmware/pru
+        for j in 0 1
+        do
+            install -m 0644 ${S}/examples/am437x/PRU_RPMsg_Echo_Interrupt${i}_${j}/gen/PRU_RPMsg_Echo_Interrupt${i}_${j}.out \
+                            ${D}/lib/firmware/pru
+        done
     done
 }
 
@@ -80,18 +84,32 @@ do_install_append_omap-a15() {
     done
 }
 
+do_install_append_k2g() {
+    for i in 0 1
+    do
+        for j in 0 1
+        do
+            install -m 0644 ${S}/examples/k2g/PRU_RPMsg_Echo_Interrupt${i}_${j}/gen/PRU_RPMsg_Echo_Interrupt${i}_${j}.out \
+                            ${D}/lib/firmware/pru
+        done
+    done
+}
+
 FILES_${PN}-halt = "/lib/firmware/pru/PRU_Halt.out"
 FILES_${PN}-rpmsg-echo = "/lib/firmware/pru/PRU_RPMsg_Echo_Interrupt*"
 
 # Set up names for the firmwares
 PRU_ICSS_ALTERNATIVES_ti33x    = "am335x-pru0-fw am335x-pru1-fw"
-PRU_ICSS_ALTERNATIVES_ti43x    = "am437x-pru1_0-fw am437x-pru1_1-fw"
+PRU_ICSS_ALTERNATIVES_ti43x    = "am437x-pru0_0-fw am437x-pru0_1-fw am437x-pru1_0-fw am437x-pru1_1-fw"
 PRU_ICSS_ALTERNATIVES_omap-a15 = "am57xx-pru1_0-fw am57xx-pru1_1-fw am57xx-pru2_0-fw am57xx-pru2_1-fw"
+PRU_ICSS_ALTERNATIVES_k2g      = "k2g-pru0_0-fw k2g-pru0_1-fw k2g-pru1_0-fw k2g-pru1_1-fw"
 
 # Set up link names for the firmwares
 ALTERNATIVE_LINK_NAME[am335x-pru0-fw] = "/lib/firmware/am335x-pru0-fw"
 ALTERNATIVE_LINK_NAME[am335x-pru1-fw] = "/lib/firmware/am335x-pru1-fw"
 
+ALTERNATIVE_LINK_NAME[am437x-pru0_0-fw] = "/lib/firmware/am437x-pru0_0-fw"
+ALTERNATIVE_LINK_NAME[am437x-pru0_1-fw] = "/lib/firmware/am437x-pru0_1-fw"
 ALTERNATIVE_LINK_NAME[am437x-pru1_0-fw] = "/lib/firmware/am437x-pru1_0-fw"
 ALTERNATIVE_LINK_NAME[am437x-pru1_1-fw] = "/lib/firmware/am437x-pru1_1-fw"
 
@@ -100,12 +118,19 @@ ALTERNATIVE_LINK_NAME[am57xx-pru1_1-fw] = "/lib/firmware/am57xx-pru1_1-fw"
 ALTERNATIVE_LINK_NAME[am57xx-pru2_0-fw] = "/lib/firmware/am57xx-pru2_0-fw"
 ALTERNATIVE_LINK_NAME[am57xx-pru2_1-fw] = "/lib/firmware/am57xx-pru2_1-fw"
 
+ALTERNATIVE_LINK_NAME[k2g-pru0_0-fw] = "/lib/firmware/k2g-pru0_0-fw"
+ALTERNATIVE_LINK_NAME[k2g-pru0_1-fw] = "/lib/firmware/k2g-pru0_1-fw"
+ALTERNATIVE_LINK_NAME[k2g-pru1_0-fw] = "/lib/firmware/k2g-pru1_0-fw"
+ALTERNATIVE_LINK_NAME[k2g-pru1_1-fw] = "/lib/firmware/k2g-pru1_1-fw"
+
 # Create the pru-icss-halt firmware alternatives
 ALTERNATIVE_pru-icss-halt = "${PRU_ICSS_ALTERNATIVES}"
 
 ALTERNATIVE_TARGET_pru-icss-halt[am335x-pru0-fw] = "/lib/firmware/pru/PRU_Halt.out"
 ALTERNATIVE_TARGET_pru-icss-halt[am335x-pru1-fw] = "/lib/firmware/pru/PRU_Halt.out"
 
+ALTERNATIVE_TARGET_pru-icss-halt[am437x-pru0_0-fw] = "/lib/firmware/pru/PRU_Halt.out"
+ALTERNATIVE_TARGET_pru-icss-halt[am437x-pru0_1-fw] = "/lib/firmware/pru/PRU_Halt.out"
 ALTERNATIVE_TARGET_pru-icss-halt[am437x-pru1_0-fw] = "/lib/firmware/pru/PRU_Halt.out"
 ALTERNATIVE_TARGET_pru-icss-halt[am437x-pru1_1-fw] = "/lib/firmware/pru/PRU_Halt.out"
 
@@ -114,6 +139,11 @@ ALTERNATIVE_TARGET_pru-icss-halt[am57xx-pru1_1-fw] = "/lib/firmware/pru/PRU_Halt
 ALTERNATIVE_TARGET_pru-icss-halt[am57xx-pru2_0-fw] = "/lib/firmware/pru/PRU_Halt.out"
 ALTERNATIVE_TARGET_pru-icss-halt[am57xx-pru2_1-fw] = "/lib/firmware/pru/PRU_Halt.out"
 
+ALTERNATIVE_TARGET_pru-icss-halt[k2g-pru0_0-fw] = "/lib/firmware/pru/PRU_Halt.out"
+ALTERNATIVE_TARGET_pru-icss-halt[k2g-pru0_1-fw] = "/lib/firmware/pru/PRU_Halt.out"
+ALTERNATIVE_TARGET_pru-icss-halt[k2g-pru1_0-fw] = "/lib/firmware/pru/PRU_Halt.out"
+ALTERNATIVE_TARGET_pru-icss-halt[k2g-pru1_1-fw] = "/lib/firmware/pru/PRU_Halt.out"
+
 ALTERNATIVE_PRIORITY_pru-icss-halt = "50"
 
 # Craete the pru-icss-rpmsg-echo firmware alternatives
@@ -122,6 +152,8 @@ ALTERNATIVE_pru-icss-rpmsg-echo = "${PRU_ICSS_ALTERNATIVES}"
 ALTERNATIVE_TARGET_pru-icss-rpmsg-echo[am335x-pru0-fw] = "/lib/firmware/pru/PRU_RPMsg_Echo_Interrupt0.out"
 ALTERNATIVE_TARGET_pru-icss-rpmsg-echo[am335x-pru1-fw] = "/lib/firmware/pru/PRU_RPMsg_Echo_Interrupt1.out"
 
+ALTERNATIVE_TARGET_pru-icss-rpmsg-echo[am437x-pru0_0-fw] = "/lib/firmware/pru/PRU_RPMsg_Echo_Interrupt0_0.out"
+ALTERNATIVE_TARGET_pru-icss-rpmsg-echo[am437x-pru0_1-fw] = "/lib/firmware/pru/PRU_RPMsg_Echo_Interrupt0_1.out"
 ALTERNATIVE_TARGET_pru-icss-rpmsg-echo[am437x-pru1_0-fw] = "/lib/firmware/pru/PRU_RPMsg_Echo_Interrupt1_0.out"
 ALTERNATIVE_TARGET_pru-icss-rpmsg-echo[am437x-pru1_1-fw] = "/lib/firmware/pru/PRU_RPMsg_Echo_Interrupt1_1.out"
 
@@ -130,6 +162,11 @@ ALTERNATIVE_TARGET_pru-icss-rpmsg-echo[am57xx-pru1_1-fw] = "/lib/firmware/pru/PR
 ALTERNATIVE_TARGET_pru-icss-rpmsg-echo[am57xx-pru2_0-fw] = "/lib/firmware/pru/PRU_RPMsg_Echo_Interrupt2_0.out"
 ALTERNATIVE_TARGET_pru-icss-rpmsg-echo[am57xx-pru2_1-fw] = "/lib/firmware/pru/PRU_RPMsg_Echo_Interrupt2_1.out"
 
+ALTERNATIVE_TARGET_pru-icss-rpmsg-echo[k2g-pru0_0-fw] = "/lib/firmware/pru/PRU_RPMsg_Echo_Interrupt0_0.out"
+ALTERNATIVE_TARGET_pru-icss-rpmsg-echo[k2g-pru0_1-fw] = "/lib/firmware/pru/PRU_RPMsg_Echo_Interrupt0_1.out"
+ALTERNATIVE_TARGET_pru-icss-rpmsg-echo[k2g-pru1_0-fw] = "/lib/firmware/pru/PRU_RPMsg_Echo_Interrupt1_0.out"
+ALTERNATIVE_TARGET_pru-icss-rpmsg-echo[k2g-pru1_1-fw] = "/lib/firmware/pru/PRU_RPMsg_Echo_Interrupt1_1.out"
+
 ALTERNATIVE_PRIORITY_pru-icss-rpmsg-echo = "100"
 
 ALLOW_EMPTY_${PN} = "1"

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

@@ -1,20 +1,18 @@
-DESCRIPTION = "PRU Ethernet firmware for AM57xx and AM437x"
+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 = "3.1.4"
 PR = "r1"
 
 CLEANBROKEN = "1"
 
-COMPATIBLE_MACHINE = "am57xx-evm|am437x-evm"
+COMPATIBLE_MACHINE = "am57xx-evm|am437x-evm|am335x-evm|k2g"
 
 PACKAGE_ARCH = "${MACHINE_ARCH}"
 
-SRCREV = "f6c712fd26044d90939ff774f07dfcb951bcefc9"
+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}"
@@ -23,6 +21,8 @@ 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

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

@@ -0,0 +1,21 @@
+DESCRIPTION = "TI PRUSS low level driver tests"
+
+DEPENDS="common-csl-ip pruss-lld osal"
+
+include pruss-lld.inc
+
+PR = "${INC_PR}.1"
+
+S = "${WORKDIR}/${PRUSS_LLD_GIT_DESTSUFFIX}"
+
+EXTRA_OEMAKE += "-f makefile_armv7 PDK_INSTALL_PATH=${STAGING_INCDIR} PRUSS_SRC_DIR=${S}"
+
+do_compile () {
+#   Build the tests
+    oe_runmake tests
+}
+
+do_install () {
+#   Install the binary
+    oe_runmake installbin INSTALL_BIN_BASE_DIR=${D}${bindir}
+}

recipes-bsp/pruss-lld/pruss-lld.inc

@@ -0,0 +1,20 @@
+LICENSE = "BSD-3-Clause"
+LIC_FILES_CHKSUM = "file://pruicss.h;beginline=1;endline=31;md5=315177aa03d58bcd124a6e799e2bd458"
+
+COMPATIBLE_MACHINE = "ti33x|ti43x|omap-a15|k2g-evm"
+PACKAGE_ARCH = "${MACHINE_ARCH}"
+
+PRUSS_LLD_GIT_URI = "git://git.ti.com/keystone-rtos/pruss-lld.git"
+PRUSS_LLD_GIT_PROTOCOL = "git"
+PRUSS_LLD_GIT_BRANCH = "master"
+PRUSS_LLD_GIT_DESTSUFFIX = "git/ti/drv/pruss"
+
+# Below commit ID corresponds to "DEV.PRUSS_LLD.01.00.00.05A"
+PRUSS_LLD_SRCREV = "7421ea14f163fb3c95c3645fe0add1e05da9d748"
+
+BRANCH = "${PRUSS_LLD_GIT_BRANCH}"
+SRC_URI = "${PRUSS_LLD_GIT_URI};destsuffix=${PRUSS_LLD_GIT_DESTSUFFIX};protocol=${PRUSS_LLD_GIT_PROTOCOL};branch=${BRANCH}"
+
+SRCREV = "${PRUSS_LLD_SRCREV}"
+PV = "01.00.00.05A"
+INC_PR = "r0"

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

@@ -0,0 +1,22 @@
+DESCRIPTION = "TI PRUSS low level driver library"
+
+DEPENDS="common-csl-ip osal"
+
+include pruss-lld.inc
+
+PR = "${INC_PR}.2"
+
+S = "${WORKDIR}/${PRUSS_LLD_GIT_DESTSUFFIX}"
+
+EXTRA_OEMAKE += "-f makefile_armv7 PDK_INSTALL_PATH=${STAGING_INCDIR}"
+
+do_compile () {
+#   Build the lib
+    oe_runmake clean
+    oe_runmake lib
+}
+
+do_install () {
+#   Install the lib
+    oe_runmake install INSTALL_INC_BASE_DIR=${D}${includedir} INSTALL_LIB_BASE_DIR=${D}${libdir}
+}

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"

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"
+XDCARGS_k2g = "k2g"

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"
 

recipes-bsp/rwmem/rwmem_1.1.bb

@@ -7,8 +7,6 @@ SRC_URI = "git://github.com/tomba/rwmem.git"
 
 S = "${WORKDIR}/git"
 
-EXTRA_OEMAKE = "CC=${TARGET_PREFIX}gcc"
-
 do_install() {
 	install -d ${D}${bindir}
 	install -m 0755 rwmem ${D}${bindir}

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"
 
-# Following commit DEV.SA_LLD.03.00.00.13A
-SA_LLD_SRCREV = "5918d9a519789c34368388c49869cb857d6255f7"
+# Below commit ID corresponds to "DEV.SA_LLD.03.00.00.16"
+SA_LLD_SRCREV = "eb1508714586f92e66bf5a8a4c212e8277f6b065"
 
 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.16"
+INC_PR = "r0"
 
 S = "${WORKDIR}/${SA_LLD_GIT_DESTSUFFIX}"

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"

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"
 

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.4"
+PV = "0.1.1.37"
 PR = "r0"
 
 CLEANBROKEN = "1"
 
-COMPATIBLE_MACHINE = "k2g-evm"
+COMPATIBLE_MACHINE = "k2g"
 
 PACKAGE_ARCH = "${MACHINE_ARCH}"
 
-SRCREV = "11c3f5df2276c542966c32e95289ec49d111a696"
+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}"

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-am33x_2013.01.01.bb

@@ -1,20 +0,0 @@
-require u-boot-ti.inc
-
-DESCRIPTION = "u-boot bootloader for ARM MPU devices"
-
-COMPATIBLE_MACHINE = "ti33x"
-
-DEFAULT_PREFERENCE = "-1"
-
-PR = "r6"
-PV_append = "+git${SRCPV}"
-
-SRC_URI = "git://git.ti.com/ti-u-boot/ti-u-boot.git;protocol=git;branch=${BRANCH}"
-
-# This version of u-boot is meant for 3.2 kernel which doesn't support device tree.
-BRANCH = "ti-u-boot-2013.01.01-amsdk-06.00.00.00"
-
-SRCREV = "540aa6fbb0c9274bda598f7e8819ed28259cad6b"
-
-# Set the name of the SPL that will built so that it is also packaged with u-boot.
-SPL_BINARY = "MLO"

recipes-bsp/u-boot/u-boot-glsdk_2013.01.01.bb

@@ -1,17 +0,0 @@
-require u-boot-ti.inc
-
-DESCRIPTION = "u-boot bootloader for TI devices supported by the GLSDK product"
-
-PR = "r1"
-PV_append = "+git${SRCPV}"
-
-DEFAULT_PREFERENCE = "-1"
-
-SRC_URI = "git://git.omapzoom.org/repo/u-boot.git;protocol=git;branch=${BRANCH}"
-
-BRANCH ?= "p-ti-u-boot-2013.04"
-
-SRCREV = "76447484441a4b8e00840a2bde74e66dbac9e631"
-
-SPL_BINARY = "MLO"
-SPL_UART_BINARY = "u-boot-spl.bin"

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

@@ -1,71 +0,0 @@
-require u-boot-ti.inc
-
-DESCRIPTION = "u-boot bootloader for Multi-Core BU devices"
-
-COMPATIBLE_MACHINE = "keystone"
-
-PR = "r6"
-PV_append = "+git${SRCPV}"
-
-# Tag "K2_UBOOT_2013_01_15.07_01"
-SRCREV = "5eaedcc4c2bca0ed971ee46694df7edc0cfa36cf"
-BRANCH = "master"
-
-SRC_URI = "git://git.ti.com/keystone-linux/u-boot.git;protocol=git;branch=${BRANCH}"
-
-S = "${WORKDIR}/git"
-
-UBOOT_SUFFIX = "bin"
-UBOOT_MAKE_TARGET = "u-boot-spi.gph u-boot-nand.gph"
-
-# 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"
-UBOOT_NAND_GPH_BINARY = "u-boot-nand.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"
-UBOOT_NAND_GPH_IMAGE = "u-boot-nand-${MACHINE}-${PV}-${PR}.gph"
-UBOOT_NAND_GPH_SYMLINK = "u-boot-nand-${MACHINE}.gph"
-
-do_install_append () {
-	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}
-
-        install ${S}/${UBOOT_NAND_GPH_BINARY} ${D}/boot/${UBOOT_NAND_GPH_IMAGE}
-        ln -sf ${UBOOT_NAND_GPH_IMAGE} ${D}/boot/${UBOOT_NAND_GPH_BINARY}
-}
-
-do_deploy_append () {
-	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}
-
-        install ${S}/${UBOOT_NAND_GPH_BINARY} ${DEPLOYDIR}/${UBOOT_NAND_GPH_IMAGE}
-        rm -f ${UBOOT_NAND_GPH_BINARY} ${UBOOT_NAND_GPH_SYMLINK}
-        ln -sf ${UBOOT_NAND_GPH_IMAGE} ${UBOOT_NAND_GPH_SYMLINK}
-        ln -sf ${UBOOT_NAND_GPH_IMAGE} ${UBOOT_NAND_GPH_BINARY}
-}

recipes-bsp/u-boot/u-boot-ti-staging_2013.01.01.bb

@@ -1,16 +0,0 @@
-require u-boot-ti.inc
-
-DESCRIPTION = "u-boot bootloader for TI devices"
-
-PR = "r5"
-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-2013.01.01"
-
-# This commit corresponds to ti2013.04.00 release tag
-SRCREV = "7552b4c906b0a50fbc5225dc43ed0192618e9d5d"
-
-SPL_BINARY = "MLO"
-SPL_UART_BINARY = "u-boot-spl.bin"

recipes-bsp/u-boot/u-boot-ti-staging_2013.10.bb

@@ -1,18 +0,0 @@
-require u-boot-ti.inc
-
-DESCRIPTION = "u-boot bootloader for TI devices"
-
-LIC_FILES_CHKSUM = "file://Licenses/README;md5=025bf9f768cbcb1a165dbe1a110babfb"
-
-PR = "r8"
-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-2013.10"
-
-# Corresponds to tag ti2013.12.01_amsdk-07.01
-SRCREV = "259ff9a577cc66cb40e3cdff3e41628e466f0fef"
-
-SPL_BINARY = "MLO"
-SPL_UART_BINARY = "u-boot-spl.bin"

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_2016.05.bb

@@ -5,24 +5,23 @@ DEPENDS += "dtc-native"
 
 DESCRIPTION = "u-boot bootloader for TI devices"
 
-LIC_FILES_CHKSUM = "file://Licenses/README;md5=0507cd7da8e7ad6d6701926ec9b84c95"
+LIC_FILES_CHKSUM = "file://Licenses/README;md5=a2c678cfd4a4d97135585cad908541c6"
 
-PR = "r25"
+PR = "r31"
 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"
+BRANCH ?= "ti-u-boot-2016.05"
 
-SRCREV = "46c915c96358c426bb1f4dd1e25a9a805d93a24e"
+SRCREV = "e646599450834807fd334dd9593112e89aee11c7"
 
 # 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_BINARY_k2e-hs-evm = ""
 SPL_UART_BINARY = "u-boot-spl.bin"
 
 # Keystone specifics
@@ -42,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
@@ -49,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}

recipes-bsp/u-boot/u-boot-ti.inc

@@ -1,3 +1,15 @@
+# UBOOT_LOCALVERSION can be set to add a tag to the end of the
+# U-boot version string.  such as the commit id
+def get_git_revision(p):
+    import subprocess
+
+    try:
+        return subprocess.Popen("git rev-parse HEAD 2>/dev/null ", cwd=p, shell=True, stdout=subprocess.PIPE).communicate()[0].rstrip()
+    except OSError:
+        return None
+
+UBOOT_LOCALVERSION = "-g${@get_git_revision('${S}').__str__()[:10]}"
+
 UBOOT_SUFFIX ?= "img"
 
 require ${COREBASE}/meta/recipes-bsp/u-boot/u-boot.inc

recipes-bsp/u-boot/u-boot_2014.07.bb

@@ -1,25 +0,0 @@
-require u-boot-ti.inc
-
-# DEPEND on dtc-native for mainline u-boot because the mainline u-boot depends
-# on some of the latest syntax constructs for an appended in dtb used for
-# items like secure boot/image signing.
-DEPENDS += "dtc-native"
-
-DESCRIPTION = "Mainline u-boot bootloader"
-
-DEFAULT_PREFERENCE = "-1"
-
-LIC_FILES_CHKSUM = "file://Licenses/README;md5=025bf9f768cbcb1a165dbe1a110babfb"
-
-SRC_URI = "git://git.denx.de/u-boot.git;protocol=git;branch=${BRANCH}"
-
-BRANCH ?= "master"
-
-# Corresponds to tag v2014.07
-SRCREV = "524123a70761110c5cf3ccc5f52f6d4da071b959"
-
-SPL_BINARY = "MLO"
-SPL_UART_BINARY = "u-boot-spl.bin"
-
-SPL_BINARY_omapl138 = ""
-SPL_UART_BINARY_omapl138 = ""

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

@@ -1,16 +1,30 @@
 DESCRIPTION = "Test code for user space IO (UIO) driver"
 
 include uio-module-drv.inc
-PV = "1.0.2.3"
 
-COMPATIBLE_MACHINE = "keystone"
+PR = "r2"
+
+COMPATIBLE_MACHINE = "keystone|omap-a15"
+PACKAGE_ARCH = "${MACHINE_ARCH}"
+
+DEVICE_NAME_omap-a15 = "am57xx"
+DEVICE_NAME_keystone = "keystone"
 RDEPENDS_${PN} = "uio-module-drv"
 
 do_compile() {
-	oe_runmake -C ${S} test
+	oe_runmake -C ${S} test "DEVICE=${DEVICE_NAME}"
 }
 
 do_install() {
 	install -d ${D}${bindir}/
+	install -c -m 755 ${S}/test/uio_mem_test ${D}${bindir}/.
+	install -c -m 755 ${S}/test/uio_int_test ${D}${bindir}/.
+}
+
+do_install_append_keystone () {
 	install -c -m 755 ${S}/test/uio_cic2_int_multithread_test ${D}${bindir}/.
 }
+
+do_install_append_omap-a15 () {
+	install -c -m 755 ${S}/test/prussdrv_test/test/pruss_uio_test ${D}${bindir}/.
+}

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

@@ -1,9 +1,11 @@
 LICENSE = "BSD"
 LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=2b7c96eb2aed7b0f6f922214dbde9016"
 
-BRANCH = "linux4.1"
-# This corresponds to version 02.00.00.00_eng
-SRCREV = "6a7eda36e390658593a5b8d87b0f00beb3997240"
+BRANCH = "master"
+# This corresponds to version 02.01.00.00
+SRCREV = "19761495883bf8fb2670b0929d255135bd295dcb"
+
+PV = "2.1.0.0+git${SRCPV}"
 
 SRC_URI = "git://git.ti.com/keystone-linux/uio-module-drv.git;protocol=git;branch=${BRANCH}"