uboot-ti-staging: update to ti2017.00-rc6 tag

Signed-off-by: Dan Murphy <dmurphy@ti.com>
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: morty
 
 
 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

@@ -0,0 +1,101 @@
+require recipes-ti/includes/ti-paths.inc
+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 ti-cgt6x-native ti-pdk-build-rtos"
+
+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
+    grep '^package' ${S}/package.xdc | sed -e 's|\[.*$||' | awk '{ print $2 }' | sed -e 's|\.|/|g'
+  else
+    echo ${S}
+    return 1
+  fi
+}
+
+export CROSS_TOOL_PRFX="arm-none-eabi-"
+export TOOLCHAIN_PATH_A8 = "${GCC_ARM_NONE_TOOLCHAIN}"
+export TOOLCHAIN_PATH_A9 = "${GCC_ARM_NONE_TOOLCHAIN}"
+export TOOLCHAIN_PATH_A15 = "${GCC_ARM_NONE_TOOLCHAIN}"
+export TOOLCHAIN_PATH_M4 = "${M4_TOOLCHAIN_INSTALL_DIR}"
+export C6X_GEN_INSTALL_PATH = "${STAGING_DIR_NATIVE}/usr/share/ti/cgt-c6x"
+
+export ROOTDIR = "${B}"
+export BIOS_INSTALL_PATH = "${SYSBIOS_INSTALL_DIR}"
+export XDC_INSTALL_PATH = "${XDC_INSTALL_DIR}"
+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() {
+    BUILD_DIR=${B}/`get_build_dir_bash`
+
+    mkdir -p ${BUILD_DIR}
+    cp -r ${S}/* ${BUILD_DIR}
+
+    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() {
+
+    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

@@ -9,3 +9,21 @@ BBFILE_PATTERN_meta-ti := "^${LAYERDIR}/"
 BBFILE_PRIORITY_meta-ti = "6"
 
 LICENSE_PATH += "${LAYERDIR}/licenses"
+
+LAYERDEPENDS_meta-ti = "core"
+
+SIGGEN_EXCLUDERECIPES_ABISAFE += " \
+    ti-sgx-ddk-km \
+    ti-sgx-ddk-um \
+    ti-ipc \
+    ti-ipc-rtos \
+    cmem-mod \
+    hplib-mod \
+    gdbserverproxy-module-drv \
+    debugss-module-drv \
+    uio-module-drv \
+    mpm-transport \
+    cppi-lld \
+    qmss-lld \
+    multiprocmgr \
+"

conf/machine/am180x-evm.conf

@@ -1,18 +0,0 @@
-#@TYPE: Machine
-#@NAME: AM180x CPUs on an AM180x EVM board
-#@DESCRIPTION: Machine configuration for the TI AM180x EVM board
-
-require conf/machine/include/davinci.inc
-require conf/machine/include/omapl138.inc
-
-UBOOT_MACHINE = "da850evm_config"
-UBOOT_ENTRYPOINT = "0xc0008000"
-UBOOT_LOADADDRESS = "0xc0008000"
-
-IMAGE_FSTYPES += "tar.gz"
-
-SERIAL_CONSOLE = "115200 ttyS2"
-
-PREFERRED_PROVIDER_virtual/kernel = "linux-omapl138-psp"
-PREFERRED_PROVIDER_virtual/bootloader = "u-boot-am180x"
-PREFERRED_PROVIDER_u-boot = "u-boot-am180x"

conf/machine/am335x-evm.conf

@@ -6,12 +6,15 @@ require conf/machine/include/ti33x.inc
 
 # Use built-in LCD by default
 XSERVER += "xf86-input-tslib"
-GUI_MACHINE_CLASS = "smallscreen"
+MACHINE_GUI_CLASS = "smallscreen"
 MACHINE_FEATURES += "touchscreen"
 
-IMAGE_FSTYPES += "ubi tar.gz"
+IMAGE_FSTYPES += "ubifs ubi tar.xz"
 
-SERIAL_CONSOLE = "115200 ttyO0"
+# Normally AM335 boards use ttyS0, but ICE uses ttyS3, so try both
+SERIAL_CONSOLE = ""
+SERIAL_CONSOLES = "115200;ttyS0 115200;ttyS3"
+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 +27,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 7000"
 
 # 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_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/am3517-evm.conf

@@ -6,19 +6,16 @@ require conf/machine/include/omap3.inc
 
 # Use built-in LCD by default
 XSERVER += "xf86-input-tslib"
-GUI_MACHINE_CLASS = "smallscreen"
+MACHINE_GUI_CLASS = "smallscreen"
 MACHINE_FEATURES += "touchscreen ethernet"
 
 IMAGE_FSTYPES += "ubi tar.gz"
 EXTRA_IMAGECMD_jffs2 = "-lnp -e 0x20000 -s 2048"
 
-SERIAL_CONSOLE = "115200 ttyO2"
+SERIAL_CONSOLE = "115200 ttyS2"
 USE_VT = "2"
 
-PREFERRED_PROVIDER_virtual/kernel = "linux-omap-psp"
-
-PREFERRED_PROVIDER_virtual/bootloader = "u-boot-am3517"
-PREFERRED_PROVIDER_u-boot = "u-boot-am3517"
+KERNEL_DEVICETREE = "am3517-evm.dtb"
 
 UBOOT_MACHINE = "am3517_evm_config"
 XLOAD_MACHINE = "am3517evm_config"

conf/machine/am37x-evm.conf

@@ -6,17 +6,15 @@ require conf/machine/include/omap3.inc
 
 # Use built-in LCD by default
 XSERVER += "xf86-input-tslib"
-GUI_MACHINE_CLASS = "smallscreen"
+MACHINE_GUI_CLASS = "smallscreen"
 MACHINE_FEATURES += "touchscreen ethernet"
 
 IMAGE_FSTYPES += "ubi tar.gz"
 EXTRA_IMAGECMD_jffs2 = "-lnp -e 0x20000 -s 2048"
 
-SERIAL_CONSOLE = "115200 ttyO0"
+KERNEL_DEVICETREE = "omap3-evm-37xx.dtb"
 
-PREFERRED_PROVIDER_virtual/kernel = "linux-omap-psp"
-PREFERRED_PROVIDER_virtual/bootloader = "u-boot-am37x"
-PREFERRED_PROVIDER_u-boot = "u-boot-am37x"
+SERIAL_CONSOLE = "115200 ttyS0"
 
 # NOTE: there are NAND and OneNAND versions of this board...
 # do ubiattach /dev/ubi_ctrl -m 4

conf/machine/am437x-evm.conf

@@ -6,12 +6,12 @@ require conf/machine/include/ti43x.inc
 
 # Use built-in LCD by default
 XSERVER += "xf86-input-tslib"
-GUI_MACHINE_CLASS = "smallscreen"
+MACHINE_GUI_CLASS = "smallscreen"
 MACHINE_FEATURES += "touchscreen"
 
-IMAGE_FSTYPES += "ubi tar.gz"
+IMAGE_FSTYPES += "ubifs ubi tar.xz"
 
-SERIAL_CONSOLE = "115200 ttyO0"
+SERIAL_CONSOLE = "115200 ttyS0"
 
 # 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 +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 4000"
 
 # do ubiattach /dev/ubi_ctrl -m 11 -O 4096
 # from dmesg:

conf/machine/am437x-hs-evm.conf

@@ -0,0 +1,14 @@
+#@TYPE: Machine
+#@NAME: AM437x HS EVM
+#@DESCRIPTION: Machine configuration for the TI AM437x HS EVM
+
+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

@@ -0,0 +1,39 @@
+#@TYPE: Machine
+#@NAME: AM57xx EVM
+#@DESCRIPTION: Machine configuration for the TI AM57xx EVM
+
+require conf/machine/include/dra7xx.inc
+
+MACHINE_FEATURES += "touchscreen"
+
+IMAGE_FSTYPES += "tar.xz"
+
+SERIAL_CONSOLE = "115200 ttyS2"
+
+KERNEL_DEVICETREE = "am57xx-beagle-x15.dtb am57xx-beagle-x15-revb1.dtb \
+                    am57xx-evm.dtb am57xx-evm-reva3.dtb \
+                    am571x-idk.dtb am571x-idk-lcd-osd101t2045.dtb am571x-idk-lcd-osd101t2587.dtb \
+                    am572x-idk.dtb am572x-idk-lcd-osd101t2045.dtb am572x-idk-lcd-osd101t2587.dtb"
+
+UBOOT_MACHINE = "am57xx_evm_config"
+
+# UBI information.  Note that this is board and kernel specific.  Changes
+# in your kernel port may require changes in these variables.  For more
+# details about this board please see
+# http://processors.wiki.ti.com/index.php/UBIFS_Support
+
+# do ubiattach /dev/ubi_ctrl -m 7 -O 2048
+# From dmesg:
+# UBI: smallest flash I/O unit:    2048
+# UBI: logical eraseblock size:    126976 bytes
+# from ubiattach stdout:
+# UBI device number 0, total 1988 LEBs
+MKUBIFS_ARGS = "-F -m 2048 -e 126976 -c 8192"
+
+# do ubiattach /dev/ubi_ctrl -m 7 -O 2048
+# from dmesg:
+# UBI: smallest flash I/O unit:    2048
+# UBI: physical eraseblock size:   131072 bytes (128 KiB)
+# UBI: sub-page size:              512
+# UBI: VID header offset:          2048 (aligned 2048)
+UBINIZE_ARGS = "-m 2048 -p 128KiB -s 512 -O 2048"

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/beagle-x15.conf

@@ -0,0 +1,36 @@
+#@TYPE: Machine
+#@NAME: BeagleBoard X15
+#@DESCRIPTION: Machine configuration for the BeagleBoard X15
+
+require conf/machine/include/dra7xx.inc
+
+MACHINE_GUI_CLASS = "bigscreen"
+
+IMAGE_FSTYPES += "tar.xz"
+
+SERIAL_CONSOLE = "115200 ttyS2"
+
+KERNEL_DEVICETREE = "am57xx-beagle-x15.dtb am57xx-beagle-x15-revb1.dtb"
+
+UBOOT_MACHINE = "am57xx_evm_config"
+
+# UBI information.  Note that this is board and kernel specific.  Changes
+# in your kernel port may require changes in these variables.  For more
+# details about this board please see
+# http://processors.wiki.ti.com/index.php/UBIFS_Support
+
+# do ubiattach /dev/ubi_ctrl -m 7 -O 2048
+# From dmesg:
+# UBI: smallest flash I/O unit:    2048
+# UBI: logical eraseblock size:    126976 bytes
+# from ubiattach stdout:
+# UBI device number 0, total 1988 LEBs
+MKUBIFS_ARGS = "-F -m 2048 -e 126976 -c 8192"
+
+# do ubiattach /dev/ubi_ctrl -m 7 -O 2048
+# from dmesg:
+# UBI: smallest flash I/O unit:    2048
+# UBI: physical eraseblock size:   131072 bytes (128 KiB)
+# UBI: sub-page size:              512
+# UBI: VID header offset:          2048 (aligned 2048)
+UBINIZE_ARGS = "-m 2048 -p 128KiB -s 512 -O 2048"

conf/machine/beagleboard.conf

@@ -5,16 +5,14 @@
 require conf/machine/include/omap3.inc
 
 # Only has DVI connector for external screen
-GUI_MACHINE_CLASS = "bigscreen"
-
-PREFERRED_PROVIDER_virtual/kernel = "linux-mainline"
-PREFERRED_PROVIDER_virtual/bootloader = "u-boot-beagleboard"
-PREFERRED_PROVIDER_u-boot = "u-boot-beagleboard"
+MACHINE_GUI_CLASS = "bigscreen"
 
 IMAGE_FSTYPES += "tar.gz ubi"
 EXTRA_IMAGECMD_jffs2 = "-lnp"
 
-SERIAL_CONSOLE = "115200 ttyO2"
+KERNEL_DEVICETREE = "omap3-beagle.dtb omap3-beagle-xm.dtb omap3-beagle-xm-ab.dtb"
+
+SERIAL_CONSOLE = "115200 ttyS2"
 
 UBOOT_MACHINE = "omap3_beagle_config"
 

conf/machine/beaglebone.conf

@@ -3,12 +3,19 @@
 #@DESCRIPTION: Machine configuration for the http://beagleboard.org/bone board 
 
 require conf/machine/include/ti33x.inc
+require conf/machine/include/beaglebone.inc
+
+KERNEL_DEVICETREE = "am335x-bone.dtb am335x-boneblack.dtb am335x-bonegreen.dtb"
 
 # Only has DVI connector for external screen
-GUI_MACHINE_CLASS = "bigscreen"
+MACHINE_GUI_CLASS = "bigscreen"
 
-IMAGE_FSTYPES += "tar.gz"
+WKS_FILE = "sdimage-bootpart.wks"
+IMAGE_BOOT_FILES = "MLO u-boot.img"
+IMAGE_FSTYPES += "tar.xz wic.xz"
 
-SERIAL_CONSOLE = "115200 ttyO0"
+SERIAL_CONSOLE = "115200 ttyS0"
 
-UBOOT_MACHINE = "am335x_evm_config"
+UBOOT_MACHINE = "am335x_boneblack_config"
+
+do_image_wic[depends] += "mtools-native:do_populate_sysroot dosfstools-native:do_populate_sysroot"

conf/machine/dra7xx-evm.conf

@@ -2,11 +2,18 @@
 #@NAME: DRA7xx EVM
 #@DESCRIPTION: Machine configuration for the TI DRA7xx EVM
 
-require conf/machine/include/omap-a15.inc
+require conf/machine/include/dra7xx.inc
 
-IMAGE_FSTYPES += "ubi tar.gz"
+MACHINE_FEATURES += "touchscreen"
 
-SERIAL_CONSOLE = "115200 ttyO0"
+IMAGE_FSTYPES += "tar.xz"
+
+SERIAL_CONSOLE = "115200 ttyS0"
+
+KERNEL_DEVICETREE = "dra7-evm.dtb dra7-evm-lcd-lg.dtb dra7-evm-lcd-osd101t2045.dtb dra7-evm-lcd-osd101t2587.dtb \
+                    dra72-evm.dtb dra72-evm-lcd-lg.dtb dra72-evm-lcd-osd101t2045.dtb dra72-evm-lcd-osd101t2587.dtb \
+                    dra72-evm-revc.dtb dra72-evm-revc-lcd-osd101t2045.dtb dra72-evm-revc-lcd-osd101t2587.dtb \
+                    dra71-evm.dtb dra71-evm-lcd-auo-g101evn01.0.dtb"
 
 UBOOT_MACHINE = "dra7xx_evm_config"
 
@@ -21,7 +28,7 @@ UBOOT_MACHINE = "dra7xx_evm_config"
 # UBI: logical eraseblock size:    126976 bytes
 # from ubiattach stdout:
 # UBI device number 0, total 1988 LEBs
-MKUBIFS_ARGS = "-F -m 2048 -e 126976 -c 3836"
+MKUBIFS_ARGS = "-F -m 2048 -e 126976 -c 8192"
 
 # do ubiattach /dev/ubi_ctrl -m 7 -O 2048
 # from dmesg:
@@ -30,7 +37,3 @@ MKUBIFS_ARGS = "-F -m 2048 -e 126976 -c 3836"
 # UBI: sub-page size:              512
 # UBI: VID header offset:          2048 (aligned 2048)
 UBINIZE_ARGS = "-m 2048 -p 128KiB -s 512 -O 2048"
-
-# Currently removing the sgx machine feature because there is no SGX package
-# available for omap5
-MACHINE_FEATURES = "kernel26 apm usbgadget usbhost vfat ext2 screen touchscreen"

conf/machine/dra7xx-hs-evm.conf

@@ -0,0 +1,18 @@
+#@TYPE: Machine
+#@NAME: DRA7xx HS EVM
+#@DESCRIPTION: Machine configuration for the TI DRA7xx HS EVM
+
+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/beaglebone.inc

@@ -0,0 +1,12 @@
+python () {
+    layers = bb.data.getVar("BBFILE_COLLECTIONS", d, 1)
+    if not layers:
+        return
+    if "yoctobsp" in layers:
+        bb.fatal("\nmeta-yocto-bsp has been detected in bblayers.conf, which provides basic reference BSP for beaglebone platform. " \
+                "\nSince meta-ti provides official comprehensive BSP for TI SoCs, including beaglebone, there could be potential conflicts " \
+                "\nbetween beaglebone machine definitions available in meta-yocto-bsp and meta-ti layers. It is recommended to remove " \
+                "\nor disable meta-yocto-bsp in bblayers.conf, when using meta-ti and building for beaglebone platform. Alternatively, " \
+                "\nit is possible to build for am335x-evm with meta-ti, which is a more generic platform for Sitara AM335x SoC and " \
+                "\nalso covers beaglebone variants.")
+}

conf/machine/include/davinci.inc

@@ -1,12 +1,13 @@
 require conf/machine/include/tune-arm926ejs.inc
 
 # Increase this everytime you change something in the kernel
-MACHINE_KERNEL_PR = "r53"
+MACHINE_KERNEL_PR = "r54"
 
-KERNEL_IMAGETYPE = "uImage"
+KERNEL_IMAGETYPE = "zImage"
 
-PREFERRED_PROVIDER_virtual/kernel = "linux-davinci"
-PREFERRED_PROVIDER_virtual/bootloader = "u-boot"
+PREFERRED_PROVIDER_virtual/kernel = "linux-ti-staging"
+PREFERRED_PROVIDER_virtual/bootloader = "u-boot-ti-staging"
+PREFERRED_PROVIDER_u-boot = "u-boot-ti-staging"
 
 UBOOT_MACHINE = "davinci_dvevm_config"
 

conf/machine/include/dra7xx.inc

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

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,21 +1,27 @@
 SOC_FAMILY = "keystone"
 require conf/machine/include/soc-family.inc
 
+DEFAULTTUNE ?= "armv7athf-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 = "r7"
+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"
 
-MACHINE_FEATURES = "kernel26 apm usbgadget usbhost vfat pci"
+MACHINE_FEATURES = "kernel26 apm usbgadget usbhost vfat pci dsp"
+MACHINE_FEATURES_BACKFILL_CONSIDERED = "rtc"

conf/machine/include/omap-a15.inc

@@ -1,16 +1,19 @@
 SOC_FAMILY = "omap-a15"
 require conf/machine/include/soc-family.inc
 
+DEFAULTTUNE ?= "armv7athf-neon"
 require conf/machine/include/tune-cortexa15.inc
 
 # Increase this everytime you change something in the kernel
-MACHINE_KERNEL_PR = "r3"
+MACHINE_KERNEL_PR = "r7"
 
 PREFERRED_PROVIDER_virtual/kernel = "linux-ti-staging"
 PREFERRED_PROVIDER_virtual/bootloader = "u-boot-ti-staging"
 PREFERRED_PROVIDER_u-boot = "u-boot-ti-staging"
 
 KERNEL_IMAGETYPE = "zImage"
+KERNEL_IMAGETYPES = "zImage uImage"
+KERNEL_CLASSES += "kernel-uimage"
 
 UBOOT_ARCH = "arm"
 UBOOT_ENTRYPOINT = "0x80008000"
@@ -23,8 +26,11 @@ XSERVER = "xserver-xorg \
            xf86-input-evdev \
            xf86-video-fbdev"
 
-GUI_MACHINE_CLASS = "smallscreen"
+MACHINE_GUI_CLASS = "smallscreen"
 
 # Use the expected value of the ubifs filesystem's volume name in the kernel
 # and u-boot.
 UBI_VOLNAME = "rootfs"
+
+# List common SoC features, may need to add touchscreen for specific machines
+MACHINE_FEATURES = "kernel26 apm usbgadget usbhost vfat ext2 screen alsa ethernet sgx mmip dsp"

conf/machine/include/omap3.inc

@@ -1,6 +1,7 @@
 SOC_FAMILY = "omap3"
 require conf/machine/include/soc-family.inc
 
+DEFAULTTUNE ?= "armv7athf-neon"
 require conf/machine/include/tune-cortexa8.inc
 
 PREFERRED_PROVIDER_virtual/xserver = "xserver-xorg"
@@ -13,16 +14,19 @@ XSERVER = "xserver-xorg \
            xf86-input-keyboard"
 
 # Default to external video, change to smallscreen for built-in LCD
-GUI_MACHINE_CLASS = "bigscreen"
+MACHINE_GUI_CLASS = "bigscreen"
 
 # Increase this everytime you change something in the kernel
-MACHINE_KERNEL_PR = "r125"
+MACHINE_KERNEL_PR = "r127"
 
-KERNEL_IMAGETYPE = "uImage"
+KERNEL_IMAGETYPE = "zImage"
 
 # Default providers, may need to override for specific machines
-PREFERRED_PROVIDER_virtual/kernel = "linux-omap"
-PREFERRED_PROVIDER_virtual/bootloader = "u-boot"
+PREFERRED_PROVIDER_virtual/kernel = "linux-ti-staging"
+PREFERRED_PROVIDER_virtual/bootloader = "u-boot-ti-staging"
+PREFERRED_PROVIDER_u-boot = "u-boot-ti-staging"
+
+KERNEL_DEVICETREE = "omap3-beagle.dtb omap3-beagle-xm.dtb omap3-beagle-xm-ab.dtb omap3-evm.dtb omap3-evm-37xx.dtb am3517-evm.dtb"
 
 UBOOT_ARCH = "arm"
 UBOOT_MACHINE = "omap3_evm_config"

conf/machine/include/omap4.inc

@@ -1,10 +1,12 @@
 SOC_FAMILY = "omap4"
 require conf/machine/include/soc-family.inc
 
+DEFAULTTUNE ?= "armv7athf-neon"
 require conf/machine/include/tune-cortexa9.inc
 
-PREFERRED_PROVIDER_virtual/kernel = "linux-omap4"
-PREFERRED_PROVIDER_virtual/bootloader = "u-boot"
+PREFERRED_PROVIDER_virtual/kernel = "linux-ti-staging"
+PREFERRED_PROVIDER_virtual/bootloader = "u-boot-ti-staging"
+PREFERRED_PROVIDER_u-boot = "u-boot-ti-staging"
 
 PREFERRED_PROVIDER_virtual/xserver = "xserver-xorg"
 XSERVER = "xserver-xorg \
@@ -13,9 +15,9 @@ XSERVER = "xserver-xorg \
            xf86-video-omap"
 
 # Increase this everytime you change something in the kernel
-MACHINE_KERNEL_PR = "r1"
+MACHINE_KERNEL_PR = "r4"
 
-KERNEL_IMAGETYPE = "uImage"
+KERNEL_IMAGETYPE = "zImage"
 
 UBOOT_MACHINE = "omap4_panda_config"
 

conf/machine/include/ti33x.inc

@@ -1,6 +1,7 @@
 SOC_FAMILY = "ti33x"
 require conf/machine/include/soc-family.inc
 
+DEFAULTTUNE ?= "armv7athf-neon"
 require conf/machine/include/tune-cortexa8.inc
 
 PREFERRED_PROVIDER_virtual/xserver = "xserver-xorg"
@@ -13,10 +14,10 @@ XSERVER = "xserver-xorg \
            xf86-input-keyboard"
 
 # Default to external video, change to smallscreen for built-in LCD
-GUI_MACHINE_CLASS = "bigscreen"
+MACHINE_GUI_CLASS = "bigscreen"
 
 # Increase this everytime you change something in the kernel
-MACHINE_KERNEL_PR = "r21"
+MACHINE_KERNEL_PR = "r22"
 
 # Default providers, may need to override for specific machines
 PREFERRED_PROVIDER_virtual/kernel = "linux-ti-staging"
@@ -25,6 +26,8 @@ PREFERRED_PROVIDER_u-boot = "u-boot-ti-staging"
 
 KERNEL_IMAGETYPE = "zImage"
 
+KERNEL_DEVICETREE = "am335x-evm.dtb am335x-evmsk.dtb am335x-bone.dtb am335x-boneblack.dtb am335x-bonegreen.dtb am335x-icev2.dtb"
+
 UBOOT_ARCH = "arm"
 UBOOT_MACHINE = "am335x_evm_config"
 

conf/machine/include/ti43x.inc

@@ -1,6 +1,7 @@
 SOC_FAMILY = "ti43x"
 require conf/machine/include/soc-family.inc
 
+DEFAULTTUNE ?= "armv7athf-neon"
 require conf/machine/include/tune-cortexa9.inc
 
 PREFERRED_PROVIDER_virtual/xserver = "xserver-xorg"
@@ -13,10 +14,10 @@ XSERVER = "xserver-xorg \
            xf86-input-keyboard"
 
 # Default to external video, change to smallscreen for built-in LCD
-GUI_MACHINE_CLASS = "bigscreen"
+MACHINE_GUI_CLASS = "bigscreen"
 
 # Increase this everytime you change something in the kernel
-MACHINE_KERNEL_PR = "r2"
+MACHINE_KERNEL_PR = "r3"
 
 # Default providers, may need to override for specific machines
 PREFERRED_PROVIDER_virtual/kernel = "linux-ti-staging"
@@ -25,6 +26,8 @@ PREFERRED_PROVIDER_u-boot = "u-boot-ti-staging"
 
 KERNEL_IMAGETYPE = "zImage"
 
+KERNEL_DEVICETREE = "am43x-epos-evm.dtb am437x-gp-evm.dtb am437x-gp-evm-hdmi.dtb am437x-sk-evm.dtb am437x-idk-evm.dtb"
+
 UBOOT_ARCH = "arm"
 UBOOT_MACHINE = "am43xx_evm_config"
 

conf/machine/k2e-evm.conf

@@ -2,13 +2,15 @@
 #@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
+
+KERNEL_DEVICETREE = "keystone-k2e-evm.dtb"
 
 UBOOT_MACHINE = "k2e_evm_config"
 
 BOOT_MONITOR_MAKE_TARGET = "k2e"
 
-IMAGE_FSTYPES += "ubi tar.gz cpio"
+IMAGE_FSTYPES += "ubifs ubi tar.xz"
 
 SERIAL_CONSOLE = "115200 ttyS0"
 
@@ -20,7 +22,7 @@ SYSVINIT_ENABLED_GETTYS = ""
 # UBI: logical eraseblock size:    126976 bytes
 # from ubiattach stdout:
 # UBI device number 0, total 3856 LEBs
-MKUBIFS_ARGS = "-F -m 2048 -e 126976 -c 3856"
+MKUBIFS_ARGS = "-F -m 2048 -e 126976 -c 4000"
 
 # do ubiattach /dev/ubi_ctrl -m 4
 # from dmesg:

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

@@ -0,0 +1,34 @@
+#@TYPE: Machine
+#@NAME: Keystone 2 K2G machine
+#@DESCRIPTION: Machine configuration for the TI Keystone 2 K2G EVM
+
+require conf/machine/include/k2g.inc
+
+MACHINE_FEATURES += "alsa"
+
+KERNEL_DEVICETREE = "keystone-k2g-evm.dtb keystone-k2g-evm-lcd.dtb keystone-k2g-ice.dtb"
+
+UBOOT_MACHINE = "k2g_evm_config"
+
+BOOT_MONITOR_MAKE_TARGET = "k2g"
+
+IMAGE_FSTYPES += "ubifs ubi tar.xz"
+
+SERIAL_CONSOLE = "115200 ttyS0"
+
+SYSVINIT_ENABLED_GETTYS = ""
+
+# do ubiattach /dev/ubi_ctrl -m 4
+# From dmesg:
+# UBI: smallest flash I/O unit:    4096
+# UBI: logical eraseblock size:    253952 bytes
+# from ubiattach stdout:
+# UBI device number 0, total 1926 LEBs
+MKUBIFS_ARGS = "-F -m 4096 -e 253952 -c 2000"
+
+# do ubiattach /dev/ubi_ctrl -m 4
+# from dmesg:
+# UBI: smallest flash I/O unit:    4096
+# UBI: physical eraseblock size:   256 KiB
+# UBI: sub-page size:              4096
+UBINIZE_ARGS = "-m 4096 -p 256KiB -s 4096 -O 4096"

conf/machine/k2g-hs-evm.conf

@@ -0,0 +1,14 @@
+#@TYPE: Machine
+#@NAME: Keystone 2 K2G HS EVM
+#@DESCRIPTION: Machine configuration for the TI Keystone 2 K2G HS EVM
+
+require conf/machine/k2g-evm.conf
+
+UBOOT_MACHINE = "k2g_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}/k2g"

conf/machine/k2hk-evm.conf

@@ -4,11 +4,13 @@
 
 require conf/machine/include/keystone.inc
 
+KERNEL_DEVICETREE = "keystone-k2hk-evm.dtb"
+
 UBOOT_MACHINE = "k2hk_evm_config"
 
 BOOT_MONITOR_MAKE_TARGET = "k2hk"
 
-IMAGE_FSTYPES += "ubi tar.gz cpio"
+IMAGE_FSTYPES += "ubifs ubi tar.xz"
 
 SERIAL_CONSOLE = "115200 ttyS0"
 
@@ -20,7 +22,7 @@ SYSVINIT_ENABLED_GETTYS = ""
 # UBI: logical eraseblock size:    126976 bytes
 # from ubiattach stdout:
 # UBI device number 0, total 3856 LEBs
-MKUBIFS_ARGS = "-F -m 2048 -e 126976 -c 3856"
+MKUBIFS_ARGS = "-F -m 2048 -e 126976 -c 4000"
 
 # do ubiattach /dev/ubi_ctrl -m 4
 # from dmesg:

conf/machine/k2l-evm.conf

@@ -4,11 +4,13 @@
 
 require conf/machine/include/keystone.inc
 
+KERNEL_DEVICETREE = "keystone-k2l-evm.dtb"
+
 UBOOT_MACHINE = "k2l_evm_config"
 
 BOOT_MONITOR_MAKE_TARGET = "k2l"
 
-IMAGE_FSTYPES += "ubi tar.gz cpio"
+IMAGE_FSTYPES += "ubifs ubi tar.xz"
 
 SERIAL_CONSOLE = "115200 ttyS0"
 
@@ -20,7 +22,7 @@ SYSVINIT_ENABLED_GETTYS = ""
 # UBI: logical eraseblock size:    253952 bytes
 # from ubiattach stdout:
 # UBI device number 0, total 1926 LEBs
-MKUBIFS_ARGS = "-F -m 4096 -e 253952 -c 1926"
+MKUBIFS_ARGS = "-F -m 4096 -e 253952 -c 2000"
 
 # do ubiattach /dev/ubi_ctrl -m 4
 # from dmesg:

conf/machine/omap3evm.conf

@@ -6,7 +6,7 @@ require conf/machine/include/omap3.inc
 
 # Use built-in LCD by default
 XSERVER += "xf86-input-tslib"
-GUI_MACHINE_CLASS = "smallscreen"
+MACHINE_GUI_CLASS = "smallscreen"
 MACHINE_FEATURES += "touchscreen ethernet"
 
 IMAGE_FSTYPES += "jffs2 tar.gz"
@@ -15,8 +15,6 @@ EXTRA_IMAGECMD_jffs2 = "-lnp -e 0x20000 -s 2048"
 SERIAL_CONSOLE = "115200 ttyS0"
 USE_VT = "0"
 
-PREFERRED_PROVIDER_virtual/kernel = "linux-omap-psp"
-
 EXTRA_IMAGEDEPENDS += "x-load"
 
 # NOTE: there are NAND and OneNAND versions of this board...

conf/machine/omap5-evm.conf

@@ -6,7 +6,9 @@ require conf/machine/include/omap-a15.inc
 
 IMAGE_FSTYPES += "ubi tar.gz"
 
-SERIAL_CONSOLE = "115200 ttyO2"
+KERNEL_DEVICETREE = "omap5-uevm.dtb"
+
+SERIAL_CONSOLE = "115200 ttyS2"
 
 # UBI information.  Note that this is board and kernel specific.  Changes
 # in your kernel port may require changes in these variables.  For more
@@ -19,7 +21,7 @@ SERIAL_CONSOLE = "115200 ttyO2"
 # UBI: logical eraseblock size:    126976 bytes
 # from ubiattach stdout:
 # UBI device number 0, total 1988 LEBs
-MKUBIFS_ARGS = "-F -m 2048 -e 126976 -c 3836"
+MKUBIFS_ARGS = "-F -m 2048 -e 126976 -c 4300"
 
 # do ubiattach /dev/ubi_ctrl -m 7 -O 2048
 # from dmesg:
@@ -30,7 +32,3 @@ MKUBIFS_ARGS = "-F -m 2048 -e 126976 -c 3836"
 UBINIZE_ARGS = "-m 2048 -p 128KiB -s 512 -O 2048"
 
 UBOOT_MACHINE = "omap5_uevm_config"
-
-# Currently removing the sgx machine feature because there is no SGX package
-# available for omap5
-MACHINE_FEATURES = "kernel26 apm usbgadget usbhost vfat ext2 screen touchscreen"

conf/machine/omapl138-lcdk.conf

@@ -0,0 +1,18 @@
+#@TYPE: Machine
+#@NAME: OMAP-L138 LCDK
+#@DESCRIPTION: Machine configuration for the TI OMAP-L138 LCDK board
+
+require conf/machine/include/davinci.inc
+require conf/machine/include/omapl138.inc
+
+UBOOT_MACHINE = "omapl138_lcdk_config"
+UBOOT_SUFFIX = "ais"
+
+UBOOT_ENTRYPOINT = "0xc0008000"
+UBOOT_LOADADDRESS = "0xc0008000"
+
+IMAGE_FSTYPES += "tar.xz"
+
+SERIAL_CONSOLE = "115200 ttyS2"
+
+KERNEL_DEVICETREE = "da850-evm.dtb da850-lcdk.dtb"

conf/machine/pandaboard.conf

@@ -4,11 +4,13 @@
 
 require conf/machine/include/omap4.inc
 
-GUI_MACHINE_CLASS = "bigscreen"
+MACHINE_GUI_CLASS = "bigscreen"
 
 IMAGE_FSTYPES += "tar.gz"
 
-SERIAL_CONSOLE = "115200 ttyO2"
+KERNEL_DEVICETREE = "omap4-panda.dtb omap4-panda-a4.dtb omap4-panda-es.dtb"
+
+SERIAL_CONSOLE = "115200 ttyS2"
 
 MACHINE_EXTRA_RRECOMMENDS = " kernel-modules"
 MACHINE_FEATURES = "kernel26 wifi bluetooth alsa apm ext2 screen usbgadget usbhost vfat sgx"

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

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

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

@@ -0,0 +1,22 @@
+LICENSE = "BSD-3-Clause"
+
+LIC_FILES_CHKSUM = "file://COPYING.txt;md5=5bdceac872dffdec915b819654ee23ea"
+
+AIF2_LLD_GIT_URI = "git://git.ti.com/keystone-rtos/aif2-lld.git"
+AIF2_LLD_GIT_PROTOCOL = "git"
+AIF2_LLD_GIT_BRANCH = "master"
+AIF2_LLD_GIT_DESTSUFFIX = "git/ti/drv/aif2"
+
+# The following commit correspond to DEV.AIF2LLD.01.02.00.01
+AIF2_LLD_SRCREV = "a701bbb5ed2976d5723c955c87a685f7517cffa3"
+
+BRANCH = "${AIF2_LLD_GIT_BRANCH}"
+SRC_URI = "${AIF2_LLD_GIT_URI};destsuffix=${AIF2_LLD_GIT_DESTSUFFIX};protocol=${AIF2_LLD_GIT_PROTOCOL};branch=${BRANCH}"
+SRCREV = "${AIF2_LLD_SRCREV}"
+
+PV = "1.2.0.1"
+INC_PR = "r0"
+
+COMPATIBLE_MACHINE = "k2hk-evm"
+
+S = "${WORKDIR}/${AIF2_LLD_GIT_DESTSUFFIX}"

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

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

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

@@ -1,39 +1,47 @@
 DESCRIPTION = "Boot Monitor - TI ARM Boot monitor code"
-EXTRA_OEMAKE = "CROSS_COMPILE=${TARGET_PREFIX}"
-
 LICENSE = "BSD"
-
-BOOT_MONITOR_BINARY ?= "skern.bin"
-BOOT_MONITOR_IMAGE  ?= "skern-${MACHINE}.bin"
-
 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}"
+DEPENDS = "u-boot-mkimage-native"
 
-PV = "2.0"
-PR = "r1+gitr${SRCPV}"
+SRC_URI = "git://git.ti.com/processor-firmware/ks2-boot-monitor.git;protocol=git;branch=${BRANCH}"
+
+PV = "4.0+git${SRCPV}"
 
 BRANCH = "master"
 
 S = "${WORKDIR}/git"
 
-#Tag "K2_BM_14.05"
-SRCREV = "0e3ffe1ea4a0cee38ae2406901b7cf4d5324b5e9"
+SRCREV = "cf8b431e8b3b2ee4a4aa08964d56d3ce1b11da24"
+
+BOOT_MONITOR_IMAGE  ?= "skern-${BOOT_MONITOR_MAKE_TARGET}.bin"
+
+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}""
+
+FILES_${PN} = "/boot"
+
+inherit deploy
 
 do_compile () {
 	unset LDFLAGS
 	unset CFLAGS
 	unset CPPFLAGS
-	oe_runmake ${BOOT_MONITOR_MAKE_TARGET}
+	oe_runmake image_${BOOT_MONITOR_MAKE_TARGET}
 }
 
-inherit deploy
-
-addtask deploy before do_build after do_compile
+do_install () {
+	install -d ${D}/boot
+	install -m 0644 ${S}/${BOOT_MONITOR_IMAGE} ${D}/boot/
+}
 
 do_deploy () {
 	install -d ${DEPLOYDIR}
-	install ${S}/${BOOT_MONITOR_BINARY} ${DEPLOYDIR}/${BOOT_MONITOR_IMAGE}
+	install -m 0644 ${S}/${BOOT_MONITOR_IMAGE} ${DEPLOYDIR}/
 }
+
+addtask deploy before do_build after do_compile

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

@@ -0,0 +1,24 @@
+DESCRIPTION = "Firmware files for Bluetooth"
+LICENSE = "TI-TSPA"
+LIC_FILES_CHKSUM = "file://LICENSE;md5=f39eac9f4573be5b012e8313831e72a9"
+
+PV = "8.7.1+git${SRCPV}"
+
+CLEANBROKEN = "1"
+
+SRCREV = "0ee619b598d023fffc77679f099bc2a4815510e4"
+BRANCH = "master"
+SRC_URI = "git://git.ti.com/ti-bt/service-packs.git;branch=${BRANCH}"
+
+S = "${WORKDIR}/git"
+
+do_compile() {
+    :
+}
+
+do_install() {
+    install -d ${D}${base_libdir}/firmware/ti-connectivity
+    oe_runmake "DEST_DIR=${D}" "BASE_LIB_DIR=${base_libdir}" install
+}
+
+FILES_${PN} += "${base_libdir}/firmware/ti-connectivity/*"

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

@@ -0,0 +1,28 @@
+DESCRIPTION = "Cortex-M3 binary blob for suspend-resume"
+
+LICENSE = "TI-TSPA"
+LIC_FILES_CHKSUM = "file://License.txt;md5=7bdc54a749ab7a7dea999d25d99a41b8"
+
+PV = "1.9.2"
+PR = "r0"
+
+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 = "${@bb.utils.contains("TUNE_FEATURES", "vfp", bb.utils.contains("TUNE_FEATURES", "callconvention-hard", " -mfloat-abi=hard", " -mfloat-abi=softfp", d), "" ,d)}"
+
+do_compile() {
+	make CROSS_COMPILE="${TARGET_PREFIX}" CC="${TARGET_PREFIX}gcc ${TOOLCHAIN_OPTIONS} ${FLOATABI}"
+}
+
+do_install() {
+	install -d ${D}${base_libdir}/firmware
+	install -m 0644 bin/am335x-pm-firmware.elf ${D}${base_libdir}/firmware/
+	install -m 0644 bin/*-scale-data.bin ${D}${base_libdir}/firmware/
+}
+
+FILES_${PN} += "${base_libdir}/firmware"

recipes-bsp/cmem/cmem-mod_git.bb

@@ -3,10 +3,16 @@ DESCRIPTION = "Kernel module for contiguous memory allocation from userspace"
 include cmem.inc
 
 # This package builds a kernel module, use kernel PR as base and append a local
-MACHINE_KERNEL_PR_append = "a+gitr${SRCPV}"
+MACHINE_KERNEL_PR_append = "b"
 PR = "${MACHINE_KERNEL_PR}"
 
 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"
+
+KERNEL_MODULE_AUTOLOAD += "cmemk"
+
+do_install_prepend() {
+    cp ${B}/src/cmem/module/Module.symvers ${B}/ || true
+}

recipes-bsp/cmem/cmem.inc

@@ -1,11 +1,13 @@
 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=b86138d4028fb8310b3b983024edc620"
+LIC_FILES_CHKSUM = "file://include/ti/cmem.h;beginline=1;endline=30;md5=9b745e2765a6ba8a636c91aed4b02ac1"
 
-BRANCH ?= "master"
-# This corresponds to version 4.00.01.08
-SRCREV = "0b68dfe9f155a1978cdb2178e052dc0d6f1e705b"
+BRANCH = "lu-next"
+# This corresponds to version 4.14.00.00_eng
+SRCREV = "b514a99ac45c64f0439282d0774d7cff5def4c6f"
+
+PV = "4.14.00.00+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+gitr${SRCPV}"
+PR = "r1"
 
 PACKAGES =+ "${PN}-test"
 

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

@@ -0,0 +1,22 @@
+require common-csl-ip.inc
+PR = "${INC_PR}.4"
+
+PACKAGE_ARCH = "${MACHINE_ARCH}"
+
+inherit ti-pdk
+
+DEPENDS_remove = "${PN}"
+
+# Build with make instead of XDC
+XDCMAKE = "0"
+
+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"
+
+export PDK_CSL_ROOT_PATH ="${WORKDIR}/build"
+export DEST_ROOT="${S}"

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

@@ -0,0 +1,22 @@
+DESCRIPTION = "Chip support library low level interface"
+LICENSE = "BSD-3-Clause"
+LIC_FILES_CHKSUM = "file://COPYING.txt;md5=5857833e20836213677fac33f9aded21"
+
+COMPATIBLE_MACHINE = "keystone|dra7xx"
+
+PV = "03.03.00.05A"
+INC_PR = "r0"
+
+CSL_GIT_URI = "git://git.ti.com/keystone-rtos/common-csl-ip.git"
+CSL_GIT_PROTOCOL ="git"
+CSL_GIT_BRANCH = "master"
+CSL_GIT_DESTSUFFIX = "git"
+
+# 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}"
+SRCREV = "${CSL_SRCREV}"
+
+S = "${WORKDIR}/${CSL_GIT_DESTSUFFIX}"

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

@@ -0,0 +1,17 @@
+require common-csl-ip.inc
+
+PR = "${INC_PR}.0"
+
+ALLOW_EMPTY_${PN} = "1"
+
+CLEANBROKEN = "1"
+
+do_compile() {
+    :
+}
+
+do_install () {
+    install -d ${D}${includedir}/ti/csl
+    find . -name "*.h" -type f | xargs -I {} cp --parents {} ${D}${includedir}/ti/csl
+    find ./src/ip/serdes_sb/V0 -name "*.c" -type f | xargs -I {} cp --parents {} ${D}${includedir}/ti/csl
+}

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

@@ -0,0 +1,13 @@
+inherit ti-pdk
+require cppi-lld.inc
+
+PR = "${INC_PR}.0"
+
+DEPENDS_append = " rm-lld-rtos \
+                   qmss-lld-rtos \
+"
+
+XDCARGS_k2hk-evm = "k2h k2k"
+XDCARGS_k2e = "k2e"
+XDCARGS_k2l-evm = "k2l"
+XDCARGS_k2g = "k2g"

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

@@ -0,0 +1,27 @@
+DESCRIPTION = "TI CPPI low level driver unit test and example binaries"
+DEPENDS = "common-csl-ip rm-lld cppi-lld qmss-lld"
+
+include cppi-lld.inc
+
+PR = "${INC_PR}.0"
+
+CHOICELIST = "yes no"
+
+do_compile () {
+#   Now build the lld in the updated directory
+	for device in ${DEVICELIST}
+	do
+		make -f makefile_armv7 clean PDK_INSTALL_PATH=${STAGING_INCDIR} DEVICE="$device" CPPI_SRC_DIR=${S}
+		for choice in ${CHOICELIST}
+		do
+			make -f makefile_armv7 tests examples PDK_INSTALL_PATH=${STAGING_INCDIR} DEVICE="$device" CPPI_SRC_DIR=${S} USEDYNAMIC_LIB="$choice"
+		done
+	done
+}
+
+do_install () {
+	for device in ${DEVICELIST}
+do
+	make -f makefile_armv7 installbin PDK_INSTALL_PATH=${STAGING_INCDIR} DEVICE="$device" CPPI_SRC_DIR=${S} INSTALL_BIN_BASE_DIR=${D}${bindir}
+	done
+}

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

@@ -0,0 +1,27 @@
+LICENSE = "BSD-3-Clause"
+LIC_FILES_CHKSUM = "file://${WORKDIR}/git/ti/drv/cppi/COPYING.txt;md5=e8f6789acdcda76d02ed9203fc2e603d"
+
+COMPATIBLE_MACHINE = "keystone"
+PACKAGE_ARCH = "${MACHINE_ARCH}"
+
+CPPI_LLD_GIT_URI = "git://git.ti.com/keystone-rtos/cppi-lld.git"
+CPPI_LLD_GIT_PROTOCOL = "git"
+CPPI_LLD_GIT_BRANCH = "master"
+CPPI_LLD_GIT_DESTSUFFIX = "git/ti/drv/cppi"
+
+# Below Commit ID corresponds to "DEV.CPPI_LLD.02.01.00.12A"
+CPPI_LLD_SRCREV = "6a1d2891b3de9891dea71a069a261c6368209413"
+
+BRANCH = "${CPPI_LLD_GIT_BRANCH}"
+SRC_URI = "${CPPI_LLD_GIT_URI};destsuffix=${CPPI_LLD_GIT_DESTSUFFIX};protocol=${CPPI_LLD_GIT_PROTOCOL};branch=${BRANCH}"
+
+SRCREV = "${CPPI_LLD_SRCREV}"
+PV = "02.01.00.12"
+INC_PR = "r1"
+
+DEVICELIST = "k2h k2k k2l k2e"
+DEVICELIST_k2hk-evm = "k2h k2k"
+DEVICELIST_k2l-evm  = "k2l"
+DEVICELIST_k2e  = "k2e"
+
+S = "${WORKDIR}/${CPPI_LLD_GIT_DESTSUFFIX}"

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

@@ -0,0 +1,31 @@
+DESCRIPTION = "TI CPPI Module low level driver"
+
+DEPENDS = "common-csl-ip rm-lld qmss-lld"
+
+include cppi-lld.inc
+
+PR = "${INC_PR}.1"
+
+do_compile () {
+#   Now build the lld in the updated directory
+	make -f makefile_armv7 clean PDK_INSTALL_PATH=${STAGING_INCDIR}
+	for device in ${DEVICELIST}
+	do
+		make -f makefile_armv7 lib PDK_INSTALL_PATH=${STAGING_INCDIR}  DEVICE="${device}"
+	done
+}
+
+do_install () {
+	make -f makefile_armv7 install PDK_INSTALL_PATH=${STAGING_INCDIR} INSTALL_INC_BASE_DIR=${D}/${includedir} INSTALL_LIB_BASE_DIR=${D}${libdir}
+
+#   Set the generic device library symbolic link to default k2h
+    cd ${D}${libdir}
+
+    # Link only the first device in the list
+    for device in ${DEVICELIST}
+    do
+        ln -sf libcppi_${device}.so.1.0.0 libcppi_device.so.1
+        break
+    done
+    ln -sf libcppi_device.so.1 libcppi_device.so
+}

recipes-bsp/cuia/cuia_1.0.0.13.bb

@@ -0,0 +1,25 @@
+DESCRIPTION = "TI Unified Instrumentation Architecture in C (cUIA)"
+LICENSE = "BSD-3-Clause"
+LIC_FILES_CHKSUM = "file://cuia_${CUIA_PV}_manifest.html;md5=0eea94e3bb94de4ddee77653eba1c7c5"
+
+CUIA_PV = "1_00_00_13"
+CUIA_PVExtra = ""
+
+SRC_URI = "http://software-dl.ti.com/dsps/dsps_public_sw/sdo_ccstudio/UIA/SCMCSDK/cuia_${CUIA_PV}${CUIA_PVExtra}.tar.gz;name=cuia"
+SRC_URI[cuia.md5sum] = "ef53989ac70c191841cd656cdc8770be"
+SRC_URI[cuia.sha256sum] = "f16d138a9146fdc7d52cba77bd30596da65835f6ffe4092baf2b33d1c1a4fb0d"
+
+S = "${WORKDIR}/cuia_${CUIA_PV}${CUIA_PVExtra}"
+
+CLEANBROKEN = "1"
+
+do_compile () {
+	cd ${S}
+	oe_runmake clean
+	oe_runmake all
+}
+
+do_install() {
+	cd ${S}
+	oe_runmake DESTDIR=${D} libdir=${libdir} includedir=${includedir} install
+}

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

@@ -0,0 +1,20 @@
+DESCRIPTION = "TI Digital Radio Front End lld test application"
+
+DEPENDS = "common-csl-ip dfe-lld iqn2-lld"
+
+include dfe-lld.inc
+
+PR = "${INC_PR}.0"
+
+EXTRA_OEMAKE = "-f makefile_armv7 PDK_INSTALL_PATH=${STAGING_INCDIR} DFE_SRC_DIR=${S}"
+
+do_compile () {
+#   Now build the lld in the updated directory
+	oe_runmake clean DEVICE=k2l
+	oe_runmake tests DEVICE=k2l
+	oe_runmake tests DEVICE=k2l USEDYNAMIC_LIB=yes
+}
+
+do_install () {
+	oe_runmake installbin INSTALL_BIN_BASE_DIR=${D}/${bindir}
+}

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

@@ -0,0 +1,22 @@
+LICENSE = "BSD-3-Clause"
+
+LIC_FILES_CHKSUM = "file://COPYING.txt;md5=1f4217b705bf98762a302fd720649dcc"
+
+DFE_LLD_GIT_URI = "git://git.ti.com/keystone-rtos/dfe-lld.git"
+DFE_LLD_GIT_PROTOCOL = "git"
+DFE_LLD_GIT_BRANCH = "master"
+DFE_LLD_GIT_DESTSUFFIX = "git/ti/drv/dfe"
+
+# 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.8"
+INC_PR = "r0"
+
+COMPATIBLE_MACHINE = "k2l-evm"
+
+S = "${WORKDIR}/${DFE_LLD_GIT_DESTSUFFIX}"

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

@@ -0,0 +1,17 @@
+DESCRIPTION = "Digital Radio Front End low level driver"
+
+DEPENDS = "common-csl-ip"
+
+include dfe-lld.inc
+
+PR = "${INC_PR}.0"
+
+EXTRA_OEMAKE = "-f makefile_armv7 PDK_INSTALL_PATH=${STAGING_INCDIR}"
+
+do_compile () {
+	oe_runmake lib DEVICE=k2l
+}
+
+do_install () {
+	oe_runmake install INSTALL_INC_BASE_DIR=${D}/${includedir} INSTALL_LIB_BASE_DIR=${D}${libdir}
+}

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

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

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

@@ -0,0 +1,24 @@
+DESCRIPTION = "Debug Sub-System (DebugSS) driver for Keystone and DRA7xx devices"
+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 = "d"
+PR = "${MACHINE_KERNEL_PR}"
+PV_append = "+git${SRCPV}"
+
+S = "${WORKDIR}/git/debugss_module/debugss-mod"
+
+inherit module
+
+PLATFORM = ""
+PLATFORM_dra7xx = "DRA7xx_PLATFORM"
+PLATFORM_keystone = "KEYSTONE_PLATFORM"
+PLATFORM_k2e = "K2E_PLATFORM"
+
+EXTRA_OEMAKE = "'PLATFORM=${PLATFORM}' KVERSION=${KERNEL_VERSION} KERNEL_SRC=${STAGING_KERNEL_DIR}"
+
+COMPATIBLE_MACHINE = "dra7xx|keystone"
+PACKAGE_ARCH = "${MACHINE_ARCH}"
+
+include dsptop.inc

recipes-bsp/dsptop/dsptop.inc

@@ -0,0 +1,8 @@
+# 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}"
+
+BRANCH = "master"

recipes-bsp/dsptop/dsptop_git.bb

@@ -0,0 +1,29 @@
+DESCRIPTION = "TI dsptop utility."
+LICENSE = "BSD"
+LIC_FILES_CHKSUM = "file://debian/copyright;md5=309825aa8f5edfcf2c44912ac094b979"
+
+DEPENDS = "libulm ncurses"
+
+PR = "${INC_PR}.2"
+
+S = "${WORKDIR}/git/dsptop"
+
+DEVICE = ""
+DEVICE_dra7xx = "DRA7xx"
+DEVICE_keystone = "C66AK2Hxx"
+
+EXTRA_OEMAKE = "release DEVICE=${DEVICE} CROSS_COMPILE=${TARGET_PREFIX} CC="${CC}""
+
+do_install() {
+    oe_runmake install DESTDIR=${D}
+}
+
+COMPATIBLE_MACHINE = "dra7xx|keystone"
+PACKAGE_ARCH = "${MACHINE_ARCH}"
+
+RDEPENDS_${PN} = "debugss-module-drv"
+RDEPENDS_${PN}_append_keystone = " temperature-module-drv"
+
+include dsptop.inc
+
+PARALLEL_MAKE = ""

recipes-bsp/dsptop/libulm_git.bb

@@ -0,0 +1,42 @@
+DESCRIPTION = "TI dsptop utility."
+LICENSE = "BSD"
+LIC_FILES_CHKSUM = "file://../debian/copyright;md5=309825aa8f5edfcf2c44912ac094b979"
+
+DEPENDS = "ti-cgt6x-native"
+PR = "${INC_PR}.0"
+
+S = "${WORKDIR}/git/dsptop/ulm"
+
+DEVICE=""
+DEVICE_dra7xx = "DRA7xx"
+DEVICE_keystone = "C66AK2Hxx"
+
+EXTRA_OEMAKE = "release DEVICE=${DEVICE} CROSS_COMPILE=${TARGET_PREFIX}"
+
+do_compile() {
+    oe_runmake arm XPORT_ONLY CC="${CC}"
+    oe_runmake dsp C6X_C_DIR=${STAGING_DIR_NATIVE}/usr/share/ti/cgt-c6x/include
+}
+
+do_install() {
+    install -d ${D}${includedir}
+    install -d ${D}${libdir}
+    install -d ${D}${datadir}/ti/ulm
+    cp -f tiulm.h ${D}${includedir}
+    cp -f release/libtiulm.a ${D}${libdir}
+    cp -f tiulm.h ${D}${datadir}/ti/ulm
+    cp -f release/libtiulm.ae66 ${D}${datadir}/ti/ulm
+}
+
+COMPATIBLE_MACHINE = "dra7xx|keystone"
+PACKAGE_ARCH = "${MACHINE_ARCH}"
+
+FILES_${PN}-dev += "\
+    ${datadir}/ti/ulm \
+"
+
+include dsptop.inc
+
+ALLOW_EMPTY_${PN} = "1"
+
+PARALLEL_MAKE= ""

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

@@ -0,0 +1,18 @@
+DESCRIPTION = "Smart Reflex Sub-System (SRSS) module driver for Keystone devices"
+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"
+PR = "${MACHINE_KERNEL_PR}"
+PV_append = "+git${SRCPV}"
+
+S = "${WORKDIR}/git/temperature_module/temperature-mod"
+
+inherit module
+
+EXTRA_OEMAKE = "KVERSION=${KERNEL_VERSION} KERNEL_SRC=${STAGING_KERNEL_DIR}"
+
+COMPATIBLE_MACHINE = "keystone"
+
+include dsptop.inc

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

@@ -0,0 +1,116 @@
+require edma3-lld.inc
+require recipes-ti/includes/ti-paths.inc
+require recipes-ti/includes/ti-staging.inc
+
+PR = "${INC_PR}.0"
+
+DEPENDS = "ti-sysbios ti-xdctools gcc-arm-none-eabi-native ti-ccsv6-native ti-cgt6x-native"
+
+COMPATIBLE_MACHINE = "ti33x|ti43x|omap-a15|keystone"
+PACKAGE_ARCH = "${MACHINE_ARCH}"
+
+PLATFORMLIST = ""
+TARGETLIST = ""
+
+PLATFORMLIST_ti33x = " \
+        am335x-evm \
+"
+
+TARGETLIST_ti33x = " \
+        a8 \
+"
+
+PLATFORMLIST_ti43x = " \
+        am437x-evm \
+"
+
+TARGETLIST_ti43x = " \
+        arm9 \
+"
+
+PLATFORMLIST_omap-a15 = " \
+        tda2xx-evm \
+"
+
+TARGETLIST_omap-a15 = " \
+        66 \
+        a15 \
+        m4 \
+"
+
+PLATFORMLIST_keystone = " \
+        tci6636k2h-evm \
+        tci6638k2k-evm \
+        tci6630k2l-evm \
+        c66ak2e-evm \
+        tci66ak2g02-evm \
+"
+
+TARGETLIST_keystone = " \
+        66 \
+        a15 \
+"
+
+FORMAT="ELF"
+
+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 = "${M4_TOOLCHAIN_INSTALL_DIR}"
+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"
+
+do_configure () {
+    sed -i -e "s|_config.bld|config.bld|g" ${S}/makerules/env.mk
+    sed -i -e "s|^edma3_lld_PATH =.*$|edma3_lld_PATH = ${S}|g" ${S}/makerules/env.mk
+    sed -i -e "s|^CODEGEN_PATH_M3 =.*$|CODEGEN_PATH_M3 = ${M4_TOOLCHAIN_INSTALL_DIR}|g" ${S}/makerules/env.mk
+    sed -i -e "s|^CODEGEN_PATH_M4 =.*$|CODEGEN_PATH_M4 = ${M4_TOOLCHAIN_INSTALL_DIR}|g" ${S}/makerules/env.mk
+    sed -i -e "s|^CODEGEN_PATH_A8 =.*$|CODEGEN_PATH_A8 = ${M4_TOOLCHAIN_INSTALL_DIR}|g" ${S}/makerules/env.mk
+    sed -i -e "s|^CODEGEN_PATH_A8_GCC =.*$|CODEGEN_PATH_A8_GCC = ${GCC_ARM_NONE_TOOLCHAIN}|g" ${S}/makerules/env.mk
+    sed -i -e "s|^CODEGEN_PATH_ARM9 =.*$|CODEGEN_PATH_ARM9 = ${M4_TOOLCHAIN_INSTALL_DIR}|g" ${S}/makerules/env.mk
+    sed -i -e "s|^CODEGEN_PATH_A9_GCC =.*$|CODEGEN_PATH_A9_GCC = ${GCC_ARM_NONE_TOOLCHAIN}|g" ${S}/makerules/env.mk
+    sed -i -e "s|^CODEGEN_PATH_A15 =.*$|CODEGEN_PATH_A15 = ${GCC_ARM_NONE_TOOLCHAIN}|g" ${S}/makerules/env.mk
+    sed -i -e "s|^CODEGEN_PATH_A15_GCC =.*$|CODEGEN_PATH_A15_GCC = ${GCC_ARM_NONE_TOOLCHAIN}|g" ${S}/makerules/env.mk
+    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 () {
+    cd ${S}/packages
+    for p in ${PLATFORMLIST}
+    do
+        for t in ${TARGETLIST}
+        do
+            make PLATFORM=${p} TARGET=${t} FORMAT=${FORMAT}
+        done
+    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 ldflags"
+
+ALLOW_EMPTY_${PN} = "1"
+FILES_${PN}-dev += "${EDMA3_LLD_INSTALL_DIR_RECIPE}"

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

@@ -0,0 +1,17 @@
+DESCRIPTION = "TI EDMA3 low level driver and test code"
+LICENSE = "BSD-3-Clause"
+LIC_FILES_CHKSUM = "file://COPYING.txt;md5=5bdceac872dffdec915b819654ee23ea"
+
+EDMA3_LLD_GIT_URI = "git://git.ti.com/keystone-rtos/edma3_lld.git"
+EDMA3_LLD_GIT_PROTOCOL = "git"
+EDMA3_LLD_GIT_BRANCH = "master"
+
+# 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.02.26"
+INC_PR = "r0"

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

@@ -0,0 +1,73 @@
+require edma3-lld.inc
+
+PR = "${INC_PR}.0"
+
+COMPATIBLE_MACHINE = "keystone"
+
+DEPENDS = "common-csl-ip"
+
+PLATFORMLIST = "tci6636k2h-evm \
+	tci6636k2h-evm \
+	tci6638k2k-evm \
+	tci6630k2l-evm \
+	c66ak2e-evm \
+	tci66ak2g02-evm \
+	"
+
+PACKAGES =+ "${PN}-test"
+
+FILES_${PN}-test = "${bindir}/*"
+
+S = "${WORKDIR}/git"
+
+do_compile () {
+	cd ${S}/packages
+	for platform in ${PLATFORMLIST}
+	do
+		ROOTDIR=${S} CROSSCC="${TARGET_PREFIX}gcc" CROSSAR="${TARGET_PREFIX}ar" \
+		CROSSLNK="${TARGET_PREFIX}gcc" INTERNAL_SW_ROOT="${S}" make \
+		PLATFORM="$platform" TARGET=a15 TOOLCHAIN_a15=GCC FORMAT=ELF \
+		SONAME=libedma3.so all
+	done
+}
+
+do_install () {
+	install -d ${D}/${libdir}
+
+	# Static Libraries
+	cp ${S}/packages/ti/sdo/edma3/drv/lib/a15/release/edma3_lld_drv.aa15fg \
+		${D}/${libdir}/libedma3.a
+	cp ${S}/packages/ti/sdo/edma3/rm/lib/tci6636k2h-evm/a15/release/edma3_lld_rm.aa15fg \
+		${D}/${libdir}/libedma3rm.a
+
+	# Shared Libraries
+	cp -a ${S}/packages/ti/sdo/edma3/drv/lib/a15/release/libedma* ${D}/${libdir}
+	cp -a ${S}/packages/ti/sdo/edma3/rm/lib/tci6636k2h-evm/a15/release/libedma* ${D}/${libdir}
+
+	# Copy Headers
+	install -d ${D}/${includedir}/ti/sdo/edma3/drv/
+	install -d ${D}/${includedir}/ti/sdo/edma3/rm
+	cp ${S}/packages/ti/sdo/edma3/drv/*.h ${D}/${includedir}/ti/sdo/edma3/drv/
+	cp ${S}/packages/ti/sdo/edma3/rm/*.h ${D}/${includedir}/ti/sdo/edma3/rm/
+
+	# Copy Sample Config
+	install -d ${D}/${includedir}/ti/sdo/edma3/drv/sample/src/platforms
+	cp ${S}/examples/edma3_user_space_driver/evmTCI6636K2H/evmTCI6636K2HSample.c \
+		${D}/${includedir}/ti/sdo/edma3/drv/sample/src/platforms
+	cp ${S}/examples/edma3_user_space_driver/evmTCI6638K2K/evmTCI6638K2KSample.c \
+		${D}/${includedir}/ti/sdo/edma3/drv/sample/src/platforms
+	cp ${S}/examples/edma3_user_space_driver/evmTCI6630K2L/evmTCI6630K2LSample.c \
+		${D}/${includedir}/ti/sdo/edma3/drv/sample/src/platforms
+	cp ${S}/examples/edma3_user_space_driver/evmC66AK2E/evmC66AK2ESample.c \
+		${D}/${includedir}/ti/sdo/edma3/drv/sample/src/platforms
+
+	install -d ${D}/${bindir}
+	install -c -m 755 ${S}/examples/edma3_user_space_driver/evmTCI6636K2H/bin/tci6636k2h-evm/edma3_drv_6636k2h_a15_sample_a15host_release.xa15fg \
+		${D}/${bindir}/edma3_drv_6636k2h_a15_sample_a15host_release.xa15fg
+	install -c -m 755 ${S}/examples/edma3_user_space_driver/evmTCI6638K2K/bin/tci6638k2k-evm/edma3_drv_6638k2k_a15_sample_a15host_release.xa15fg \
+		${D}/${bindir}/edma3_drv_6638k2k_a15_sample_a15host_release.xa15fg
+	install -c -m 755 ${S}/examples/edma3_user_space_driver/evmTCI6630K2L/bin/tci6630k2l-evm/edma3_drv_6630k2l_a15_sample_a15host_release.xa15fg \
+		${D}/${bindir}/edma3_drv_6630k2l_a15_sample_a15host_release.xa15fg
+	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/formfactor/formfactor_0.0.bbappend

@@ -1,2 +1 @@
-PRINC := "${@int(PRINC) + 1}"
 FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"

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 = "c"
+PR = "${MACHINE_KERNEL_PR}"
+
+# Need to branch out with ${PV} var
+BRANCH = "ti-${PV}-k4.9"
+
+SRCREV = "030df5ecf503ef3c83dca6e732e6d47d4a11cd4b"
+
+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-mod_git.bb

@@ -0,0 +1,22 @@
+DESCRIPTION = "TI High Performance Library kernel module"
+LICENSE = "GPLv2"
+LIC_FILES_CHKSUM = "file://${WORKDIR}/git/ti/runtime/hplib/module/COPYING.txt;md5=c1c4d3453cddc5b7f0ce84a277e66779"
+
+DEPENDS = "hplib"
+
+include hplib.inc
+
+# 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/ti/runtime/hplib/module"
+EXTRA_OEMAKE = "KDIR=${STAGING_KERNEL_DIR} PDK_INSTALL_PATH=${STAGING_INCDIR}"
+
+inherit module
+
+do_install () {
+	oe_runmake install INSTALL_MOD_PATH="${D}"
+}
+
+KERNEL_MODULE_AUTOLOAD += "hplibmod"

recipes-bsp/hplib/hplib-test_git.bb

@@ -0,0 +1,32 @@
+DESCRIPTION = "TI High performance library test binaries"
+LICENSE = "BSD-3-Clause"
+LIC_FILES_CHKSUM = "file://${WORKDIR}/git/ti/runtime/hplib/src/COPYING.txt;md5=b7982a377c680ad71ca2fbb735982462"
+
+DEPENDS = "common-csl-ip qmss-lld sa-lld pktlib hplib"
+
+include hplib.inc
+
+PR = "${INC_PR}.0"
+
+CHOICELIST = "yes no"
+
+S = "${WORKDIR}/git/ti/runtime/hplib"
+
+EXTRA_OEMAKE += '-f makefile_armv7 PDK_INSTALL_PATH=${STAGING_INCDIR}'
+
+do_compile () {
+	for device in ${DEVICELIST}
+	do
+		for choice in ${CHOICELIST}
+		do
+			oe_runmake tests HPLIB_SRC_DIR=${S} USEDYNAMIC_LIB=$choice DEVICE="$device"
+		done
+	done
+}
+
+do_install () {
+	for device in ${DEVICELIST}
+	do
+		oe_runmake installbin INSTALL_INC_BASE_DIR=${D}${includedir} INSTALL_LIB_BASE_DIR=${D}${libdir} INSTALL_BIN_BASE_DIR=${D}${bindir} DEVICE="$device"
+	done
+}

recipes-bsp/hplib/hplib.inc

@@ -0,0 +1,20 @@
+COMPATIBLE_MACHINE = "keystone"
+PACKAGE_ARCH = "${MACHINE_ARCH}"
+
+DEVICELIST_k2hk-evm = "k2h k2k"
+DEVICELIST_k2l-evm  = "k2l"
+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.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.08+git${SRCPV}"
+INC_PR = "r0"

recipes-bsp/hplib/hplib_git.bb

@@ -0,0 +1,33 @@
+DESCRIPTION = "TI High performance libraries"
+LICENSE = "BSD-3-Clause"
+LIC_FILES_CHKSUM = "file://${WORKDIR}/git/ti/runtime/hplib/src/COPYING.txt;md5=b7982a377c680ad71ca2fbb735982462"
+
+DEPENDS = "common-csl-ip rm-lld qmss-lld sa-lld pktlib"
+RDEPENDS_${PN} = "hplib-mod"
+
+include hplib.inc
+
+PR = "${INC_PR}.0"
+
+CHOICELIST = "yes no"
+
+S = "${WORKDIR}/git/ti/runtime/hplib"
+
+EXTRA_OEMAKE += "-f makefile_armv7 PDK_INSTALL_PATH=${STAGING_INCDIR}"
+
+do_compile () {
+	for device in ${DEVICELIST}
+	do
+		for choice in ${CHOICELIST}
+		do
+			oe_runmake lib HPLIB_SRC_DIR=${S} USEDYNAMIC_LIB=$choice DEVICE="$device"
+		done
+	done
+}
+
+do_install () {
+	for device in ${DEVICELIST}
+	do
+		oe_runmake install INSTALL_INC_BASE_DIR=${D}${includedir} INSTALL_LIB_BASE_DIR=${D}${libdir} INSTALL_BIN_BASE_DIR=${D}${bindir} DEVICE="$device"
+	done
+}

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

@@ -0,0 +1,26 @@
+include hyplnk-lld.inc
+
+PR = "${INC_PR}.0"
+
+DEPENDS = "common-csl-ip hyplnk-lld"
+
+do_compile () {
+	make -f makefile_armv7 clean PDK_INSTALL_PATH="${STAGING_INCDIR}" \
+		HYPLNK_SRC_DIR="${S}"
+	for device in ${DEVICELIST}
+	do
+		make -f makefile_armv7 tests examples \
+			PDK_INSTALL_PATH="${STAGING_INCDIR}" \
+			DEVICE="$device" HYPLNK_SRC_DIR="${S}"
+	done
+}
+
+do_install () {
+    for device in ${DEVICELIST}
+	do
+		make -f makefile_armv7 installbin \
+			PDK_INSTALL_PATH="${STAGING_INCDIR}" DEVICE="$device" \
+			HYPLNK_SRC_DIR="${S}" \
+			INSTALL_BIN_BASE_DIR="${D}/${bindir}"
+	done
+}

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

@@ -0,0 +1,29 @@
+DESCRIPTION = "TI Hyperlink Low Level Driver"
+LICENSE = "BSD-3-Clause"
+
+COMPATIBLE_MACHINE = "k2hk-evm|k2e"
+PACKAGE_ARCH = "${MACHINE_ARCH}"
+
+LLDNAME="hyplnk"
+
+LIC_FILES_CHKSUM = "file://${WORKDIR}/${HYPLNK_GIT_DESTSUFFIX}/COPYING.txt;md5=623325cc19e613a4e770fbb749922592"
+
+HYPLNK_GIT_URI = "git://git.ti.com/keystone-rtos/hyplnk-lld.git"
+HYPLNK_GIT_PROTOCOL = "git"
+HYPLNK_GIT_BRANCH = "master"
+HYPLNK_GIT_DESTSUFFIX = "git/ti/drv/${LLDNAME}"
+
+# Following commit corresponds to tag DEV.HYPLNK_LLD.02.01.00.06
+HYPLNK_SRCREV = "a1953ca33114c5a4daca6289a7fb75b201f566d2"
+
+BRANCH="${HYPLNK_GIT_BRANCH}"
+SRC_URI = "${HYPLNK_GIT_URI};destsuffix=${HYPLNK_GIT_DESTSUFFIX};protocol=${HYPLNK_GIT_PROTOCOL};branch=${BRANCH}"
+SRCREV = "${HYPLNK_SRCREV}"
+
+PV = "2.1.0.6"
+INC_PR = "r0"
+
+DEVICELIST_k2hk-evm = "k2h k2k"
+DEVICELIST_k2e  = "k2e"
+
+S = "${WORKDIR}/${HYPLNK_GIT_DESTSUFFIX}"

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

@@ -0,0 +1,32 @@
+include hyplnk-lld.inc
+
+PR = "${INC_PR}.1"
+
+DEPENDS = "common-csl-ip"
+
+do_compile () {
+	make -f makefile_armv7 clean PDK_INSTALL_PATH="${STAGING_INCDIR}" \
+		HYPLNK_SRC_DIR="${S}"
+	for device in ${DEVICELIST}
+	do
+		make -f makefile_armv7 lib PDK_INSTALL_PATH="${STAGING_INCDIR}"\
+			DEVICE="$device" HYPLNK_SRC_DIR="${S}"
+	done
+}
+
+do_install () {
+	make -f makefile_armv7 install PDK_INSTALL_PATH="${STAGING_INCDIR}" \
+		INSTALL_INC_BASE_DIR="${D}/${includedir}" \
+		INSTALL_LIB_BASE_DIR="${D}${libdir}" HYPLNK_SRC_DIR="${S}"
+
+	# Set the generic device library symbolic link to default k2h
+	cd ${D}${libdir}
+
+	# Link only the first device in the list
+	for device in ${DEVICELIST}
+	do
+		ln -sf libhyplnk_${device}.so.1.0.0 libhyplnk_device.so.1
+		break
+	done
+	ln -sf libhyplnk_device.so.1 libhyplnk_device.so
+}

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

@@ -0,0 +1,70 @@
+python __anonymous() {
+    features = bb.data.getVar("MACHINE_FEATURES", d, 1)
+    if not features:
+        return
+    if "mmip" not in features:
+        raise bb.parse.SkipPackage('ipumm-fw does not apply to systems without the "mmip" flag in MACHINE_FEATURES')
+}
+
+DESCRIPTION = "Firmware for IPU for supporting Accelerated MM decode and encode"
+LICENSE = "TI-TSPA"
+
+LIC_FILES_CHKSUM = "file://Texas_Instruments_ipumm_Manifest.pdf;md5=5cc572579f07af266ab57fc17d762c7f"
+
+COMPATIBLE_MACHINE = "dra7xx"
+
+RDEPENDS_${PN} = " libdce"
+
+SRC_URI = "git://git.ti.com/ivimm/ipumm.git;protocol=git"
+
+SRCREV = "fd441443a4289c801a0c8d9f00b6966f7fe3476c"
+
+S = "${WORKDIR}/git"
+
+PV = "3.00.13.00"
+PR = "r5"
+
+require recipes-ti/includes/ti-paths.inc
+require recipes-ti/includes/ti-staging.inc
+
+inherit update-alternatives
+
+DEPENDS = "ti-xdctools ti-sysbios ti-codec-engine ti-framework-components ti-xdais ti-ccsv6-native ti-ipc-rtos"
+
+export HWVERSION="ES10"
+export BIOSTOOLSROOT="${STAGING_DIR_TARGET}/usr/share/ti"
+
+export XDCVERSION="ti-xdctools-tree"
+export BIOSVERSION="ti-sysbios-tree"
+export IPCVERSION="ti-ipc-tree"
+export CEVERSION="ti-codec-engine-tree"
+export FCVERSION="ti-framework-components-tree"
+export XDAISVERSION="ti-xdais-tree"
+
+export TMS470CGTOOLPATH="${M4_TOOLCHAIN_INSTALL_DIR}"
+export IPCSRC="${STAGING_DIR_TARGET}/usr/share/ti/ti-ipc-tree"
+
+do_configure() {
+    oe_runmake unconfig
+    oe_runmake vayu_smp_config
+}
+
+do_compile() {
+    oe_runmake
+}
+
+TARGET = "dra7-ipu2-fw.xem4"
+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"
+ALTERNATIVE_LINK_NAME[dra7-ipu2-fw.xem4] = "${base_libdir}/firmware/${TARGET}"
+ALTERNATIVE_TARGET[dra7-ipu2-fw.xem4] = "${base_libdir}/firmware/${TARGET}.${BPN}"
+ALTERNATIVE_PRIORITY = "20"
+
+FILES_${PN} += "${base_libdir}/firmware/*"

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

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

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

@@ -0,0 +1,21 @@
+LIC_FILES_CHKSUM = "file://COPYING.txt;md5=5bdceac872dffdec915b819654ee23ea"
+LICENSE = "BSD-3-Clause"
+
+IQN2_LLD_GIT_URI = "git://git.ti.com/keystone-rtos/iqn2-lld.git"
+IQN2_LLD_GIT_PROTOCOL = "git"
+IQN2_LLD_GIT_BRANCH = "master"
+IQN2_LLD_GIT_DESTSUFFIX = "git/ti/drv/iqn2"
+
+# Following commit corresponds to DEV.IQN_LLD.01.00.00.10
+IQN2_LLD_SRCREV = "dfc6bdd3b397b58e234f74eadda6d79ee399e682"
+
+BRANCH = "${IQN2_LLD_GIT_BRANCH}"
+SRC_URI = "${IQN2_LLD_GIT_URI};destsuffix=${IQN2_LLD_GIT_DESTSUFFIX};protocol=${IQN2_LLD_GIT_PROTOCOL};branch=${BRANCH}"
+SRCREV = "${IQN2_LLD_SRCREV}"
+
+PV = "1.0.0.10"
+INC_PR = "r0"
+
+COMPATIBLE_MACHINE = "k2l-evm"
+
+S = "${WORKDIR}/${IQN2_LLD_GIT_DESTSUFFIX}"

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

@@ -0,0 +1,22 @@
+DESCRIPTION = "TI IQN2 peripheral module low level driver"
+
+DEPENDS = "common-csl-ip"
+
+include iqn2-lld.inc
+
+PR = "${INC_PR}.0"
+
+EXTRA_OEMAKE = "-f makefile_armv7 PDK_INSTALL_PATH=${STAGING_INCDIR}"
+
+do_configure () {
+	sed -i -e 's/march=armv7-a/march=armv7ve/' build/armv7/libiqn2_aearmv7.mk
+}
+
+do_compile () {
+	oe_runmake clean
+	oe_runmake lib
+}
+
+do_install () {
+	oe_runmake install INSTALL_INC_BASE_DIR=${D}/${includedir} INSTALL_LIB_BASE_DIR=${D}${libdir}
+}

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

@@ -0,0 +1,44 @@
+DESCRIPTION = "TI KEYSTONE MMAP driver test binaries "
+include mmap-lld.inc
+
+PR = "${INC_PR}.0"
+
+PACKAGE_ARCH = "${MACHINE_ARCH}"
+
+DEPENDS="common-csl-ip mmap-lld"
+RDEPENDS_${PN}="uio-module-drv"
+
+DEVICELIST_k2hk-evm = "k2h k2k"
+DEVICELIST_k2e = "k2e"
+DEVICELIST_k2l-evm = "k2l"
+DEVICELIST_k2g = "k2g"
+
+CHOICELIST = " yes \
+               no \
+"
+
+do_compile () {
+	for device in ${DEVICELIST}
+	do
+		make -f makefile_armv7 clean \
+			PDK_INSTALL_PATH="${STAGING_INCDIR}" \
+			DEVICE="$device" MPAX_SRC_DIR="${S}"
+		for choice in ${CHOICELIST}
+		do
+			make -f makefile_armv7 tests examples \
+				PDK_INSTALL_PATH=${STAGING_INCDIR} \
+				DEVICE="$device" MPAX_SRC_DIR="${S}" \
+				USEDYNAMIC_LIB="$choice"
+		done
+	done
+}
+
+do_install () {
+	for device in ${DEVICELIST}
+	do
+		make -f makefile_armv7 installbin \
+		PDK_INSTALL_PATH=${STAGING_INCDIR} \
+		DEVICE="$device" MPAX_SRC_DIR="${S}" \
+		INSTALL_BIN_BASE_DIR="${D}/${bindir}"
+	done
+}

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

@@ -0,0 +1,22 @@
+LICENSE = "BSD-3-Clause"
+
+COMPATIBLE_MACHINE = "keystone"
+
+LIC_FILES_CHKSUM = "file://COPYING.txt;md5=b3315b8190036fe1c6a8263d02e15606"
+
+MMAP_LLD_GIT_URI = "git://git.ti.com/keystone-rtos/mmap-lld.git"
+MMAP_LLD_GIT_PROTOCOL = "git"
+MMAP_LLD_GIT_BRANCH = "master"
+MMAP_LLD_GIT_DESTSUFFIX = "git/ti/runtime/mmap"
+
+# Commit correspond to DEV.MMAP.02.00.00.07
+MMAP_LLD_SRCREV = "4426949ddfafdc8ea9408dbf5a642c3e840f4997"
+
+BRANCH="${MMAP_LLD_GIT_BRANCH}"
+SRC_URI = "${MMAP_LLD_GIT_URI};destsuffix=${MMAP_LLD_GIT_DESTSUFFIX};protocol=${MMAP_LLD_GIT_PROTOCOL};branch=${BRANCH}"
+SRCREV = "${MMAP_LLD_SRCREV}"
+
+PV = "2.0.0.7"
+INC_PR = "r0"
+
+S = "${WORKDIR}/git/ti/runtime/mmap"

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

@@ -0,0 +1,14 @@
+DESCRIPTION = "TI KEYSTONE mmap driver using Keystone MPAX Programming"
+include mmap-lld.inc
+
+PR = "${INC_PR}.0"
+
+DEPENDS="common-csl-ip"
+
+do_compile () {
+	make -f makefile_armv7 clean lib PDK_INSTALL_PATH=${STAGING_INCDIR}
+}
+
+do_install () {
+	make -f makefile_armv7 install PDK_INSTALL_PATH=${STAGING_INCDIR} INSTALL_INC_BASE_DIR=${D}/${includedir} INSTALL_LIB_BASE_DIR=${D}${libdir}
+}

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

@@ -0,0 +1,56 @@
+DESCRIPTION = "NETCP PA firmware for Keystone"
+
+LICENSE = "TI-TFL"
+LIC_FILES_CHKSUM = "file://LICENCE.ti-keystone;md5=3a86335d32864b0bef996bee26cc0f2c"
+
+PV = "3.0.1.17"
+PR = "r0"
+
+CLEANBROKEN = "1"
+
+COMPATIBLE_MACHINE = "k2hk-evm|k2l-evm|k2e"
+
+PACKAGE_ARCH = "${MACHINE_ARCH}"
+
+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}"
+
+S = "${WORKDIR}/git"
+
+FWBASENAME = " \
+ks2_pa_eg0_pdsp0 \
+ks2_pa_eg0_pdsp1 \
+ks2_pa_eg0_pdsp2 \
+ks2_pa_eg1_pdsp0 \
+ks2_pa_eg2_pdsp0 \
+ks2_pa_in0_pdsp0 \
+ks2_pa_in0_pdsp1 \
+ks2_pa_in1_pdsp0 \
+ks2_pa_in1_pdsp1 \
+ks2_pa_in2_pdsp0 \
+ks2_pa_in3_pdsp0 \
+ks2_pa_in4_pdsp0 \
+ks2_pa_in4_pdsp1 \
+ks2_pa_post_pdsp0 \
+ks2_pa_post_pdsp1 \
+"
+
+FWBASENAME_k2hk-evm = " \
+ks2_pa_pdsp0_classify1 \
+ks2_pa_pdsp1_classify1 \
+ks2_pa_pdsp2_classify1 \
+ks2_pa_pdsp3_classify2 \
+ks2_pa_pdsp4_pam \
+ks2_pa_pdsp5_pam \
+"
+
+do_install() {
+	install -d ${D}${base_libdir}/firmware
+	for f in ${FWBASENAME}; do
+		install -m 0644 ${S}/ti-keystone/$f.bin ${D}${base_libdir}/firmware/$f.bin
+	done
+}
+
+FILES_${PN} = "${base_libdir}/firmware"

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

@@ -0,0 +1,29 @@
+DESCRIPTION = "NETCP SA firmware for Keystone"
+
+LICENSE = "TI-TFL"
+LIC_FILES_CHKSUM = "file://LICENCE.ti-keystone;md5=3a86335d32864b0bef996bee26cc0f2c"
+
+PV = "1.0.0"
+PR = "r0"
+
+CLEANBROKEN = "1"
+
+COMPATIBLE_MACHINE = "keystone"
+
+PACKAGE_ARCH = "${MACHINE_ARCH}"
+
+SRCREV = "588f602a21c62f90b1f4318b881c80a1e711317a"
+BRANCH ?= "ti-linux-firmware-4.1.y"
+
+SRC_URI = "git://git.ti.com/processor-firmware/ti-linux-firmware.git;protocol=git;branch=${BRANCH}"
+
+S = "${WORKDIR}/git"
+
+TARGET = "sa_mci.fw"
+
+do_install() {
+	install -d ${D}${base_libdir}/firmware
+	install -m 0644 ${S}/ti-keystone/${TARGET} ${D}${base_libdir}/firmware/${TARGET}
+}
+
+FILES_${PN} = "${base_libdir}/firmware"

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

@@ -0,0 +1,27 @@
+DESCRIPTION = "TI Network Abstraction Layer unit test binaries"
+
+DEPENDS = "common-csl-ip rm-lld qmss-lld hplib pa-lld sa-lld pktlib nwal-lld"
+
+include nwal-lld.inc
+
+PR = "${INC_PR}.0"
+
+EXTRA_OEMAKE += "-f makefile_armv7 PDK_INSTALL_PATH=${STAGING_INCDIR}"
+
+do_compile () {
+	for device in ${DEVICELIST}
+	do
+		for choice in ${CHOICELIST}
+		do
+			oe_runmake clean NWAL_INC_DIR=${BASEDIR} NWAL_SRC_DIR=${S} USEDYNAMIC_LIB="$choice" DEVICE="$device"
+			oe_runmake tests NWAL_INC_DIR=${BASEDIR} NWAL_SRC_DIR=${S} USEDYNAMIC_LIB="$choice" DEVICE="$device"
+		done
+	done
+}
+
+do_install () {
+	for device in ${DEVICELIST}
+	do
+		oe_runmake installbin INSTALL_INC_BASE_DIR=${D}${includedir} INSTALL_LIB_BASE_DIR=${D}${libdir} INSTALL_BIN_BASE_DIR=${D}${bindir} DEVICE="$device"
+	done
+}

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

@@ -0,0 +1,28 @@
+LICENSE = "BSD-3-Clause"
+LIC_FILES_CHKSUM = "file://${WORKDIR}/git/COPYING.txt;md5=b7982a377c680ad71ca2fbb735982462"
+
+COMPATIBLE_MACHINE = "keystone"
+PACKAGE_ARCH = "${MACHINE_ARCH}"
+
+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.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.11A"
+INC_PR = "r0"
+
+BASEDIR = "${WORKDIR}/git"
+S = "${BASEDIR}/ti/drv/nwal"
+
+DEVICELIST_k2hk-evm = "k2h k2k"
+DEVICELIST_k2l-evm  = "k2l"
+DEVICELIST_k2e  = "k2e"
+
+CHOICELIST = "yes no"

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

@@ -0,0 +1,27 @@
+DESCRIPTION = "TI Network abstraction layer LLD library "
+
+DEPENDS = "common-csl-ip rm-lld qmss-lld hplib pa-lld sa-lld pktlib"
+
+include nwal-lld.inc
+
+PR = "${INC_PR}.0"
+
+EXTRA_OEMAKE += "-f makefile_armv7 PDK_INSTALL_PATH=${STAGING_INCDIR}"
+
+do_compile () {
+	for device in ${DEVICELIST}
+	do
+		for choice in ${CHOICELIST}
+		do
+			oe_runmake clean NWAL_INC_DIR=${BASEDIR} NWAL_SRC_DIR=${S} USEDYNAMIC_LIB="$choice" DEVICE="$device"
+			oe_runmake lib NWAL_INC_DIR=${BASEDIR} NWAL_SRC_DIR=${S} USEDYNAMIC_LIB="$choice" DEVICE="$device"
+		done
+	done
+}
+
+do_install () {
+	for device in ${DEVICELIST}
+	do
+		oe_runmake install INSTALL_INC_BASE_DIR=${D}${includedir} INSTALL_LIB_BASE_DIR=${D}${libdir} INSTALL_BIN_BASE_DIR=${D}${bindir} DEVICE="$device"
+	done
+}

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/pa-lld-test_git.bb

@@ -0,0 +1,28 @@
+DESCRIPTION = "TI PA LLD unit test and example binaries"
+
+DEPENDS = "common-csl-ip pa-lld cppi-lld qmss-lld sa-lld"
+
+include pa-lld.inc
+
+PR = "${INC_PR}.1"
+
+CHOICELIST = "yes no"
+
+do_compile () {
+# Now build the lld unit test examples
+	for device in ${DEVICELIST}
+	do
+	make -f makefile_armv7 clean PDK_INSTALL_PATH=${STAGING_INCDIR} DEVICE="$device" PA_SRC_DIR=${S}
+		for choice in ${CHOICELIST}
+		do
+			make -f makefile_armv7 tests examples PDK_INSTALL_PATH=${STAGING_INCDIR} DEVICE="$device" PA_SRC_DIR=${S} USEDYNAMIC_LIB="$choice"
+		done
+	done
+}
+
+do_install () {
+	for device in ${DEVICELIST}
+	do
+		make -f makefile_armv7 installbin PDK_INSTALL_PATH=${STAGING_INCDIR} DEVICE="$device" PA_SRC_DIR=${S} INSTALL_BIN_BASE_DIR=${D}${bindir}
+	done
+}

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

@@ -0,0 +1,32 @@
+LICENSE = "BSD-3-Clause & TI-TFL"
+LIC_FILES_CHKSUM = "file://${WORKDIR}/git/ti/drv/pa/COPYING.txt;md5=cd04fb087063a2a82c4ce61983836871"
+
+COMPATIBLE_MACHINE = "keystone"
+PACKAGE_ARCH = "${MACHINE_ARCH}"
+
+PA_LLD_GIT_URI = "git://git.ti.com/keystone-rtos/pa-lld.git"
+PA_LLD_GIT_PROTOCOL = "git"
+PA_LLD_GIT_BRANCH = "master"
+PA_LLD_GIT_DESTSUFFIX = "git/ti/drv/pa"
+
+# Below Commit ID corresponds to "DEV.PA_LLD.03.00.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}"
+SRCREV = "${PA_LLD_SRCREV}"
+
+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 = "k2e"
+
+LIBPA = "libpa"
+LIBPA_k2hk-evm = "libpa"
+LIBPA_k2e = "libpa2"
+LIBPA_k2l-evm = "libpa2"

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

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

recipes-bsp/pktlib/pktlib-rtos_git.bb

@@ -0,0 +1,13 @@
+inherit ti-pdk
+require pktlib.inc
+
+PR = "${INC_PR}.0"
+
+DEPENDS_append = " rm-lld-rtos \
+                   qmss-lld-rtos \
+                   cppi-lld-rtos \
+"
+
+XDCARGS_k2hk-evm = "k2h k2k"
+XDCARGS_k2e = "k2e"
+XDCARGS_k2l-evm = "k2l"

recipes-bsp/pktlib/pktlib.inc

@@ -0,0 +1,24 @@
+DESCRIPTION = "Provides library for handling packet descriptors for keystone devices"
+LICENSE = "BSD-3-Clause"
+LIC_FILES_CHKSUM = "file://docs/Doxyfile;md5=91d01dc3788e1f405f000b2089191a0a"
+
+COMPATIBLE_MACHINE = "keystone"
+PACKAGE_ARCH = "${MACHINE_ARCH}"
+
+PKTLIB_GIT_URI = "git://git.ti.com/keystone-rtos/pktlib.git"
+PKTLIB_GIT_PROTOCOL = "git"
+PKTLIB_GIT_BRANCH = "master"
+PKTLIB_GIT_DESTSUFFIX = "git/ti/runtime/pktlib"
+
+# Below commit ID corresponds to "DEV.PKTLIB.2.1.0.7"
+PKTLIB_SRCREV = "22f66931964c25f83d1971f7eb78902d10c17d8a"
+
+BRANCH = "${PKTLIB_GIT_BRANCH}"
+# Don't use DESTSUFFIX when cloning since repo contains ti/runtime/pktlib directory tree
+SRC_URI = "${PKTLIB_GIT_URI};protocol=${PKTLIB_GIT_PROTOCOL};branch=${BRANCH}"
+
+SRCREV = "${PKTLIB_SRCREV}"
+PV = "2.1.0.7"
+INC_PR = "r2"
+
+S = "${WORKDIR}/${PKTLIB_GIT_DESTSUFFIX}"

recipes-bsp/pktlib/pktlib_git.bb

@@ -0,0 +1,18 @@
+DESCRIPTION = "Provides library for handling packet descriptors for keystone devices"
+LIC_FILES_CHKSUM = "file://${WORKDIR}/git/COPYING.txt;md5=b7982a377c680ad71ca2fbb735982462"
+
+DEPENDS = "common-csl-ip rm-lld qmss-lld cppi-lld"
+
+include pktlib.inc
+
+PR = "${INC_PR}.1"
+
+EXTRA_OEMAKE += "-f makefile_armv7 PDK_INSTALL_PATH=${STAGING_INCDIR} INSTALL_INC_BASE_DIR=${D}${includedir} INSTALL_LIB_BASE_DIR=${D}${libdir}"
+
+do_compile () {
+	oe_runmake lib
+}
+
+do_install () {
+	oe_runmake install
+}

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