u-boot-ti-stagaing: redo the last fix

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

conf/layer.conf

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

conf/machine/am335x-evm.conf

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

conf/machine/am437x-evm.conf

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

conf/machine/include/keystone.inc

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

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

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

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

@@ -0,0 +1,28 @@
+DESCRIPTION = "Cortex-M3 binary blob for suspend-resume"
+
+LICENSE = "BSD-3-Clause"
+LIC_FILES_CHKSUM = "file://License.txt;md5=7bdc54a749ab7a7dea999d25d99a41b8"
+
+PV = "1.9.1"
+PR = "r1"
+
+SRCREV = "730f0695ca2dda65abcff5763e8f108517bc0d43"
+BRANCH ?= "ti-v4.1.y"
+
+SRC_URI = "git://git.ti.com/ti-cm3-pm-firmware/amx3-cm3.git;protocol=git;branch=${BRANCH}"
+
+S = "${WORKDIR}/git"
+
+FLOATABI = "${@base_contains("TUNE_FEATURES", "vfp", base_contains("TUNE_FEATURES", "callconvention-hard", " -mfloat-abi=hard", " -mfloat-abi=softfp", d), "" ,d)}"
+
+do_compile() {
+	make CROSS_COMPILE="${TARGET_PREFIX}" CC="${TARGET_PREFIX}gcc ${TOOLCHAIN_OPTIONS} ${FLOATABI}"
+}
+
+do_install() {
+	install -d ${D}${base_libdir}/firmware
+	install -m 0644 bin/am335x-pm-firmware.elf ${D}${base_libdir}/firmware/
+	install -m 0644 bin/*-scale-data.bin ${D}${base_libdir}/firmware/
+}
+
+FILES_${PN} += "${base_libdir}/firmware"

recipes-bsp/cmem/cmem-mod_git.bb

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

recipes-bsp/cmem/cmem.inc

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

recipes-bsp/cmem/cmem_git.bb

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

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

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

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

@@ -0,0 +1,18 @@
+DESCRIPTION = "Chip support library low level interface"
+LICENSE = "BSD-3-Clause"
+LIC_FILES_CHKSUM = "file://COPYING.txt;md5=5857833e20836213677fac33f9aded21"
+
+COMPATIBLE_MACHINE = "keystone|dra7xx"
+PACKAGE_ARCH = "${MACHINE_ARCH}"
+
+
+BRANCH="master"
+BRANCH_dra7xx = "releases/PROCESSOR-SDK.01.00.00"
+
+SRC_URI = "git://git.ti.com/keystone-rtos/common-csl-ip.git;protocol=git;branch=${BRANCH};destsuffix=${S}"
+
+# commit ID corresponds to DEV.CSL_KEYSTONE2.02.01.00.07A
+SRCREV = "c78867df9165fdf8042fb692fcea776fc0102326"
+
+# commit ID corresponds to PROCESSOR-SDK-ALPHA-1
+SRCREV_dra7xx = "37c5311ddf289f83b1432a9422816722d264bf55"

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

@@ -1,15 +1,8 @@
-DESCRIPTION = "Chip support library low level interface"
-LICENSE = "BSD-3-Clause"
-LIC_FILES_CHKSUM = "file://COPYING.txt;md5=5857833e20836213677fac33f9aded21"
-
-COMPATIBLE_MACHINE = "keystone"
-ALLOW_EMPTY_${PN} = "1"
+require common-csl-ip.inc
 
 PR = "r3"
-BRANCH="master"
-SRC_URI = "git://git.ti.com/keystone-rtos/common-csl-ip.git;protocol=git;branch=${BRANCH}"
-# commit ID corresponds to DEV.CSL_KEYSTONE2.02.01.00.07A
-SRCREV = "c78867df9165fdf8042fb692fcea776fc0102326"
+
+ALLOW_EMPTY_${PN} = "1"
 
 S = "${WORKDIR}/git"
 

recipes-bsp/cuia/cuia_1.0.0.13.bb

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

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

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

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

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

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

@@ -0,0 +1,10 @@
+DESCRIPTION = "TI EDMA3 low level driver and test code"
+LICENSE = "BSD-3-Clause"
+LIC_FILES_CHKSUM = "file://COPYING.txt;md5=5bdceac872dffdec915b819654ee23ea"
+
+BRANCH = "master"
+SRC_URI = "git://git.ti.com/keystone-rtos/edma3_lld.git;protocol=git;branch=${BRANCH}"
+# The following commit corresponds to tag DEV_EDMA3_LLD_02_12_01_21_RC1
+SRCREV = "562cba36ccd53e89e6979e99a58374513b543f93"
+
+PV = "2.12.01.21"

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

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

recipes-bsp/hplib/hplib_git.bb

@@ -3,6 +3,7 @@ LICENSE = "BSD-3-Clause"
 LIC_FILES_CHKSUM = "file://${WORKDIR}/git/ti/runtime/hplib/src/COPYING.txt;md5=b7982a377c680ad71ca2fbb735982462"
 
 DEPENDS = "common-csl-ip rm-lld qmss-lld sa-lld pktlib"
+RDEPENDS_${PN} = "hplib-mod"
 
 include hplib.inc
 

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

@@ -28,10 +28,6 @@ case "$compatible" in
 		device=k2hk
 		ln -sf libhyplnk_k2h.so.1.0.0 libhyplnk_device.so.1
 	;;
-	*k2l*)
-		device=k2l
-		ln -sf libhyplnk_k2l.so.1.0.0 libhyplnk_device.so.1
-	;;
 	*k2e*)
 		device=k2e
 		ln -sf libhyplnk_k2e.so.1.0.0 libhyplnk_device.so.1

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

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

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

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

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

@@ -0,0 +1,35 @@
+python __anonymous() {
+    features = bb.data.getVar("MACHINE_FEATURES", d, 1)
+    if not features:
+        return
+    if "mmip" not in features:
+        raise bb.parse.SkipPackage('ipumm-fw does not apply to systems without the "mmip" flag in MACHINE_FEATURES')
+}
+
+DESCRIPTION = "Firmware for IPU for supporting Accelerated MM decode and encode"
+LICENSE = "TI-TSPA"
+
+LIC_FILES_CHKSUM = "file://MMIP-${PV}-Manifest.doc;md5=5803e271087f74d03239d868bebcc2c7"
+
+COMPATIBLE_MACHINE = "dra7xx"
+PACKAGE_ARCH = "${MACHINE_ARCH}"
+
+RDEPENDS_${PN} = " libdce"
+
+SRC_URI = "http://downloads.ti.com/infotainment/esd/jacinto6/glsdk/ipumm/3_00_09_01/exports/ipumm-dra7xx-evm-${PV}.tar.gz;protocol=http"
+
+SRC_URI[md5sum] = "bf15624e26bdef4dbb67b98ccd8b9754"
+SRC_URI[sha256sum] = "e70a38b62e3e4d11d5ce68f0980de4df5256bd597068f179e220fa5afcd065fe"
+
+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 = "r0"

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

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

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

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

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

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

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

@@ -0,0 +1,78 @@
+require u-boot-ti.inc
+
+# u-boot needs devtree compiler to parse dts files
+DEPENDS += "dtc-native"
+
+DESCRIPTION = "u-boot bootloader for TI devices"
+
+LIC_FILES_CHKSUM = "file://Licenses/README;md5=0507cd7da8e7ad6d6701926ec9b84c95"
+
+PR = "r10"
+PV_append = "+git${SRCPV}"
+
+SRC_URI = "git://git.ti.com/ti-u-boot/ti-u-boot.git;protocol=git;branch=${BRANCH}"
+
+BRANCH ?= "ti-u-boot-2015.07"
+
+SRCREV = "d49aa5effa20d0b943c74ced84e67defce6d6d1c"
+
+SPL_BINARY = "MLO"
+SPL_UART_BINARY = "u-boot-spl.bin"
+
+# Keystone specifics
+UBOOT_SUFFIX_keystone = "bin"
+UBOOT_MAKE_TARGET_keystone = "u-boot-spi.gph u-boot-nand.gph"
+SPL_BINARY_keystone = ""
+SPL_UART_BINARY_keystone = ""
+
+# SPI NOR Flash binaries
+UBOOT_SPI_SPL_BINARY = "u-boot-spl.bin"
+UBOOT_SPI_BINARY = "u-boot.img"
+UBOOT_SPI_GPH_BINARY = "u-boot-spi.gph"
+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_keystone () {
+	install ${S}/spl/${UBOOT_SPI_SPL_BINARY} ${D}/boot/${UBOOT_SPI_SPL_IMAGE}
+	ln -sf ${UBOOT_SPI_SPL_IMAGE} ${D}/boot/${UBOOT_SPI_SPL_BINARY}
+
+	install ${S}/${UBOOT_SPI_BINARY} ${D}/boot/${UBOOT_SPI_IMAGE}
+	ln -sf ${UBOOT_SPI_IMAGE} ${D}/boot/${UBOOT_SPI_BINARY}
+
+	install ${S}/${UBOOT_SPI_GPH_BINARY} ${D}/boot/${UBOOT_SPI_GPH_IMAGE}
+	ln -sf ${UBOOT_SPI_GPH_IMAGE} ${D}/boot/${UBOOT_SPI_GPH_BINARY}
+
+	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_keystone () {
+	install ${S}/spl/${UBOOT_SPI_SPL_BINARY} ${DEPLOYDIR}/${UBOOT_SPI_SPL_IMAGE}
+	rm -f ${UBOOT_SPI_SPL_BINARY} ${UBOOT_SPI_SPL_SYMLINK}
+	ln -sf ${UBOOT_SPI_SPL_IMAGE} ${UBOOT_SPI_SPL_SYMLINK}
+	ln -sf ${UBOOT_SPI_SPL_IMAGE} ${UBOOT_SPI_SPL_BINARY}
+
+	install ${S}/${UBOOT_SPI_BINARY} ${DEPLOYDIR}/${UBOOT_SPI_IMAGE}
+	rm -f ${UBOOT_SPI_BINARY} ${UBOOT_SPI_SYMLINK}
+	ln -sf ${UBOOT_SPI_IMAGE} ${UBOOT_SPI_SYMLINK}
+	ln -sf ${UBOOT_SPI_IMAGE} ${UBOOT_SPI_BINARY}
+
+	install ${S}/${UBOOT_SPI_GPH_BINARY} ${DEPLOYDIR}/${UBOOT_SPI_GPH_IMAGE}
+	rm -f ${UBOOT_SPI_GPH_BINARY} ${UBOOT_SPI_GPH_SYMLINK}
+	ln -sf ${UBOOT_SPI_GPH_IMAGE} ${UBOOT_SPI_GPH_SYMLINK}
+	ln -sf ${UBOOT_SPI_GPH_IMAGE} ${UBOOT_SPI_GPH_BINARY}
+
+	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/uio-module-drv/uio-module-drv-test_git.bb

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

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

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

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

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

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

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

recipes-devtools/gdbc6x/gdbc6x/init

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

recipes-devtools/gdbc6x/gdbc6x_git.bb

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

recipes-devtools/gdbc6x/gdbserver-c6x_git.bb

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

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

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

recipes-graphics/bltsville/bltsville_git.bb

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

recipes-graphics/drm/libdrm_2.4.41.bb

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

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

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

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

@@ -0,0 +1,3 @@
+[default]
+WindowSystem=null_libdrm.so
+DisableHWTQTextureUpload=1

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

@@ -0,0 +1,3 @@
+[default]
+WindowSystem=null_libdrm.so
+DisableHWTQTextureUpload=1

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

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

recipes-kernel/kselftests/kselftests_4.1.bb

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

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

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

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

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

recipes-kernel/linux/linux-ti-staging-4.1/0005-arm-Export-cache-flush-management-symbols-when-MULTI.patch

@@ -0,0 +1,36 @@
+From ea8c16f49b043f4f096909e0d7bc0b9d248aafce Mon Sep 17 00:00:00 2001
+From: Pantelis Antoniou <panto@antoniou-consulting.com>
+Date: Fri, 28 Aug 2015 06:17:59 +0000
+Subject: [PATCH 5/8] arm: Export cache flush management symbols when
+ !MULTI_CACHE
+
+When compiling a kernel without CONFIG_MULTI_CACHE enabled the
+dma access functions end up not being exported. Fix it.
+
+Signed-off-by: Pantelis Antoniou <panto@antoniou-consulting.com>
+Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ti.com>
+Signed-off-by: Eric Ruei <e-ruei1@ti.com>
+---
+ arch/arm/kernel/setup.c | 9 +++++++++
+ 1 file changed, 9 insertions(+)
+
+diff --git a/arch/arm/kernel/setup.c b/arch/arm/kernel/setup.c
+index 979c1c5..063165d 100644
+--- a/arch/arm/kernel/setup.c
++++ b/arch/arm/kernel/setup.c
+@@ -1137,3 +1137,12 @@ const struct seq_operations cpuinfo_op = {
+ 	.stop	= c_stop,
+ 	.show	= c_show
+ };
++
++/* export the cache management functions */
++#ifndef MULTI_CACHE
++
++EXPORT_SYMBOL(__glue(_CACHE,_dma_map_area));
++EXPORT_SYMBOL(__glue(_CACHE,_dma_unmap_area));
++EXPORT_SYMBOL(__glue(_CACHE,_dma_flush_range));
++
++#endif
+-- 
+2.2.0
+

recipes-kernel/linux/linux-ti-staging-4.1/0006-ARM-dts-am33xx-add-DT-node-for-gpu.patch

@@ -0,0 +1,150 @@
+From 29ce4cbb157611004fb1908b949ac54ca396ca5d Mon Sep 17 00:00:00 2001
+From: Darren Etheridge <detheridge@ti.com>
+Date: Fri, 28 Aug 2015 06:18:00 +0000
+Subject: [PATCH 6/8] ARM: dts: am33xx: add DT node for gpu
+
+Add the node into the am33xx.dtsi file for the SGX GPU.
+
+Signed-off-by: Darren Etheridge <detheridge@ti.com>
+Signed-off-by: Eric Ruei <e-ruei1@ti.com>
+---
+ arch/arm/boot/dts/am335x-bone.dts      | 4 ++++
+ arch/arm/boot/dts/am335x-boneblack.dts | 4 ++++
+ arch/arm/boot/dts/am335x-evm.dts       | 5 +++++
+ arch/arm/boot/dts/am335x-evmsk.dts     | 4 ++++
+ arch/arm/boot/dts/am335x-lxm.dts       | 3 +++
+ arch/arm/boot/dts/am335x-nano.dts      | 4 ++++
+ arch/arm/boot/dts/am335x-pepper.dts    | 4 ++++
+ arch/arm/boot/dts/am33xx.dtsi          | 8 ++++++++
+ 8 files changed, 36 insertions(+)
+ mode change 100644 => 100755 arch/arm/boot/dts/am335x-bone.dts
+ mode change 100644 => 100755 arch/arm/boot/dts/am335x-evm.dts
+ mode change 100644 => 100755 arch/arm/boot/dts/am335x-evmsk.dts
+ mode change 100644 => 100755 arch/arm/boot/dts/am335x-lxm.dts
+ mode change 100644 => 100755 arch/arm/boot/dts/am335x-nano.dts
+ mode change 100644 => 100755 arch/arm/boot/dts/am335x-pepper.dts
+ mode change 100644 => 100755 arch/arm/boot/dts/am33xx.dtsi
+
+diff --git a/arch/arm/boot/dts/am335x-bone.dts b/arch/arm/boot/dts/am335x-bone.dts
+old mode 100644
+new mode 100755
+index 6b849372..ce1b68a
+--- a/arch/arm/boot/dts/am335x-bone.dts
++++ b/arch/arm/boot/dts/am335x-bone.dts
+@@ -24,3 +24,7 @@
+ &mmc1 {
+ 	vmmc-supply = <&ldo3_reg>;
+ };
++
++&sgx {
++	status = "okay";
++};
+diff --git a/arch/arm/boot/dts/am335x-boneblack.dts b/arch/arm/boot/dts/am335x-boneblack.dts
+index 34c9928..369f34d 100644
+--- a/arch/arm/boot/dts/am335x-boneblack.dts
++++ b/arch/arm/boot/dts/am335x-boneblack.dts
+@@ -33,6 +33,10 @@
+ 	status = "okay";
+ };
+ 
++&sgx {
++	status = "okay";
++};
++
+ &am33xx_pinmux {
+ 	nxp_hdmi_bonelt_pins: nxp_hdmi_bonelt_pins {
+ 		pinctrl-single,pins = <
+diff --git a/arch/arm/boot/dts/am335x-evm.dts b/arch/arm/boot/dts/am335x-evm.dts
+old mode 100644
+new mode 100755
+index 8704195..2414437
+--- a/arch/arm/boot/dts/am335x-evm.dts
++++ b/arch/arm/boot/dts/am335x-evm.dts
+@@ -905,3 +905,8 @@
+ &rtc {
+ 	system-power-controller;
+ };
++
++&sgx {
++	status = "okay";
++};
++
+diff --git a/arch/arm/boot/dts/am335x-evmsk.dts b/arch/arm/boot/dts/am335x-evmsk.dts
+old mode 100644
+new mode 100755
+index 3c54b90..74d1943
+--- a/arch/arm/boot/dts/am335x-evmsk.dts
++++ b/arch/arm/boot/dts/am335x-evmsk.dts
+@@ -729,3 +729,7 @@
+ &lcdc {
+       status = "okay";
+ };
++
++&sgx {
++	status = "okay";
++};
+diff --git a/arch/arm/boot/dts/am335x-lxm.dts b/arch/arm/boot/dts/am335x-lxm.dts
+old mode 100644
+new mode 100755
+index 5c5667a..c7c51b4
+--- a/arch/arm/boot/dts/am335x-lxm.dts
++++ b/arch/arm/boot/dts/am335x-lxm.dts
+@@ -364,3 +364,6 @@
+ 	status = "okay";
+ };
+ 
++&sgx {
++	status = "okay";
++};
+diff --git a/arch/arm/boot/dts/am335x-nano.dts b/arch/arm/boot/dts/am335x-nano.dts
+old mode 100644
+new mode 100755
+index 5ed4ca6..7dc4b13
+--- a/arch/arm/boot/dts/am335x-nano.dts
++++ b/arch/arm/boot/dts/am335x-nano.dts
+@@ -438,3 +438,7 @@
+ 		};
+ 	};
+ };
++
++&sgx {
++	status = "okay";
++};
+diff --git a/arch/arm/boot/dts/am335x-pepper.dts b/arch/arm/boot/dts/am335x-pepper.dts
+old mode 100644
+new mode 100755
+index 0d35ab6..67e032d9
+--- a/arch/arm/boot/dts/am335x-pepper.dts
++++ b/arch/arm/boot/dts/am335x-pepper.dts
+@@ -651,3 +651,7 @@
+ 		>;
+ 	};
+ };
++
++&sgx {
++	status = "okay";
++};
+diff --git a/arch/arm/boot/dts/am33xx.dtsi b/arch/arm/boot/dts/am33xx.dtsi
+old mode 100644
+new mode 100755
+index 308ec9a..86631ba
+--- a/arch/arm/boot/dts/am33xx.dtsi
++++ b/arch/arm/boot/dts/am33xx.dtsi
+@@ -880,6 +880,14 @@
+ 			reg = <0x48310000 0x2000>;
+ 			interrupts = <111>;
+ 		};
++
++		sgx: sgx@0x56000000 {
++			compatible = "ti,am335x-sgx530", "img,sgx530";
++			ti,hwmods = "gfx";
++			reg = <0x56000000 0x1000000>;
++			interrupts = <37>;
++			status = "disabled";
++		};
+ 	};
+ };
+ 
+-- 
+2.2.0
+

recipes-kernel/linux/linux-ti-staging-4.1/0007-ARM-dts-am437x-add-DT-node-for-gpu.patch

@@ -0,0 +1,102 @@
+From 975c3e8be136fc459688c5d5e9daf272e6092af0 Mon Sep 17 00:00:00 2001
+From: Darren Etheridge <detheridge@ti.com>
+Date: Fri, 28 Aug 2015 06:18:01 +0000
+Subject: [PATCH 7/8] ARM: dts: am437x: add DT node for gpu
+
+Add dt node to enable SGX PowerVR driver in AM437x base dtsi file.
+
+Signed-off-by: Darren Etheridge <detheridge@ti.com>
+Signed-off-by: Eric Ruei <e-ruei1@ti.com>
+---
+ arch/arm/boot/dts/am4372.dtsi        | 8 ++++++++
+ arch/arm/boot/dts/am437x-gp-evm.dts  | 4 ++++
+ arch/arm/boot/dts/am437x-idk-evm.dts | 4 ++++
+ arch/arm/boot/dts/am437x-sk-evm.dts  | 4 ++++
+ arch/arm/boot/dts/am43x-epos-evm.dts | 4 ++++
+ 5 files changed, 24 insertions(+)
+ mode change 100644 => 100755 arch/arm/boot/dts/am4372.dtsi
+ mode change 100644 => 100755 arch/arm/boot/dts/am437x-gp-evm.dts
+ mode change 100644 => 100755 arch/arm/boot/dts/am437x-idk-evm.dts
+ mode change 100644 => 100755 arch/arm/boot/dts/am437x-sk-evm.dts
+ mode change 100644 => 100755 arch/arm/boot/dts/am43x-epos-evm.dts
+
+diff --git a/arch/arm/boot/dts/am4372.dtsi b/arch/arm/boot/dts/am4372.dtsi
+old mode 100644
+new mode 100755
+index 72009c2..4fc40b2
+--- a/arch/arm/boot/dts/am4372.dtsi
++++ b/arch/arm/boot/dts/am4372.dtsi
+@@ -789,6 +789,14 @@
+ 			dma-names = "tx", "rx";
+ 		};
+ 
++		sgx: sgx@0x56000000 {
++			compatible = "ti,am437x-sgx530", "img,sgx530";
++			ti,hwmods = "gfx";
++			reg = <0x56000000 0x1000000>;
++			interrupts = <GIC_SPI 37 IRQ_TYPE_LEVEL_HIGH>;
++			status = "disabled";
++		};
++
+ 		rng: rng@48310000 {
+ 			compatible = "ti,omap4-rng";
+ 			ti,hwmods = "rng";
+diff --git a/arch/arm/boot/dts/am437x-gp-evm.dts b/arch/arm/boot/dts/am437x-gp-evm.dts
+old mode 100644
+new mode 100755
+index 5a26668..bbd3f84
+--- a/arch/arm/boot/dts/am437x-gp-evm.dts
++++ b/arch/arm/boot/dts/am437x-gp-evm.dts
+@@ -1241,3 +1241,7 @@
+ 	status = "okay";
+ 	ext-clk-src;
+ };
++
++&sgx {
++	status = "okay";
++};
+diff --git a/arch/arm/boot/dts/am437x-idk-evm.dts b/arch/arm/boot/dts/am437x-idk-evm.dts
+old mode 100644
+new mode 100755
+index f7d8656..ea017df
+--- a/arch/arm/boot/dts/am437x-idk-evm.dts
++++ b/arch/arm/boot/dts/am437x-idk-evm.dts
+@@ -405,3 +405,7 @@
+ &cpu {
+ 	cpu0-supply = <&tps>;
+ };
++
++&sgx {
++	status = "okay";
++};
+diff --git a/arch/arm/boot/dts/am437x-sk-evm.dts b/arch/arm/boot/dts/am437x-sk-evm.dts
+old mode 100644
+new mode 100755
+index 5506e91..55a1263
+--- a/arch/arm/boot/dts/am437x-sk-evm.dts
++++ b/arch/arm/boot/dts/am437x-sk-evm.dts
+@@ -758,3 +758,7 @@
+ &wkup_m3_ipc {
+ 	ti,scale-data-fw = "am43x-evm-scale-data.bin";
+ };
++
++&sgx {
++	status = "okay";
++};
+diff --git a/arch/arm/boot/dts/am43x-epos-evm.dts b/arch/arm/boot/dts/am43x-epos-evm.dts
+old mode 100644
+new mode 100755
+index 92515b3..c9e3dbb
+--- a/arch/arm/boot/dts/am43x-epos-evm.dts
++++ b/arch/arm/boot/dts/am43x-epos-evm.dts
+@@ -869,3 +869,7 @@
+ &cpu {
+ 	cpu0-supply = <&dcdc2>;
+ };
++
++&sgx {
++	status = "okay";
++};
+-- 
+2.2.0
+

recipes-kernel/linux/linux-ti-staging-4.1/0008-ARM-OMAP2-Use-pdata-quirks-for-sgx-deassert_hardrese.patch

@@ -0,0 +1,96 @@
+From 306abd812cbb86a4bffe3d1aee14eb77cc6b1458 Mon Sep 17 00:00:00 2001
+From: Darren Etheridge <detheridge@ti.com>
+Date: Fri, 28 Aug 2015 06:18:02 +0000
+Subject: [PATCH 8/8] ARM: OMAP2+: Use pdata-quirks for sgx deassert_hardreset
+
+Use pdata_quirks to provide platform data to the sgx driver.  This is used
+to provide a function pointer for the sgx driver to access
+omap_device_deassert_hardreset along with the reset name as defined in the
+corresponding hwmod entry.
+
+This platform data will not be required when a seperate reset driver is
+available allowing decoupling from omap_hwmod and omap_device.
+
+Signed-off-by: Darren Etheridge <detheridge@ti.com>
+Signed-off-by: Eric Ruei <e-ruei1@ti.com>
+---
+ arch/arm/mach-omap2/pdata-quirks.c     | 16 +++++++++++++++-
+ include/linux/platform_data/sgx-omap.h | 22 ++++++++++++++++++++++
+ 2 files changed, 37 insertions(+), 1 deletion(-)
+ mode change 100644 => 100755 arch/arm/mach-omap2/pdata-quirks.c
+ create mode 100755 include/linux/platform_data/sgx-omap.h
+
+diff --git a/arch/arm/mach-omap2/pdata-quirks.c b/arch/arm/mach-omap2/pdata-quirks.c
+old mode 100644
+new mode 100755
+index 1377979..f62ad71
+--- a/arch/arm/mach-omap2/pdata-quirks.c
++++ b/arch/arm/mach-omap2/pdata-quirks.c
+@@ -19,6 +19,7 @@
+ #include <linux/platform_data/iommu-omap.h>
+ #include <linux/platform_data/remoteproc-omap.h>
+ #include <linux/platform_data/wkup_m3.h>
++#include <linux/platform_data/sgx-omap.h>
+ #include <linux/platform_data/pci-dra7xx.h>
+ 
+ #include "common.h"
+@@ -37,7 +38,12 @@ struct pdata_init {
+ 
+ struct of_dev_auxdata omap_auxdata_lookup[];
+ static struct twl4030_gpio_platform_data twl_gpio_auxdata;
+-
++#if defined(CONFIG_SOC_AM33XX) || defined(CONFIG_SOC_AM43XX)
++static struct gfx_sgx_platform_data sgx_pdata = {
++	.reset_name = "gfx",
++	.deassert_reset = omap_device_deassert_hardreset,
++};
++#endif
+ #if IS_ENABLED(CONFIG_OMAP_IOMMU)
+ int omap_iommu_set_pwrdm_constraint(struct platform_device *pdev, bool request,
+ 				    u8 *pwrst);
+@@ -377,6 +383,14 @@ struct of_dev_auxdata omap_auxdata_lookup[] __initdata = {
+ 	OF_DEV_AUXDATA("ti,am3352-wkup-m3", 0x44d00000, "44d00000.wkup_m3",
+ 		       &wkup_m3_data),
+ #endif
++#if defined(CONFIG_SOC_AM33XX)
++	OF_DEV_AUXDATA("ti,am335x-sgx530", 0x56000000, "56000000.sgx",
++		       &sgx_pdata),
++#endif
++#if defined(CONFIG_SOC_AM43XX)
++	OF_DEV_AUXDATA("ti,am437x-sgx530", 0x56000000, "56000000.sgx",
++		       &sgx_pdata),
++#endif
+ #ifdef CONFIG_ARCH_OMAP4
+ 	OF_DEV_AUXDATA("ti,omap4-padconf", 0x4a100040, "4a100040.pinmux", &pcs_pdata),
+ 	OF_DEV_AUXDATA("ti,omap4-padconf", 0x4a31e040, "4a31e040.pinmux", &pcs_pdata),
+diff --git a/include/linux/platform_data/sgx-omap.h b/include/linux/platform_data/sgx-omap.h
+new file mode 100755
+index 0000000..aa59b2c
+--- /dev/null
++++ b/include/linux/platform_data/sgx-omap.h
+@@ -0,0 +1,22 @@
++/*
++ * SGX Graphics Driver Platform Data
++ *
++ * Copyright (C) 2014 Texas Instruments Incorporated - http://www.ti.com/
++ *	Darren Etheridge <detheridge@ti.com>
++ *
++ * This program is free software; you can redistribute it and/or modify
++ * it under the terms of the GNU General Public License version 2 as
++ * published by the Free Software Foundation.
++ *
++ * This program is distributed "as is" WITHOUT ANY WARRANTY of any
++ * kind, whether express or implied; without even the implied warranty
++ * of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++ * GNU General Public License for more details.
++ */
++#include <linux/platform_device.h>
++
++struct gfx_sgx_platform_data {
++	const char *reset_name;
++
++	int (*deassert_reset)(struct platform_device *pdev, const char *name);
++};
+-- 
+2.2.0
+

recipes-kernel/linux/linux-ti-staging-4.1/configs/systest

@@ -0,0 +1 @@
+use-combined-config=ti_config_fragments/system_test_defconfig_fragment

recipes-kernel/linux/linux-ti-staging-4.1/defconfig

@@ -0,0 +1 @@
+use-combined-config=ti_config_fragments/defconfig_fragment

recipes-kernel/linux/linux-ti-staging-4.1/keystone/configs/systest

@@ -0,0 +1 @@
+use-combined-config=ti_config_fragments/multi_core_system_test_defconfig_fragment

recipes-kernel/linux/linux-ti-staging-4.1/keystone/defconfig

@@ -0,0 +1 @@
+use-combined-config=ti_config_fragments/multi_core_defconfig_fragment

recipes-kernel/linux/linux-ti-staging-4.1/sgx.cfg

@@ -0,0 +1 @@
+CONFIG_DRM_OMAP_SGX_PLUGIN=y

recipes-kernel/linux/linux-ti-staging_3.14.bb

@@ -31,7 +31,7 @@ KERNEL_DEVICETREE_ti33x = "am335x-evm.dtb am335x-evmsk.dtb am335x-bone.dtb am335
 KERNEL_DEVICETREE_ti43x = "am43x-epos-evm.dtb am43x-epos-evm-hdmi.dtb am437x-gp-evm.dtb am437x-gp-evm-hdmi.dtb am437x-sk-evm.dtb"
 KERNEL_DEVICETREE_beaglebone = "am335x-bone.dtb am335x-boneblack.dtb"
 KERNEL_DEVICETREE_omap5-evm = "omap5-uevm.dtb"
-KERNEL_DEVICETREE_dra7xx = "dra7-evm.dtb dra7-evm-lcd10.dtb dra72-evm.dtb dra72-evm-lcd10.dtb am57xx-beagle-x15.dtb am57xx-evm.dtb"
+KERNEL_DEVICETREE_dra7xx-evm = "dra7-evm.dtb dra7-evm-lcd10.dtb dra72-evm.dtb dra72-evm-lcd10.dtb"
 KERNEL_DEVICETREE_am57xx-evm = "am57xx-beagle-x15.dtb am57xx-evm.dtb"
 KERNEL_DEVICETREE_omap3 = "omap3-beagle.dtb omap3-beagle-xm.dtb omap3-evm.dtb omap3-evm-37xx.dtb am3517-evm.dtb"
 KERNEL_DEVICETREE_am3517-evm = "am3517-evm.dtb"
@@ -46,11 +46,11 @@ S = "${WORKDIR}/git"
 
 BRANCH = "ti-linux-3.14.y"
 
-SRCREV = "1da51aba787fd40cf6d0ce7fd35b6757e13a1d4f"
-PV = "3.14.43+git${SRCPV}"
+SRCREV = "e9cd4cc81906de385f1b04708860bb3142ea601a"
+PV = "3.14.49+git${SRCPV}"
 
 # Append to the MACHINE_KERNEL_PR so that a new SRCREV will cause a rebuild
-MACHINE_KERNEL_PR_append = "c"
+MACHINE_KERNEL_PR_append = "a"
 PR = "${MACHINE_KERNEL_PR}"
 
 KERNEL_CONFIG_DIR = "${S}/ti_config_fragments"

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

@@ -0,0 +1,75 @@
+SECTION = "kernel"
+DESCRIPTION = "Linux kernel for TI devices"
+LICENSE = "GPLv2"
+LIC_FILES_CHKSUM = "file://COPYING;md5=d7810fab7487fb0aad327b76f1be7cd7"
+
+inherit kernel
+
+require recipes-kernel/linux/linux-dtb.inc
+require recipes-kernel/linux/setup-defconfig.inc
+require recipes-kernel/linux/multi-kernel.inc
+require recipes-kernel/linux/cmem.inc
+
+# Look in the generic major.minor directory for files
+FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}-4.1:"
+
+# Pull in the devicetree files into the rootfs
+RDEPENDS_kernel-base += "kernel-devicetree"
+
+# Add a run-time dependency for the PM firmware to be installed
+# on the target file system.
+RDEPENDS_kernel-base_append_ti33x = " amx3-cm3"
+RDEPENDS_kernel-base_append_ti43x = " amx3-cm3"
+
+# Add a run-time dependency for the VPE VPDMA firmware to be installed
+# on the target file system.
+RDEPENDS_kernel-base_append_dra7xx = " vpdma-fw"
+
+# Install boot-monitor skern file into /boot dir of rootfs
+RDEPENDS_kernel-base_append_keystone = " boot-monitor"
+
+# Default is to package all dtb files for ti33x devices unless building
+# for the specific beaglebone machine.
+KERNEL_DEVICETREE_ti33x = "am335x-evm.dtb am335x-evmsk.dtb am335x-bone.dtb am335x-boneblack.dtb"
+KERNEL_DEVICETREE_ti43x = "am43x-epos-evm.dtb am43x-epos-evm-hdmi.dtb am437x-gp-evm.dtb am437x-gp-evm-hdmi.dtb am437x-sk-evm.dtb"
+KERNEL_DEVICETREE_beaglebone = "am335x-bone.dtb am335x-boneblack.dtb"
+KERNEL_DEVICETREE_omap5-evm = "omap5-uevm.dtb"
+KERNEL_DEVICETREE_dra7xx-evm = "dra7-evm.dtb dra7-evm-lcd-lg.dtb dra7-evm-lcd-osd.dtb dra72-evm.dtb dra72-evm-lcd-lg.dtb dra72-evm-lcd-osd.dtb"
+KERNEL_DEVICETREE_am57xx-evm = "am57xx-beagle-x15.dtb am57xx-evm.dtb"
+KERNEL_DEVICETREE_omap3 = "omap3-beagle.dtb omap3-beagle-xm.dtb omap3-evm.dtb omap3-evm-37xx.dtb am3517-evm.dtb"
+KERNEL_DEVICETREE_am3517-evm = "am3517-evm.dtb"
+KERNEL_DEVICETREE_am37x-evm = "omap3-evm-37xx.dtb"
+KERNEL_DEVICETREE_beagleboard = "omap3-beagle.dtb omap3-beagle-xm.dtb"
+KERNEL_DEVICETREE_pandaboard = "omap4-panda.dtb omap4-panda-es.dtb"
+KERNEL_DEVICETREE_k2hk-evm = "k2hk-evm.dtb"
+KERNEL_DEVICETREE_k2e-evm = "k2e-evm.dtb"
+KERNEL_DEVICETREE_k2l-evm = "k2l-evm.dtb"
+
+KERNEL_EXTRA_ARGS += "LOADADDR=${UBOOT_ENTRYPOINT}"
+
+COMPATIBLE_MACHINE = "ti33x|ti43x|omap-a15|omap3|omap4|keystone"
+
+S = "${WORKDIR}/git"
+
+BRANCH = "ti-lsk-linux-4.1.y"
+
+SRCREV = "6d77561dd0c6b18bd5e9abf45dc215b84ebe338f"
+PV = "4.1.6+git${SRCPV}"
+
+# Append to the MACHINE_KERNEL_PR so that a new SRCREV will cause a rebuild
+MACHINE_KERNEL_PR_append = "m"
+PR = "${MACHINE_KERNEL_PR}"
+
+KERNEL_CONFIG_DIR = "${S}/ti_config_fragments"
+
+# SoC specific config fragments are not enabled yet
+KERNEL_CONFIG_FRAGMENTS_append_ti33x = " ${KERNEL_CONFIG_DIR}/am33xx_only.cfg"
+KERNEL_CONFIG_FRAGMENTS_append_ti43x = " ${KERNEL_CONFIG_DIR}/am43xx_only.cfg"
+KERNEL_CONFIG_FRAGMENTS_append_dra7xx = " ${KERNEL_CONFIG_DIR}/dra7_only.cfg"
+
+MULTI_CONFIG_BASE_SUFFIX = ""
+
+KERNEL_GIT_URI = "git://git.ti.com/ti-linux-kernel/ti-linux-kernel.git"
+KERNEL_GIT_PROTOCOL = "git"
+SRC_URI += "${KERNEL_GIT_URI};protocol=${KERNEL_GIT_PROTOCOL};branch=${BRANCH} \
+            file://defconfig"

recipes-ti/bios/ti-sysbios.inc

@@ -19,3 +19,7 @@ do_install() {
     cp -pPrf ${S}/* ${D}${SYSBIOS_INSTALL_DIR_RECIPE}
 }
 
+ALLOW_EMPTY_${PN} = "1"
+FILES_${PN}-dev += "${SYSBIOS_INSTALL_DIR_RECIPE}"
+
+INSANE_SKIP_${PN}-dev = "arch ldflags staticdev"

recipes-ti/bios/ti-sysbios_6.41.02.41.bb

@@ -1,14 +0,0 @@
-require ti-sysbios.inc
-
-PV = "6_41_02_41"
-PR = "r0"
-
-LIC_FILES_CHKSUM = "file://bios_${PV}_manifest.html;md5=a4af75ec6d586c5267c71075eebff418"
-
-SRC_URI[sysbiosbin.md5sum] = "65deff27110c2af87a3c71fea3c0345e"
-SRC_URI[sysbiosbin.sha256sum] = "2c47b4a3aa9513d10e5811a8ac7ed1d6ce3d13df57a0bffe10d8cabaf228c76f"
-
-TI_BIN_UNPK_CMDS=""
-TI_BIN_UNPK_ARGS = "--mode unattended --prefix ${WORKDIR}"
-
-INSANE_SKIP_${PN} = "installed-vs-shipped"

recipes-ti/bios/ti-sysbios_6.42.02.29.bb

@@ -0,0 +1,12 @@
+require ti-sysbios.inc
+
+PV = "6_42_02_29"
+PR = "r0"
+
+LIC_FILES_CHKSUM = "file://bios_${PV}_manifest.html;md5=ab905941085d55ea207fcb4cdab4f9c3"
+
+SRC_URI[sysbiosbin.md5sum] = "ba470b69d1ffa4a34fd05645f240216c"
+SRC_URI[sysbiosbin.sha256sum] = "eb070642e8ee8e742525599f53ef1547d6f5dded557987550c710ad193d0de31"
+
+TI_BIN_UNPK_CMDS=""
+TI_BIN_UNPK_ARGS = "--mode unattended --prefix ${WORKDIR}"

recipes-ti/codec-engine/ti-codec-engine_3.24.00.08.bb

@@ -0,0 +1,29 @@
+DESCRIPTION = "Codec Engine for TI ARM/DSP processors"
+HOMEPAGE = "http://software-dl.ti.com/dsps/dsps_public_sw/sdo_sb/targetcontent/ce"
+SECTION = "devel"
+LICENSE = "BSD"
+
+require recipes-ti/includes/ti-paths.inc
+require recipes-ti/includes/ti-staging.inc
+
+PV = "3_24_00_08"
+PR = "r0"
+
+LIC_FILES_CHKSUM = "file://codec_engine_${PV}_Manifest.html;md5=de7d9c2594a6f3868e42a33b6a748ce7"
+
+SRC_URI[cetarball.md5sum] = "d66a8ccbd6cdfe9f735af9f4a07e2b9b"
+SRC_URI[cetarball.sha256sum] = "ed7b7399903bbf76af06ee6457836f344ad75b903618339bae82b3967f27ffa1"
+
+S = "${WORKDIR}/codec_engine_${PV}"
+
+SRC_URI = "http://software-dl.ti.com/dsps/dsps_public_sw/sdo_sb/targetcontent/ce/${PV}/exports/codec_engine_${PV},lite.tar.gz;name=cetarball "
+
+do_install() {
+
+        # Install/Stage the Source Tree
+        install -d ${D}${CE_INSTALL_DIR_RECIPE}
+        cp -pPrf ${S}/* ${D}${CE_INSTALL_DIR_RECIPE}
+}
+
+ALLOW_EMPTY_${PN} = "1"
+FILES_${PN}-dev += "${CE_INSTALL_DIR_RECIPE}"

recipes-ti/devtools/ti-cgt6x_8.0.3.bb

@@ -6,7 +6,6 @@ LIC_FILES_CHKSUM = "file://ti-cgt-c6000_${PV}/LICENSE.txt;md5=b6311962635a4f1563
 LIC_FILES_CHKSUM_class-target = "file://usr/share/doc/ti/cgt-c6x/LICENSE.txt;md5=b6311962635a4f15630e36ec2d875eca"
 
 PE = "1"
-PR = "r1"
 
 require ../includes/ti-unpack.inc
 
@@ -36,13 +35,13 @@ TI_BIN_UNPK_CMDS = ""
 BINFILE_class-target = "ti_cgt_c6000_${PV}_armlinuxa8hf_busybox_installer.sh"
 BINFILE_NAME_class-target = "cgt6x_arm_installer"
 
-SRC_URI = "http://software-dl.ti.com/codegen/esd/cgt_public_sw/C6000/Production/${PV}/${BINFILE};name=${BINFILE_NAME}"
+SRC_URI = "http://software-dl.ti.com/codegen/esd/cgt_public_sw/C6000/${PV}/${BINFILE};name=${BINFILE_NAME}"
 
-SRC_URI[cgt6x_x86_installer.md5sum] = "ff83845672090bf0a669bba7b0cadf56"
-SRC_URI[cgt6x_x86_installer.sha256sum] = "297f77a00b211b3c4afa23afe7319e98b2400b5d2eb0f8c8cfe3ef7d7aa4d709"
+SRC_URI[cgt6x_x86_installer.md5sum] = "cac177c3b94bf308d5198230739639b4"
+SRC_URI[cgt6x_x86_installer.sha256sum] = "9c9ebab9f29cfd55f7df1df888ede66da3c2ccc0440d602ef34564305f02b9fb"
 
-SRC_URI[cgt6x_arm_installer.md5sum] = "13961e5a1da4c310ea8c8707ab981fff"
-SRC_URI[cgt6x_arm_installer.sha256sum] = "cb24ae05baffbd44d6dedba68743be09fd883e04403e069c437c486533d8fffb"
+SRC_URI[cgt6x_arm_installer.md5sum] = "7966f5ad2f055c3462ac6c3c13453ed7"
+SRC_URI[cgt6x_arm_installer.sha256sum] = "f435f886610fc7df585a6ef898494e621b3bfa17f20658436f5e63af86a9a987"
 
 do_install() {
     install -d ${D}${bindir}
@@ -110,4 +109,6 @@ FILES_${PN} += "${datadir}/ti/*"
 
 FILES_${PN}-dbg += "${datadir}/ti/cgt-c6x/bin/.debug"
 
+INSANE_SKIP_${PN} += "staticdev"
+
 BBCLASSEXTEND = "native nativesdk"

recipes-ti/devtools/ti-xdctools-common.inc

@@ -0,0 +1,54 @@
+DESCRIPTION = "TI XDCtools (RTSC - Real Time Software Components - http://rtsc.eclipse.org)"
+HOMEPAGE = "http://software-dl.ti.com/dsps/dsps_public_sw/sdo_sb/targetcontent/rtsc"
+SECTION = "devel"
+LICENSE = "BSD & GPLv2"
+
+require recipes-ti/includes/ti-paths.inc
+require recipes-ti/includes/ti-staging.inc
+
+do_install() {
+    install -d ${D}${XDC_INSTALL_DIR_RECIPE}
+    cp -pPrf ${S}/* ${D}${XDC_INSTALL_DIR_RECIPE}
+}
+
+INSANE_SKIP_${PN} = "installed-vs-shipped"
+
+# Prevent internal libs from getting picked up
+PRIVATE_LIBS = " \
+libncdb.so \
+libcdb.so \
+libjavaplugin_oji.so \
+libjavaplugin_jni.so \
+libjsound.so \
+libinstrument.so \
+libjawt.so \
+libzip.so \
+libjava_crw_demo.so \
+libjavaplugin_nscp_gcc29.so \
+libhprof.so \
+libcmm.so \
+libjdwp.so \
+libmlib_image.so \
+libjpeg.so \
+libverify.so \
+libjavaplugin_nscp.so \
+libmanagement.so \
+libunpack.so \
+librmi.so \
+libJdbcOdbc.so \
+libawt.so \
+libnet.so \
+libjaas_unix.so \
+libnio.so \
+libdcpr.so \
+libioser12.so \
+libjsoundalsa.so \
+libjava.so \
+libfontmanager.so \
+libdt_socket.so \
+libmawt.so \
+libjvm.so \
+libhpi.so \
+lib.so \
+libcairo.so.2 \
+"

recipes-ti/devtools/ti-xdctools-core.inc

@@ -0,0 +1,5 @@
+require ti-xdctools-common.inc
+
+S = "${WORKDIR}/xdctools_${PV}_core"
+
+SRC_URI = "http://software-dl.ti.com/dsps/dsps_public_sw/sdo_sb/targetcontent/rtsc/${PV}/exports/xdccore/xdctools_${PV}_core_linux.zip;name=xdczip"

recipes-ti/devtools/ti-xdctools.inc

@@ -1,10 +1,4 @@
-DESCRIPTION = "TI XDCtools (RTSC - Real Time Software Components - http://rtsc.eclipse.org)"
-HOMEPAGE = "http://software-dl.ti.com/dsps/dsps_public_sw/sdo_sb/targetcontent/rtsc"
-SECTION = "devel"
-LICENSE = "BSD & GPLv2"
-
-require ../includes/ti-paths.inc
-require ../includes/ti-staging.inc
+require ti-xdctools-common.inc
 require ../includes/ti-eula-unpack.inc
 
 S = "${WORKDIR}/xdctools_${PV}"
@@ -14,49 +8,3 @@ SRC_URI = "http://software-dl.ti.com/dsps/dsps_public_sw/sdo_sb/targetcontent/rt
 BINFILE="xdctools_setuplinux_${PV}.bin"
 TI_BIN_UNPK_CMDS="Y:workdir:Y"
 TI_BIN_UNPK_WDEXT="/ti"
-
-do_install() {
-    install -d ${D}${XDC_INSTALL_DIR_RECIPE}
-    cp -pPrf ${S}/* ${D}${XDC_INSTALL_DIR_RECIPE}
-}
-
-# Prevent internal libs from getting picked up
-PRIVATE_LIBS = " \
-libncdb.so \
-libcdb.so \
-libjavaplugin_oji.so \
-libjavaplugin_jni.so \
-libjsound.so \
-libinstrument.so \
-libjawt.so \
-libzip.so \
-libjava_crw_demo.so \
-libjavaplugin_nscp_gcc29.so \
-libhprof.so \
-libcmm.so \
-libjdwp.so \
-libmlib_image.so \
-libjpeg.so \
-libverify.so \
-libjavaplugin_nscp.so \
-libmanagement.so \
-libunpack.so \
-librmi.so \
-libJdbcOdbc.so \
-libawt.so \
-libnet.so \
-libjaas_unix.so \
-libnio.so \
-libdcpr.so \
-libioser12.so \
-libjsoundalsa.so \
-libjava.so \
-libfontmanager.so \
-libdt_socket.so \
-libmawt.so \
-libjvm.so \
-libhpi.so \
-lib.so \
-libcairo.so.2 \
-"
-

recipes-ti/devtools/ti-xdctools_3.31.02.38.bb

@@ -0,0 +1,9 @@
+require ti-xdctools-core.inc
+
+PV = "3_31_02_38"
+PR = "r0"
+
+LIC_FILES_CHKSUM = "file://docs/license/xdc/shelf/package.html;md5=9dbb0095cdb8b35508b344aa4f1de333"
+
+SRC_URI[xdczip.md5sum] = "c76b3d90c3e25d199765557e393d165b"
+SRC_URI[xdczip.sha256sum] = "c0e1f6911f2294bfb76471fac1a0ceac3e89c7eb1300f84d2571bf78cb62a7d2"

recipes-ti/framework-components/ti-framework-components.inc

@@ -3,13 +3,9 @@ HOMEPAGE = "http://software-dl.ti.com/dsps/dsps_public_sw/sdo_sb/targetcontent/f
 SECTION = "devel"
 LICENSE = "BSD"
 
-LIC_FILES_CHKSUM = "file://framework_components_2_26_00_01_manifest.html;md5=3250f9da7ee72284c07f8dd840400c75"
-
 require recipes-ti/includes/ti-paths.inc
 require recipes-ti/includes/ti-staging.inc
 
-PR = "r1"
-
 S = "${WORKDIR}/framework_components_${PV}"
 
 SRC_URI = "http://software-dl.ti.com/dsps/dsps_public_sw/sdo_sb/targetcontent/fc/${PV}/exports/framework_components_${PV},lite.tar.gz;name=fctarball"
@@ -19,3 +15,7 @@ do_install() {
     cp -pPrf ${S}/* ${D}${FC_INSTALL_DIR_RECIPE}
 }
 
+INSANE_SKIP_${PN} = "ldflags"
+
+ALLOW_EMPTY_${PN} = "1"
+FILES_${PN}-dev += "${FC_INSTALL_DIR_RECIPE}"

recipes-ti/framework-components/ti-framework-components_2.26.00.01.bb

@@ -1,8 +1,9 @@
 require ti-framework-components.inc
 
 PV = "2_26_00_01"
+PR = "r2"
+
+LIC_FILES_CHKSUM = "file://framework_components_2_26_00_01_manifest.html;md5=3250f9da7ee72284c07f8dd840400c75"
 
 SRC_URI[fctarball.md5sum] = "40b51cade2f9ae6e6f6dca73c17065af"
 SRC_URI[fctarball.sha256sum] = "3f7a12a51dfe87310828a31518d7ef8f9039e59269c0ca24f74a68433c235048"
-
-INSANE_SKIP_${PN} = "installed-vs-shipped"

recipes-ti/framework-components/ti-framework-components_3.40.01.04.bb

@@ -0,0 +1,9 @@
+require ti-framework-components.inc
+
+PV = "3_40_01_04"
+PR = "r0"
+
+LIC_FILES_CHKSUM = "file://framework_components_${PV}_Manifest.html;md5=806c3e4afd3bfbf7e5dc400ed1a0cc3c"
+
+SRC_URI[fctarball.md5sum] = "0e6b61cb6e1ad8b249d64f041c872192"
+SRC_URI[fctarball.sha256sum] = "eb38002092a7fc8f704fe9ea9de7f29108bc2533ba95f184706b2936dd24711c"

recipes-ti/includes/ti-paths.inc

@@ -43,6 +43,8 @@ export UIA_INSTALL_DIR_RECIPE        = "${installdir}/ti-uia-tree"
 export VICPLIB_INSTALL_DIR_RECIPE    = "${installdir}/ti-vicplib-tree"
 export XDAIS_INSTALL_DIR_RECIPE      = "${installdir}/ti-xdais-tree"
 export XDC_INSTALL_DIR_RECIPE        = "${installdir}/ti-xdctools-tree"
+export PDK_INSTALL_DIR_RECIPE        = "${installdir}/ti-pdk-tree"
+export OSAL_INSTALL_DIR_RECIPE       = "${installdir}/ti-osal-tree"
 
 # This is where the tools will end up in sysroot
 export BIOS_INSTALL_DIR       = "${STAGING_DIR_TARGET}${BIOS_INSTALL_DIR_RECIPE}"
@@ -76,10 +78,11 @@ export SYSLINK_INSTALL_DIR    = "${STAGING_DIR_TARGET}${SYSLINK_INSTALL_DIR_RECI
 export UIA_INSTALL_DIR        = "${STAGING_DIR_TARGET}${UIA_INSTALL_DIR_RECIPE}"
 export XDAIS_INSTALL_DIR      = "${STAGING_DIR_TARGET}${XDAIS_INSTALL_DIR_RECIPE}"
 export XDC_INSTALL_DIR        = "${STAGING_DIR_TARGET}${XDC_INSTALL_DIR_RECIPE}"
+export PDK_INSTALL_DIR        = "${STAGING_DIR_TARGET}${PDK_INSTALL_DIR_RECIPE}"
+export OSAL_INSTALL_DIR       = "${STAGING_DIR_TARGET}${OSAL_INSTALL_DIR_RECIPE}"
 
 DSPSUFFIX_omapl137 = "x674"
 DSPSUFFIX_omapl138 = "x674"
 DSPSUFFIX_ti816x = "xe674"
 DSPSUFFIX_ti814x = "xe674"
 DSPSUFFIX ?= "x64P"
-

recipes-ti/ipc/ti-ipc-rtos.inc

@@ -0,0 +1,19 @@
+DESCRIPTION = "TI Inter Process Communication (IPC) Mechanisms (for Uni- and Multi- Processor Configurations)"
+HOMEPAGE="http://processors.wiki.ti.com/index.php/Category:IPC"
+
+LICENSE = "BSD"
+
+require recipes-ti/includes/ti-paths.inc
+require recipes-ti/includes/ti-staging.inc
+
+SRC_URI = "http://software-dl.ti.com/dsps/dsps_public_sw/sdo_sb/targetcontent/ipc/${PV}/exports/ipc_${PV}.zip;name=ipczip"
+
+S = "${WORKDIR}/ipc_${PV}"
+
+do_install() {
+    install -d ${D}${IPC_INSTALL_DIR_RECIPE}
+    cp -pPrf ${S}/* ${D}${IPC_INSTALL_DIR_RECIPE}
+}
+
+ALLOW_EMPTY_${PN} = "1"
+FILES_${PN}-dev += "${IPC_INSTALL_DIR_RECIPE}"

recipes-ti/ipc/ti-ipc-rtos_3.40.01.08.bb

@@ -0,0 +1,9 @@
+require ti-ipc-rtos.inc
+
+PV = "3_40_01_08"
+PR = "r0"
+
+LIC_FILES_CHKSUM = "file://${S}/ipc-linux.mak;beginline=1;endline=30;md5=7b327f9b710fd7c95e545b91cec79255"
+
+SRC_URI[ipczip.md5sum] = "738e1d54da9fab94899ad162f1ad78de"
+SRC_URI[ipczip.sha256sum] = "8cc7d40ad7eab916eae109b355dc7e7876c6ab82e3b40bf5b6bf60474312d6cf"

recipes-ti/ipc/ti-ipc/0001-Add-kernel-build-dir.patch

@@ -0,0 +1,114 @@
+From f1e89940a3fbc0ffec51640f909f87419c08a17e Mon Sep 17 00:00:00 2001
+From: Denys Dmytriyenko <denys@ti.com>
+Date: Mon, 27 Jul 2015 11:51:52 -0400
+Subject: [PATCH] Add kernel build dir
+
+We build kernel outside of the source directory and the generated version.h
+file ends up being in a separate directory from the rest of kernel headers.
+Use another variable to point to the kernel build artifacts.
+
+Signed-off-by: Denys Dmytriyenko <denys@ti.com>
+---
+ configure.ac               | 6 ++++++
+ ipc-linux.mak              | 3 +++
+ linux/src/mm/Makefile.am   | 2 +-
+ packages/ti/ipc/mm/MmRpc.c | 4 ++++
+ 4 files changed, 14 insertions(+), 1 deletion(-)
+
+diff --git a/configure.ac b/configure.ac
+index e6cb19f..22f7db2 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -70,6 +70,7 @@ AC_SUBST([AM_LDFLAGS])
+ AC_ARG_VAR(PLATFORM, Platform to build. Options are: 'OMAPL138' 'OMAP54XX' '66AK2E' 'TCI6630' 'TCI6636' 'TCI6638' and 'DRA7XX'. If not defined all platforms will be built.)
+ AC_ARG_VAR(CMEM_INSTALL_DIR, Installation path directory to the CMEM libraries)
+ AC_ARG_VAR(KERNEL_INSTALL_DIR, Installation path to the Linux kernel.)
++AC_ARG_VAR(KERNEL_BUILD_DIR, Path to the Linux kernel build artifacts.)
+ AC_ARG_VAR(AF_RPMSG, Address Family used by the RPMSG driver)
+ AC_ARG_VAR(DRM_PREFIX, Installation location to the DRM library.)
+ 
+@@ -108,6 +109,7 @@ AS_IF([test "x$PLATFORM" = "x"], [CMEM_INSTALL_DIR=])
+ AC_SUBST([PLATFORM])
+ AC_SUBST([CMEM_INSTALL_DIR])
+ AC_SUBST([KERNEL_INSTALL_DIR])
++AC_SUBST([KERNEL_BUILD_DIR])
+ AC_SUBST([AF_RPMSG])
+ AC_SUBST([DRM_PREFIX])
+ 
+@@ -123,6 +125,7 @@ AM_CONDITIONAL([DRA7XX], [test "x$PLATFORM" = "xDRA7XX"])
+ AM_CONDITIONAL([CMEM], [test "x$CMEM_INSTALL_DIR" != "x"])
+ AM_CONDITIONAL([KDIR], [test "x$KERNEL_INSTALL_DIR" != "x"])
+ AM_CONDITIONAL([KERNEL_INSTALL_DIR], [test -n "$KERNEL_INSTALL_DIR"])
++AM_CONDITIONAL([KERNEL_BUILD_DIR], [test -n "$KERNEL_BUILD_DIR"])
+ AM_CONDITIONAL([DRM], [test "x$DRM_PREFIX" != "x"])
+ AM_CONDITIONAL([AF_RPMSG], [test -n "$AF_RPMSG"])
+ 
+@@ -153,6 +156,9 @@ You have configured to build for the '${PLATFORM}' platform
+ Your KERNEL installation directory is set to:
+     '${KERNEL_INSTALL_DIR}'
+ 
++Your KERNEL build artifacts directory is set to:
++    '${KERNEL_BUILD_DIR}'
++
+ Your DRM installation directory is set to:
+     '${DRM_PREFIX}'
+ 
+diff --git a/ipc-linux.mak b/ipc-linux.mak
+index 58a9cea..a174a9c 100644
+--- a/ipc-linux.mak
++++ b/ipc-linux.mak
+@@ -60,6 +60,7 @@ config:
+             PLATFORM=$(PLATFORM) \
+             CMEM_INSTALL_DIR=$(CMEM_INSTALL_DIR) \
+             KERNEL_INSTALL_DIR=$(KERNEL_INSTALL_DIR) \
++            KERNEL_BUILD_DIR=$(KERNEL_BUILD_DIR) \
+             DRM_PREFIX=$(DRM_PREFIX) \
+             AF_RPMSG=$(AF_RPMSG)
+ 
+@@ -72,6 +73,7 @@ config-static:
+             PLATFORM=$(PLATFORM) \
+             CMEM_INSTALL_DIR=$(CMEM_INSTALL_DIR) \
+             KERNEL_INSTALL_DIR=$(KERNEL_INSTALL_DIR) \
++            KERNEL_BUILD_DIR=$(KERNEL_BUILD_DIR) \
+             DRM_PREFIX=$(DRM_PREFIX) \
+             AF_RPMSG=$(AF_RPMSG)
+ 
+@@ -84,5 +86,6 @@ config-shared:
+             PLATFORM=$(PLATFORM) \
+             CMEM_INSTALL_DIR=$(CMEM_INSTALL_DIR) \
+             KERNEL_INSTALL_DIR=$(KERNEL_INSTALL_DIR) \
++            KERNEL_BUILD_DIR=$(KERNEL_BUILD_DIR) \
+             DRM_PREFIX=$(DRM_PREFIX) \
+             AF_RPMSG=$(AF_RPMSG)
+diff --git a/linux/src/mm/Makefile.am b/linux/src/mm/Makefile.am
+index 59aa312..436b432 100644
+--- a/linux/src/mm/Makefile.am
++++ b/linux/src/mm/Makefile.am
+@@ -32,7 +32,7 @@
+ ##
+ 
+ # additional include paths necessary to compile the library
+-AM_CFLAGS = -Wall @AM_CFLAGS@ -DKERNEL_INSTALL_DIR="$(KERNEL_INSTALL_DIR)"
++AM_CFLAGS = -Wall @AM_CFLAGS@ -DKERNEL_INSTALL_DIR="$(KERNEL_INSTALL_DIR)" -DKERNEL_BUILD_DIR="$(KERNEL_BUILD_DIR)"
+ 
+ ###############################################################################
+ # THE LIBRARIES TO BUILD
+diff --git a/packages/ti/ipc/mm/MmRpc.c b/packages/ti/ipc/mm/MmRpc.c
+index 09d6b05..78adfa8 100644
+--- a/packages/ti/ipc/mm/MmRpc.c
++++ b/packages/ti/ipc/mm/MmRpc.c
+@@ -56,7 +56,11 @@
+ #endif
+ 
+ #define linux_version_include(kd) <kd/include/generated/uapi/linux/version.h>
++#if defined(KERNEL_BUILD_DIR)
++#include linux_version_include(KERNEL_BUILD_DIR)
++#else
+ #include linux_version_include(KERNEL_INSTALL_DIR)
++#endif
+ 
+ #if LINUX_VERSION_CODE < KERNEL_VERSION(3,14,0)
+ #define linux_include(kd,m) <kd/include/linux/m.h>
+-- 
+2.2.0
+

recipes-ti/ipc/ti-ipc/tiipclad-daemon.sh

@@ -1,7 +1,7 @@
 #! /bin/sh
 
 tiipclad_daemon=/usr/bin/__LAD_DAEMON__
-tiipclad_params="-l lad.txt"
+tiipclad_params="-g -l lad.txt"
 
 test -x "$tiipclad_daemon" || exit 0
 

recipes-ti/ipc/ti-ipc_git.bb

@@ -6,14 +6,15 @@ LIC_FILES_CHKSUM = "file://${S}/ipc-linux.mak;beginline=1;endline=30;md5=7b327f9
 
 DEPENDS += "virtual/kernel"
 
-PV = "3.35.01.07"
+PV = "3.40.01.08"
 
-BRANCH = "master"
+BRANCH = "3.40"
 SRC_URI = "git://git.ti.com/ipc/ipcdev.git;protocol=git;branch=${BRANCH} \
            file://tiipclad-daemon.sh \
+           file://0001-Add-kernel-build-dir.patch \
            "
-# Commit corresponds to 3.35.01.07
-SRCREV = "358d966c9f5973faf9ab71fb1d7dfe5d3e08a8dc"
+# Commit corresponds to 3.40.01.08
+SRCREV = "239354b731b77e30a70230ebb54a31a83fc8b12f"
 
 S = "${WORKDIR}/git"
 
@@ -33,14 +34,15 @@ DAEMON_k2hk-evm = "lad_tci6638"
 DAEMON_k2l-evm = "lad_tci6630"
 DAEMON_k2e-evm = "lad_66ak2e"
 
-inherit autotools pkgconfig update-rc.d
+inherit autotools-brokensep pkgconfig update-rc.d
 
 INITSCRIPT_NAME = "tiipclad-daemon.sh"
 INITSCRIPT_PARAMS = "defaults 10"
 
-EXTRA_OECONF += "PLATFORM=${PLATFORM} KERNEL_INSTALL_DIR=${STAGING_KERNEL_DIR}"
+EXTRA_OECONF += "PLATFORM=${PLATFORM} KERNEL_INSTALL_DIR=${STAGING_KERNEL_DIR} KERNEL_BUILD_DIR=${STAGING_KERNEL_BUILDDIR}"
 
 do_configure() {
+    ( cd ${S}; autoreconf -f -i -s )
     oe_runconf
 }
 

recipes-ti/osal/ti-osal.inc

@@ -0,0 +1,21 @@
+DESCRIPTION = "TI Operating System Abstraction Library (OSAL)"
+HOMEPAGE = "http://software-dl.ti.com/dsps/dsps_public_sw/sdo_sb/targetcontent/osal"
+LICENSE = "BSD & EPL"
+SECTION = "devel"
+
+require ../includes/ti-paths.inc
+require ../includes/ti-staging.inc
+
+S = "${WORKDIR}/osal_${PV}"
+
+SRC_URI = "http://software-dl.ti.com/dsps/dsps_public_sw/sdo_sb/targetcontent/osal/${PV}/exports/osal_${PV}.tar.gz;name=osaltarball"
+
+do_install() {
+    install -d ${D}${OSAL_INSTALL_DIR_RECIPE}
+    cp -pPrf ${S}/* ${D}${OSAL_INSTALL_DIR_RECIPE}
+}
+
+INSANE_SKIP_${PN}-dev = "staticdev"
+
+ALLOW_EMPTY_${PN} = "1"
+FILES_${PN}-dev += "${OSAL_INSTALL_DIR_RECIPE}"

recipes-ti/osal/ti-osal_1.24.00.09.bb

@@ -0,0 +1,9 @@
+require ti-osal.inc
+
+PV = "1_24_00_09"
+PR = "r0"
+
+LIC_FILES_CHKSUM = "file://osal_${PV}_Manifest.html;md5=c110191994d011cee4cd02189ed3c9f4"
+
+SRC_URI[osaltarball.md5sum] = "a7ea85447fa0ff0f786d527a52fa6e8b"
+SRC_URI[osaltarball.sha256sum] = "d14f1f43c8a7965e86add69bd813cea56ea7e38abeb55de3fdcdaf4a69f19bf3"

recipes-ti/ti-softhsmv2/ti-softhsmv2_git.bb

@@ -7,7 +7,7 @@ mntdir = "/mnt"
 
 inherit autotools pkgconfig
 
-DEPENDS = "openssl libdaemon"
+DEPENDS = "openssl libdaemon zlib"
 COMPATIBLE_MACHINE = "(tci6614-evm|keystone)"
 
 BRANCH="master"
@@ -15,12 +15,15 @@ SRC_URI = "git://git.ti.com/keystone-linux/ti-softhsmv2.git;protocol=git;branch=
 #Following commit corresponds to tag DEV.SOFTHSM-01.03.00.01
 SRCREV = "c79d93ac2a326567a7245dda1b903ef340b5650c"
 PV = "1.3.0.1"
+PR = "r1"
 
 S = "${WORKDIR}/git"
 
 CFLAGS += " -mno-unaligned-access"
 CPPFLAGS += " -mno-unaligned-access"
 
+EXTRA_OECONF += "--with-zlib=${STAGING_DIR_HOST}/usr"
+
 INITSCRIPT_NAME = "softhsm-daemon.sh"
 INITSCRIPT_PARAMS = "defaults 10"
 

recipes-ti/xdais/ti-xdais.inc

@@ -14,3 +14,8 @@ do_install() {
     install -d ${D}${XDAIS_INSTALL_DIR_RECIPE}
     cp -pPrf ${S}/* ${D}${XDAIS_INSTALL_DIR_RECIPE}
 }
+
+INSANE_SKIP_${PN}-dev = "arch"
+
+ALLOW_EMPTY_${PN} = "1"
+FILES_${PN}-dev += "${XDAIS_INSTALL_DIR_RECIPE}"

recipes-ti/xdais/ti-xdais_7.24.00.04.bb

@@ -1,10 +1,9 @@
 require ti-xdais.inc
 
 PV = "7_24_00_04"
+PR = "r1"
 
 LIC_FILES_CHKSUM = "file://xdais_7_24_00_04_Manifest.html;md5=fd16442230745f0877cfe1c622669fd6"
 
 SRC_URI[xdaistarball.md5sum] = "f7514085b531f2ae49b37b30194e4989"
 SRC_URI[xdaistarball.sha256sum] = "79fd30377ab4c497292aeefb0565f81703d9020d1242b02ca9968c561e0de9a1"
-
-INSANE_SKIP_${PN} = "installed-vs-shipped"