libgbm: add latest version 10.0.0 from meta-arago

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

classes/ti-pdk.bbclass

@@ -0,0 +1,66 @@
+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"
+
+DEPENDS_append_omap-a15 = " ti-cgt6x-native ti-ccsv6-native"
+DEPENDS_append_keystone = " ti-cgt6x-native"
+
+S = "${WORKDIR}/git"
+B = "${WORKDIR}/build"
+
+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"
+
+PARALLEL_XDC = "--jobs=${BB_NUMBER_THREADS}"
+
+do_configure() {
+    BUILD_DIR=${B}/`get_build_dir_bash`
+
+    mkdir -p ${BUILD_DIR}
+    cp -r ${S}/* ${BUILD_DIR}
+    cd ${BUILD_DIR}
+
+    sed -i "s/\ \"\.\\\\\\\\\"\ +//" src/Module.xs
+    find -name "*.xs" -exec sed -i "s/ofd6x\.exe/ofd6x/" {} \;
+    find -name "*.xs" -exec sed -i "s/sectti\.exe/sectti/" {} \;
+    find -name "*.xs" -exec sed -i "/\.chm/d" {} \;
+    find -name "*.xs" -exec sed -i "s/pasm\_dos/pasm\_linux/" {} \;
+}
+
+do_compile() {
+    ${XDC_INSTALL_DIR}/xdc clean ${PARALLEL_XDC} -PR .
+    ${XDC_INSTALL_DIR}/xdc all ${PARALLEL_XDC} XDCARGS="${XDCARGS}" ROOTDIR="${ROOTDIR}" -PR .
+    ${XDC_INSTALL_DIR}/xdc release XDCARGS="${XDCARGS}" -PR .
+}
+
+do_install () {
+    install -d ${D}${PDK_INSTALL_DIR_RECIPE}/packages
+    find -name "*.tar" -exec tar xf {} -C ${D}${PDK_INSTALL_DIR_RECIPE}/packages \;
+}
+
+FILES_${PN} += "${PDK_INSTALL_DIR_RECIPE}/packages"

conf/layer.conf

@@ -11,10 +11,17 @@ BBFILE_PRIORITY_meta-ti = "6"
 LICENSE_PATH += "${LAYERDIR}/licenses"
 
 SIGGEN_EXCLUDERECIPES_ABISAFE += " \
+    omapdrm-pvr \
+    omap5-sgx-ddk-um-linux \
     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/am335x-evm.conf

@@ -6,12 +6,14 @@ 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 += "ubi tar.gz tar.xz"
 
-SERIAL_CONSOLE = "115200 ttyO0"
+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 +26,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 4200"
+MKUBIFS_ARGS = "-F -m 2048 -e 126976 -c 4600"
 
 # do ubiattach /dev/ubi_ctrl -m 7 -O 2048
 # from dmesg:

conf/machine/am3517-evm.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 += "ubi tar.gz"

conf/machine/am37x-evm.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 += "ubi tar.gz"

conf/machine/am437x-evm.conf

@@ -6,10 +6,10 @@ 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 += "ubi tar.gz tar.xz"
 
 SERIAL_CONSOLE = "115200 ttyO0"
 
@@ -24,7 +24,7 @@ SERIAL_CONSOLE = "115200 ttyO0"
 # UBI: logical eraseblock size:    253952 bytes
 # from ubiattach stdout:
 # UBI device number 0, total 994 LEBs
-MKUBIFS_ARGS = "-F -m 4096 -e 253952 -c 1918"
+MKUBIFS_ARGS = "-F -m 4096 -e 253952 -c 2200"
 
 # do ubiattach /dev/ubi_ctrl -m 11 -O 4096
 # from dmesg:

conf/machine/am437x-hs-evm.conf

@@ -0,0 +1,7 @@
+#@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"

conf/machine/am57xx-evm.conf

@@ -6,11 +6,11 @@ require conf/machine/include/dra7xx.inc
 
 MACHINE_FEATURES += "touchscreen"
 
-IMAGE_FSTYPES += "ubi tar.gz"
+IMAGE_FSTYPES += "ubi tar.gz tar.xz"
 
 SERIAL_CONSOLE = "115200 ttyO2"
 
-UBOOT_MACHINE = "beagle_x15_config"
+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
@@ -23,7 +23,7 @@ UBOOT_MACHINE = "beagle_x15_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 5120"
+MKUBIFS_ARGS = "-F -m 2048 -e 126976 -c 8192"
 
 # do ubiattach /dev/ubi_ctrl -m 7 -O 2048
 # from dmesg:

conf/machine/beagleboard.conf

@@ -5,7 +5,7 @@
 require conf/machine/include/omap3.inc
 
 # Only has DVI connector for external screen
-GUI_MACHINE_CLASS = "bigscreen"
+MACHINE_GUI_CLASS = "bigscreen"
 
 IMAGE_FSTYPES += "tar.gz ubi"
 EXTRA_IMAGECMD_jffs2 = "-lnp"

conf/machine/beaglebone.conf

@@ -5,7 +5,7 @@
 require conf/machine/include/ti33x.inc
 
 # Only has DVI connector for external screen
-GUI_MACHINE_CLASS = "bigscreen"
+MACHINE_GUI_CLASS = "bigscreen"
 
 IMAGE_FSTYPES += "tar.gz"
 

conf/machine/dra7xx-evm.conf

@@ -6,7 +6,7 @@ require conf/machine/include/dra7xx.inc
 
 MACHINE_FEATURES += "touchscreen"
 
-IMAGE_FSTYPES += "ubi tar.gz"
+IMAGE_FSTYPES += "ubi tar.gz tar.xz"
 
 SERIAL_CONSOLE = "115200 ttyO0"
 
@@ -23,7 +23,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 5120"
+MKUBIFS_ARGS = "-F -m 2048 -e 126976 -c 8192"
 
 # do ubiattach /dev/ubi_ctrl -m 7 -O 2048
 # from dmesg:

conf/machine/dra7xx-hs-evm.conf

@@ -0,0 +1,7 @@
+#@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"

conf/machine/include/keystone.inc

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

conf/machine/include/omap-a15.inc

@@ -24,7 +24,7 @@ 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.

conf/machine/include/omap3.inc

@@ -14,7 +14,7 @@ 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 = "r126"

conf/machine/include/ti33x.inc

@@ -14,7 +14,7 @@ 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 = "r22"

conf/machine/include/ti43x.inc

@@ -14,7 +14,7 @@ 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 = "r3"

conf/machine/k2e-evm.conf

@@ -8,7 +8,7 @@ UBOOT_MACHINE = "k2e_evm_config"
 
 BOOT_MONITOR_MAKE_TARGET = "k2e"
 
-IMAGE_FSTYPES += "ubi tar.gz cpio"
+IMAGE_FSTYPES += "ubi tar.gz tar.xz cpio"
 
 SERIAL_CONSOLE = "115200 ttyS0"
 

conf/machine/k2g-evm.conf

@@ -0,0 +1,32 @@
+#@TYPE: Machine
+#@NAME: Keystone 2 K2G machine
+#@DESCRIPTION: Machine configuration for the TI Keystone 2 K2G EVM
+
+require conf/machine/include/keystone.inc
+
+MACHINE_FEATURES += "alsa"
+
+UBOOT_MACHINE = "k2g_evm_config"
+
+BOOT_MONITOR_MAKE_TARGET = "k2g"
+
+IMAGE_FSTYPES += "ubi tar.gz tar.xz cpio"
+
+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 1926"
+
+# 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/k2hk-evm.conf

@@ -8,7 +8,7 @@ UBOOT_MACHINE = "k2hk_evm_config"
 
 BOOT_MONITOR_MAKE_TARGET = "k2hk"
 
-IMAGE_FSTYPES += "ubi tar.gz cpio"
+IMAGE_FSTYPES += "ubi tar.gz tar.xz cpio"
 
 SERIAL_CONSOLE = "115200 ttyS0"
 
@@ -20,7 +20,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 3900"
 
 # do ubiattach /dev/ubi_ctrl -m 4
 # from dmesg:

conf/machine/k2l-evm.conf

@@ -8,7 +8,7 @@ UBOOT_MACHINE = "k2l_evm_config"
 
 BOOT_MONITOR_MAKE_TARGET = "k2l"
 
-IMAGE_FSTYPES += "ubi tar.gz cpio"
+IMAGE_FSTYPES += "ubi tar.gz tar.xz cpio"
 
 SERIAL_CONSOLE = "115200 ttyS0"
 

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"

conf/machine/omap5-evm.conf

@@ -19,7 +19,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:

conf/machine/pandaboard.conf

@@ -4,7 +4,7 @@
 
 require conf/machine/include/omap4.inc
 
-GUI_MACHINE_CLASS = "bigscreen"
+MACHINE_GUI_CLASS = "bigscreen"
 
 IMAGE_FSTYPES += "tar.gz"
 

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

@@ -5,37 +5,42 @@ 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}"
+SRC_URI = "git://git.ti.com/processor-firmware/ks2-boot-monitor.git;protocol=git;branch=${BRANCH}"
 
-PV = "2.0+git${SRCPV}"
-PR = "r4"
+PV = "3.0+git${SRCPV}"
+PR = "r1"
 
 BRANCH = "master"
 
 S = "${WORKDIR}/git"
 
-#Tag "K2_BM_15.07"
-SRCREV = "62d198687a34a9df375c1686d75ad4f85515dcf9"
+SRCREV = "035329caed63abe7193c855ad5d561ae783b19d7"
 
-BOOT_MONITOR_BINARY ?= "skern.bin"
-BOOT_MONITOR_IMAGE  ?= "skern-${MACHINE}.bin"
+BOOT_MONITOR_IMAGE  ?= "skern-${BOOT_MONITOR_MAKE_TARGET}.bin"
 
 FLOATABI = "${@base_contains("TUNE_FEATURES", "vfp", base_contains("TUNE_FEATURES", "callconvention-hard", " -mfloat-abi=hard", " -mfloat-abi=softfp", d), "" ,d)}"
 
 EXTRA_OEMAKE = "CROSS_COMPILE=${TARGET_PREFIX} CC="${TARGET_PREFIX}gcc ${TOOLCHAIN_OPTIONS} ${FLOATABI}" LD="${TARGET_PREFIX}gcc ${TOOLCHAIN_OPTIONS} ${FLOATABI}""
 
+FILES_${PN} = "/boot"
+
+inherit deploy
+
 do_compile () {
 	unset LDFLAGS
 	unset CFLAGS
 	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/cm3-pm-firmware/am33x-cm3_git.bb

@@ -4,13 +4,13 @@ LICENSE = "BSD-3-Clause"
 LIC_FILES_CHKSUM = "file://License.txt;md5=7bdc54a749ab7a7dea999d25d99a41b8"
 
 PV = "1.9.0"
-PR = "r0"
+PR = "r1"
 PE = "1"
 
 SRCREV = "d85e6a17da1025adac9ab7f97dd7aa2a58c517ce"
 BRANCH ?= "ti-v3.14.y"
 
-SRC_URI = "git://git.ti.com/ti-cm3-pm-firmware/amx3-cm3.git;protocol=git;branch=${BRANCH}"
+SRC_URI = "git://git.ti.com/processor-firmware/ti-amx3-cm3-pm-firmware.git;protocol=git;branch=${BRANCH}"
 
 S = "${WORKDIR}/git"
 

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

@@ -0,0 +1,28 @@
+DESCRIPTION = "Cortex-M3 binary blob for suspend-resume"
+
+LICENSE = "BSD-3-Clause"
+LIC_FILES_CHKSUM = "file://License.txt;md5=7bdc54a749ab7a7dea999d25d99a41b8"
+
+PV = "1.9.1"
+PR = "r2"
+
+SRCREV = "730f0695ca2dda65abcff5763e8f108517bc0d43"
+BRANCH ?= "ti-v4.1.y"
+
+SRC_URI = "git://git.ti.com/processor-firmware/ti-amx3-cm3-pm-firmware.git;protocol=git;branch=${BRANCH}"
+
+S = "${WORKDIR}/git"
+
+FLOATABI = "${@base_contains("TUNE_FEATURES", "vfp", base_contains("TUNE_FEATURES", "callconvention-hard", " -mfloat-abi=hard", " -mfloat-abi=softfp", d), "" ,d)}"
+
+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,7 +3,7 @@ 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"
+MACHINE_KERNEL_PR_append = "b"
 PR = "${MACHINE_KERNEL_PR}"
 
 inherit module
@@ -11,4 +11,4 @@ inherit module
 EXTRA_OEMAKE += '-f lu.mak KERNEL_INSTALL_DIR="${STAGING_KERNEL_DIR}" TOOLCHAIN_PREFIX="${TOOLCHAIN_PREFIX}" EXEC_DIR="${D}/lib/modules/${KERNEL_VERSION}/extra"'
 MAKE_TARGETS = "module"
 
-module_autoload_cmemk = "cmemk"
+KERNEL_MODULE_AUTOLOAD += "cmemk"

recipes-bsp/cmem/cmem.inc

@@ -4,10 +4,10 @@ LICENSE = "GPLv2"
 LIC_FILES_CHKSUM = "file://include/ti/cmem.h;beginline=1;endline=30;md5=9b745e2765a6ba8a636c91aed4b02ac1"
 
 BRANCH ?= "lu-next"
-# This corresponds to version 4.10.02.03
-SRCREV = "d47ac635699da6bee6daff31b87b0123e13af4ac"
+# This corresponds to version 4.10.02.05_eng
+SRCREV = "8df44102413c2d653341c5b7e6caee882e206d8c"
 
-PV = "4.10.02.03+git${SRCPV}"
+PV = "4.10.02.05+git${SRCPV}"
 
 SRC_URI = "git://git.ti.com/ipc/ludev.git;protocol=git;branch=${BRANCH}"
 

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

@@ -1,36 +1,26 @@
 require common-csl-ip.inc
+PR = "${INC_PR}.2"
 
-require recipes-ti/includes/ti-paths.inc
-require recipes-ti/includes/ti-staging.inc
+PACKAGE_ARCH = "${MACHINE_ARCH}"
 
-PR = "r1"
+inherit ti-pdk
 
-DEPENDS = "ti-xdctools ti-cgt6x-native ti-sysbios"
+DEPENDS_remove = "${PN}"
 
-S = "${WORKDIR}/ti/csl"
+XDCARGS_ti33x = "am335x"
+XDCARGS_ti43x = "am437x"
+XDCARGS_omap-a15 = "am571x am572x"
+XDCARGS_k2hk-evm = "k2h k2k"
+XDCARGS_k2l-evm = "k2l"
+XDCARGS_k2e-evm = "k2e"
+XDCARGS_k2g-evm = "k2g"
 
-export C6X_GEN_INSTALL_PATH="${STAGING_DIR_NATIVE}/usr"
-export XDCCGROOT="${STAGING_DIR_NATIVE}/usr/share/ti/cgt-c6x"
-export XDCPATH="${XDCCGROOT}/include;${XDC_INSTALL_DIR}/packages;${SYSBIOS_INSTALL_DIR}/packages"
+do_configure_append() {
+    # Create empty makefile
+    # If libraries are supported for this device, then this will be overwritten
+    cat > ${BUILD_DIR}/makefile << __EOF__
+# Nothing to do
+all:
 
-do_configure() {
-    sed -i "s/\ \"\.\\\\\\\\\"\ +//" src/Module.xs
-    find -name "*.xs" -exec sed -i "s/ofd6x\.exe/ofd6x/" {} \;
-    find -name "*.xs" -exec sed -i "s/sectti\.exe/sectti/" {} \;
-    find -name "*.xs" -exec sed -i "/\.chm/d" {} \;
-    find -name "*.xs" -exec sed -i "s/pasm\_dos/pasm\_linux/" {} \;
+__EOF__
 }
-
-do_compile() {
-    ${XDC_INSTALL_DIR}/xdc .make
-    ${XDC_INSTALL_DIR}/xdc clean
-    ${XDC_INSTALL_DIR}/xdc release
-}
-
-do_install () {
-    install -d ${D}${PDK_INSTALL_DIR_RECIPE}/packages
-    find -name "*.tar" -exec tar xf {} -C ${D}${PDK_INSTALL_DIR_RECIPE}/packages \;
-}
-
-ALLOW_EMPTY_${PN} = "1"
-FILES_${PN}-dev += "${PDK_INSTALL_DIR_RECIPE}/packages"

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

@@ -3,16 +3,20 @@ LICENSE = "BSD-3-Clause"
 LIC_FILES_CHKSUM = "file://COPYING.txt;md5=5857833e20836213677fac33f9aded21"
 
 COMPATIBLE_MACHINE = "keystone|dra7xx"
-PACKAGE_ARCH = "${MACHINE_ARCH}"
 
+PV = "3.3.0.2C"
+INC_PR = "r0"
 
-BRANCH="master"
-BRANCH_dra7xx = "releases/PROCESSOR-SDK.01.00.00"
+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"
 
-SRC_URI = "git://git.ti.com/keystone-rtos/common-csl-ip.git;protocol=git;branch=${BRANCH};destsuffix=${S}"
+# commit ID corresponds to DEV.CSL_PROCESSOR-SDK.03.03.00.02C
+CSL_SRCREV = "dc8aac00e86cd434865d750666ac551f2e238263"
 
-# commit ID corresponds to DEV.CSL_KEYSTONE2.02.01.00.07A
-SRCREV = "c78867df9165fdf8042fb692fcea776fc0102326"
+BRANCH="${CSL_GIT_BRANCH}"
+SRC_URI = "${CSL_GIT_URI};protocol=${CSL_GIT_PROTOCOL};branch=${BRANCH};destsuffix=${CSL_GIT_DESTSUFFIX}"
+SRCREV = "${CSL_SRCREV}"
 
-# commit ID corresponds to PROCESSOR-SDK-ALPHA-1
-SRCREV_dra7xx = "37c5311ddf289f83b1432a9422816722d264bf55"
+S = "${WORKDIR}/${CSL_GIT_DESTSUFFIX}"

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

@@ -1,10 +1,14 @@
 require common-csl-ip.inc
 
-PR = "r3"
+PR = "${INC_PR}.0"
 
 ALLOW_EMPTY_${PN} = "1"
 
-S = "${WORKDIR}/git"
+CLEANBROKEN = "1"
+
+do_compile() {
+    :
+}
 
 do_install () {
     install -d ${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-evm = "k2e"
+XDCARGS_k2l-evm = "k2l"
+XDCARGS_k2g-evm = "k2g"

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

@@ -1,9 +1,10 @@
 DESCRIPTION = "TI CPPI low level driver unit test and example binaries"
-COMPATIBLE_MACHINE = "keystone"
 DEPENDS = "common-csl-ip rm-lld cppi-lld qmss-lld"
 
 include cppi-lld.inc
 
+PR = "${INC_PR}.0"
+
 CHOICELIST = "yes no"
 
 do_compile () {

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

@@ -1,15 +1,27 @@
 LICENSE = "BSD-3-Clause"
 LIC_FILES_CHKSUM = "file://${WORKDIR}/git/ti/drv/cppi/COPYING.txt;md5=e8f6789acdcda76d02ed9203fc2e603d"
 
-BRANCH = "master"
-SRC_URI = "git://git.ti.com/keystone-rtos/cppi-lld.git;destsuffix=git/ti/drv/cppi;protocol=git;branch=${BRANCH}"
+COMPATIBLE_MACHINE = "keystone"
+PACKAGE_ARCH = "${MACHINE_ARCH}"
 
-# Below Commit ID corresponds to "DEV.CPPI_LLD.02.01.00.08"
-SRCREV = "320af092dc382af52b9e68f14ca8acd5c1c467c1"
-PV = "02.01.00.09"
-PR = "r1"
+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-evm  = "k2e"
 
-BASEDIR = "${WORKDIR}/git"
-S = "${BASEDIR}/ti/drv/cppi"
+S = "${WORKDIR}/${CPPI_LLD_GIT_DESTSUFFIX}"

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

@@ -1,16 +1,10 @@
 DESCRIPTION = "TI CPPI Module low level driver"
-COMPATIBLE_MACHINE = "keystone"
 
 DEPENDS = "common-csl-ip rm-lld qmss-lld"
 
 include cppi-lld.inc
 
-SRC_URI += "file://init_cppi.sh"
-
-inherit update-rc.d
-
-INITSCRIPT_NAME = "init_cppi.sh"
-INITSCRIPT_PARAMS = "defaults 10"
+PR = "${INC_PR}.1"
 
 do_compile () {
 #   Now build the lld in the updated directory
@@ -23,11 +17,15 @@ do_compile () {
 
 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}
-    ln -sf libcppi_k2h.so.1.0.0 libcppi_device.so.1
+
+    # 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
-#   Copy init scripts
-    install -d ${D}${sysconfdir}/init.d/
-    install -c -m 755 ${WORKDIR}/init_cppi.sh ${D}${sysconfdir}/init.d/${INITSCRIPT_NAME}
 }

recipes-bsp/cppi-lld/files/init_cppi.sh

@@ -1,47 +0,0 @@
-#*
-#* Copyright (C) 2015 Texas Instruments Incorporated - http://www.ti.com/
-#*
-#*
-#*  Redistribution and use in source and binary forms, with or without
-#*  modification, are permitted provided that the following conditions
-#*  are met:
-#*
-#*    Redistributions of source code must retain the above copyright
-#*    notice, this list of conditions and the following disclaimer.
-#*
-#*    Redistributions in binary form must reproduce the above copyright
-#*    notice, this list of conditions and the following disclaimer in the
-#*    documentation and/or other materials provided with the
-#*    distribution.
-#*
-#*    Neither the name of Texas Instruments Incorporated nor the names of
-#*    its contributors may be used to endorse or promote products derived
-#*    from this software without specific prior written permission.
-#*
-
-#! /bin/sh
-compatible=$(cat /proc/device-tree/compatible)
-
-cd /usr/lib
-case "$compatible" in
-	*k2hk*)
-		device=k2hk
-		ln -sf libcppi_k2h.so.1.0.0 libcppi_device.so.1
-	;;
-	*k2l*)
-		device=k2l
-		ln -sf libcppi_k2l.so.1.0.0 libcppi_device.so.1
-	;;
-	*k2e*)
-	device=k2e
-		ln -sf libcppi_k2e.so.1.0.0 libcppi_device.so.1
-	;;
-	*)
-		device=unknown
-	;;
-esac
-
-if [ $device != unknown ]; then
-	ln -sf libcppi_device.so.1 libcppi_device.so
-	echo cppi library link established for device : $device
-fi

recipes-bsp/cuia/cuia_1.0.0.13.bb

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

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

@@ -4,6 +4,8 @@ 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 () {

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

@@ -1,13 +1,22 @@
 LICENSE = "BSD-3-Clause"
 
 LIC_FILES_CHKSUM = "file://COPYING.txt;md5=1f4217b705bf98762a302fd720649dcc"
-BRANCH = "master"
-SRC_URI = "git://git.ti.com/keystone-rtos/dfe-lld.git;destsuffix=git/ti/drv/dfe;protocol=git;branch=${BRANCH}"
-# The following commit correspond to DEV.DFE_LLD.01.00.00.04C
-SRCREV = "62da141c1cf6224d24161f0c020091043a3d7c82"
 
-PV = "1.0.0.4"
+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"
+
+# The following commit correspond to DEV.DFE_LLD.01.00.00.07
+DFE_LLD_SRCREV = "7a85310ee5e406f50a4c118610e07aade7d3cee2"
+
+BRANCH = "${DFE_LLD_GIT_BRANCH}"
+SRC_URI = "${DFE_LLD_GIT_URI};destsuffix=${DFE_LLD_GIT_DESTSUFFIX};protocol=${DFE_LLD_GIT_PROTOCOL};branch=${BRANCH}"
+SRCREV = "${DFE_LLD_SRCREV}"
+
+PV = "1.0.0.7"
+INC_PR = "r0"
 
 COMPATIBLE_MACHINE = "k2l-evm"
 
-S = "${WORKDIR}/git/ti/drv/dfe"
+S = "${WORKDIR}/${DFE_LLD_GIT_DESTSUFFIX}"

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

@@ -4,6 +4,8 @@ DEPENDS = "common-csl-ip"
 
 include dfe-lld.inc
 
+PR = "${INC_PR}.0"
+
 EXTRA_OEMAKE = "-f makefile_armv7 PDK_INSTALL_PATH=${STAGING_INCDIR}"
 
 do_compile () {

recipes-bsp/dspdce-fw/dspdce-fw_1.00.00.05.bb

@@ -1,26 +0,0 @@
-DESCRIPTION = "Firmware for DSP for an example application called copycodectest"
-LICENSE = "TI-TSPA"
-LIC_FILES_CHKSUM = "file://DSPDCE-${PV}-Manifest.doc;md5=386d1802eefc2fcf00ab01a5b4556277"
-
-COMPATIBLE_MACHINE = "dra7xx-evm"
-PACKAGE_ARCH = "${MACHINE_ARCH}"
-
-SRC_URI = "http://downloads.ti.com/dsps/dsps_public_sw/glsdk/dspdce/1_00_00_05/exports/dspdce-${MACHINE}-1.00.00.05.tar.gz;protocol=ftp"
-
-S = "${WORKDIR}/dspdce-${MACHINE}-${PV}"
-
-SRC_URI[md5sum] = "4f3d5c6ef088019aa4804eaaedc8e949"
-SRC_URI[sha256sum] = "8d99c4f149613448a6d72c62a18cc7445c63c687b786658da1762c4e1c03a6a0"
-
-TARGET = "dra7-dsp1-fw.xe66"
-
-do_install() {
-        mkdir -p ${D}${base_libdir}/firmware
-        cp ${S}/firmware/${TARGET} ${D}${base_libdir}/firmware/${TARGET}
-}
-
-FILES_${PN} += "${base_libdir}/firmware/${TARGET}"
-
-INSANE_SKIP_${PN} = "arch"
-
-PR = "r1"

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 = "88705fd4584edd1289e4bb50658def936de90433"
+
+PV = "1.00.00.06"
+
+S = "${WORKDIR}/git"
+
+require recipes-ti/includes/ti-paths.inc
+require recipes-ti/includes/ti-staging.inc
+
+PR = "r2"
+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

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

recipes-bsp/dsptop/dsptop.inc

@@ -1,6 +1,6 @@
-# This corresponds to version 1.2.0
-SRCREV = "9893486936626e2d3de721f429a67fcac8a68151"
-PV = "1.2.0"
+# This corresponds to version 1.3.0
+SRCREV = "4d92879b632ba70402b61fa65cc58f5373eb5217"
+PV = "1.3.0"
 INC_PR = "r0"
 
 SRC_URI = "git://git.ti.com/sdo-emu/dsptop.git;protocol=git;branch=${BRANCH}"

recipes-bsp/dsptop/dsptop_git.bb

@@ -4,7 +4,7 @@ LIC_FILES_CHKSUM = "file://debian/copyright;md5=309825aa8f5edfcf2c44912ac094b979
 
 DEPENDS = "libulm ncurses"
 
-PR = "${INC_PR}.0"
+PR = "${INC_PR}.1"
 
 S = "${WORKDIR}/git/dsptop"
 
@@ -22,6 +22,7 @@ COMPATIBLE_MACHINE = "dra7xx|keystone"
 PACKAGE_ARCH = "${MACHINE_ARCH}"
 
 RDEPENDS_${PN} = "debugss-module-drv"
+RDEPENDS_${PN}_append_keystone = " temperature-module-drv"
 
 include dsptop.inc
 

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

@@ -2,28 +2,57 @@ require edma3-lld.inc
 require recipes-ti/includes/ti-paths.inc
 require recipes-ti/includes/ti-staging.inc
 
-PR = "r1"
+PR = "${INC_PR}.0"
 
-DEPENDS = "ti-cgt6x-native ti-sysbios ti-xdctools"
+DEPENDS = "ti-sysbios ti-xdctools gcc-arm-none-eabi-native ti-ccsv6-native ti-cgt6x-native"
 
-COMPATIBLE_MACHINE = "dra7xx|keystone"
+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 \
 "
 
-PLATFORMLIST_dra7xx = " \
-        tda2xx-evm \
-        dra72x-evm \
-        am571x-evm \
-        am572x-evm \
+TARGETLIST_keystone = " \
+        66 \
+        a15 \
 "
 
+FORMAT="ELF"
+
 S = "${WORKDIR}/git"
 
 PARALLEL_MAKE = ""
@@ -34,7 +63,7 @@ export CGTOOLS = "${XDCCGROOT}"
 export CGTOOLS_ELF = "${XDCCGROOT}"
 export CODEGEN_PATH_DSP = "${XDCCGROOT}"
 export CODEGEN_PATH_DSPELF = "${XDCCGROOT}"
-export TMS470_CGTOOLS = "${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}"
@@ -44,10 +73,17 @@ export CROSSCC="${TARGET_PREFIX}gcc"
 export CROSSAR="${TARGET_PREFIX}ar"
 export CROSSLNK="${TARGET_PREFIX}gcc"
 
-
-EXTRA_OEMAKE += " -C ${S}/packages TARGET=66 FORMAT=ELF"
-
 do_configure () {
+    sed -i -e "s|_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
@@ -59,10 +95,15 @@ do_configure () {
 }
 
 do_compile () {
+    cd ${S}/packages
     for p in ${PLATFORMLIST}
     do
-        oe_runmake PLATFORM=${p}
+        for t in ${TARGETLIST}
+        do
+            make PLATFORM=${p} TARGET=${t} FORMAT=${FORMAT}
+        done
     done
+    sourceipk_do_create_srcipk
 }
 
 do_install () {
@@ -70,7 +111,7 @@ do_install () {
     cp -pPrf ${S}/* ${D}${EDMA3_LLD_INSTALL_DIR_RECIPE}
 }
 
-INSANE_SKIP_${PN}-dev = "arch"
+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

@@ -2,9 +2,16 @@ DESCRIPTION = "TI EDMA3 low level driver and test code"
 LICENSE = "BSD-3-Clause"
 LIC_FILES_CHKSUM = "file://COPYING.txt;md5=5bdceac872dffdec915b819654ee23ea"
 
-BRANCH = "master"
-SRC_URI = "git://git.ti.com/keystone-rtos/edma3_lld.git;protocol=git;branch=${BRANCH}"
-# The following commit corresponds to tag DEV_EDMA3_LLD_02_12_01_21_RC1
-SRCREV = "562cba36ccd53e89e6979e99a58374513b543f93"
+EDMA3_LLD_GIT_URI = "git://git.ti.com/keystone-rtos/edma3_lld.git"
+EDMA3_LLD_GIT_PROTOCOL = "git"
+EDMA3_LLD_GIT_BRANCH = "master"
 
-PV = "2.12.01.21"
+# The following commit corresponds to tag DEV_EDMA3_LLD_02_12_01_23A
+EDMA3_LLD_SRCREV = "84c84a82332b30ece3b00f7d769270466ae836e0"
+
+BRANCH = "${EDMA3_LLD_GIT_BRANCH}"
+SRC_URI = "${EDMA3_LLD_GIT_URI};protocol=${EDMA3_LLD_GIT_PROTOCOL};branch=${BRANCH}"
+SRCREV = "${EDMA3_LLD_SRCREV}"
+
+PV = "2.12.01.23"
+INC_PR = "r0"

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

@@ -1,15 +1,17 @@
 require edma3-lld.inc
 
-PR = "r0"
+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"

recipes-bsp/hplib/hplib-mod_git.bb

@@ -7,7 +7,7 @@ DEPENDS = "hplib"
 include hplib.inc
 
 # This package builds a kernel module, use kernel PR as base and append a local
-MACHINE_KERNEL_PR_append = "a"
+MACHINE_KERNEL_PR_append = "b"
 PR = "${MACHINE_KERNEL_PR}"
 
 S ="${WORKDIR}/git/ti/runtime/hplib/module"
@@ -18,3 +18,5 @@ inherit module
 do_install () {
 	oe_runmake install INSTALL_MOD_PATH="${D}"
 }
+
+KERNEL_MODULE_AUTOLOAD += "hplibmod"

recipes-bsp/hplib/hplib-test_git.bb

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

recipes-bsp/hplib/hplib.inc

@@ -1,10 +1,20 @@
 COMPATIBLE_MACHINE = "keystone"
+PACKAGE_ARCH = "${MACHINE_ARCH}"
 
-DEVICELIST = "k2h k2k k2l k2e"
+DEVICELIST_k2hk-evm = "k2h k2k"
+DEVICELIST_k2l-evm  = "k2l"
+DEVICELIST_k2e-evm  = "k2e"
 
-BRANCH = "master"
-SRC_URI = "git://git.ti.com/keystone-rtos/hplib.git;protocol=git;branch=${BRANCH}"
+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.05"
-SRCREV = "97c2ce177c78c0f7a861c8dc9ac10657d85eae36"
-PV = "01.01.00.05+git${SRCPV}"
+# Below Commit ID corresponds to "DEV.HPLIB.01.01.00.07"
+HPLIB_SRCREV = "74dde26bfcdeb248fae29eb883ac78db89263f9f"
+
+BRANCH = "${HPLIB_GIT_BRANCH}"
+SRC_URI = "${HPLIB_GIT_URI};protocol=${HPLIB_GIT_PROTOCOL};branch=${BRANCH}"
+SRCREV = "${HPLIB_SRCREV}"
+
+PV = "01.01.00.07+git${SRCPV}"
+INC_PR = "r0"

recipes-bsp/hplib/hplib_git.bb

@@ -7,6 +7,8 @@ RDEPENDS_${PN} = "hplib-mod"
 
 include hplib.inc
 
+PR = "${INC_PR}.0"
+
 CHOICELIST = "yes no"
 
 S = "${WORKDIR}/git/ti/runtime/hplib"

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

@@ -1,43 +0,0 @@
-#*
-#* Copyright (C) 2015 Texas Instruments Incorporated - http://www.ti.com/
-#*
-#*
-#*  Redistribution and use in source and binary forms, with or without
-#*  modification, are permitted provided that the following conditions
-#*  are met:
-#*
-#*    Redistributions of source code must retain the above copyright
-#*    notice, this list of conditions and the following disclaimer.
-#*
-#*    Redistributions in binary form must reproduce the above copyright
-#*    notice, this list of conditions and the following disclaimer in the
-#*    documentation and/or other materials provided with the
-#*    distribution.
-#*
-#*    Neither the name of Texas Instruments Incorporated nor the names of
-#*    its contributors may be used to endorse or promote products derived
-#*    from this software without specific prior written permission.
-#*
-
-#! /bin/sh
-compatible=$(cat /proc/device-tree/compatible)
-
-cd /usr/lib
-case "$compatible" in
-	*k2hk*)
-		device=k2hk
-		ln -sf libhyplnk_k2h.so.1.0.0 libhyplnk_device.so.1
-	;;
-	*k2e*)
-		device=k2e
-		ln -sf libhyplnk_k2e.so.1.0.0 libhyplnk_device.so.1
-	;;
-	*)
-		device=unknown
-	;;
-esac
-
-if [ $device != unknown ]; then
-	ln -sf libhyplnk_device.so.1 libhyplnk_device.so
-	echo hyplnk library link established for device : $device
-fi

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

@@ -1,23 +1,17 @@
 include hyplnk-lld.inc
 
-DEPENDS = "common-csl-ip hyplnk-lld"
+PR = "${INC_PR}.0"
 
-CHOICELIST = " yes \
-               no  \
-"
+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
-		for choice in ${CHOICELIST}
-		do
-			make -f makefile_armv7 tests examples \
-				PDK_INSTALL_PATH="${STAGING_INCDIR}" \
-				DEVICE="$device" HYPLNK_SRC_DIR="${S}" \
-				USEDYNAMIC_LIB="$choice"
-		done
+		make -f makefile_armv7 tests examples \
+			PDK_INSTALL_PATH="${STAGING_INCDIR}" \
+			DEVICE="$device" HYPLNK_SRC_DIR="${S}"
 	done
 }
 

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

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

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

@@ -1,14 +1,9 @@
 include hyplnk-lld.inc
 
+PR = "${INC_PR}.1"
+
 DEPENDS = "common-csl-ip"
 
-SRC_URI += "file://init_hyplnk.sh"
-
-inherit update-rc.d
-
-INITSCRIPT_NAME = "init_hyplnk.sh"
-INITSCRIPT_PARAMS = "defaults 10"
-
 do_compile () {
 	make -f makefile_armv7 clean PDK_INSTALL_PATH="${STAGING_INCDIR}" \
 		HYPLNK_SRC_DIR="${S}"
@@ -23,12 +18,15 @@ 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}
-	ln -sf libhyplnk_k2h.so.1.0.0 libhyplnk_device.so.1
-	ln -sf libhyplnk_device.so.1 libhyplnk_device.so
-#   Copy init scripts
-	install -d ${D}${sysconfdir}/init.d/
-	install -c -m 755 ${WORKDIR}/init_hyplnk.sh ${D}${sysconfdir}/init.d/${INITSCRIPT_NAME}
 
+	# 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_3.00.04.02.bb

@@ -1,35 +0,0 @@
-python __anonymous() {
-    features = bb.data.getVar("MACHINE_FEATURES", d, 1)
-    if not features:
-        return
-    if "mmip" not in features:
-        raise bb.parse.SkipPackage('ipumm-fw does not apply to systems without the "mmip" flag in MACHINE_FEATURES')
-}
-
-DESCRIPTION = "Firmware for IPU for supporting Accelerated MM decode and encode"
-LICENSE = "TI-TSPA"
-
-LIC_FILES_CHKSUM = "file://MMIP-${PV}-Manifest.doc;md5=39a593dd8fc2a9654c74f679ed329c45"
-
-COMPATIBLE_MACHINE = "omap5-evm"
-PACKAGE_ARCH = "${MACHINE_ARCH}"
-
-RDEPENDS_${PN} = " libdce"
-
-SRC_URI = "http://downloads.ti.com/dsps/dsps_public_sw/glsdk/ipumm/3_00_04_02/exports/ipumm-${MACHINE}-${PV}.tar.gz;protocol=http"
-
-SRC_URI[md5sum] = "1572073ebd4f6d127c4e8cf47d270b6a"
-SRC_URI[sha256sum] = "2fdb469f19e3c9984854f5bc82444fca4d7da869f5e645da22ec0d5beaa5cc65"
-
-S = "${WORKDIR}/ipumm-${MACHINE}-${PV}"
-
-TARGET = "ducati-m3-core0.xem3"
-
-do_install() {
-        mkdir -p ${D}${base_libdir}/firmware
-        cp ${S}/firmware/${TARGET} ${D}${base_libdir}/firmware/${TARGET}
-}
-
-FILES_${PN} += "${base_libdir}/firmware/${TARGET}"
-
-PR = "r4"

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

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

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

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

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

@@ -0,0 +1,69 @@
+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=036f6300761559fbc5ce7d06e1ccea5a"
+
+COMPATIBLE_MACHINE = "dra7xx"
+
+RDEPENDS_${PN} = " libdce"
+
+SRC_URI = "git://git.ti.com/ivimm/ipumm.git;protocol=git"
+
+SRCREV = "c579a48d3b201fe276e406add64512eb5e90e75f"
+
+S = "${WORKDIR}/git"
+
+PV = "3.00.10.00"
+
+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"
+
+do_install() {
+    install -d ${D}${base_libdir}/firmware
+    install -m 0644 ${S}/${TARGET} ${D}${base_libdir}/firmware/${TARGET}.${BPN}
+}
+
+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/*"
+
+PR = "r1"

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

@@ -4,6 +4,8 @@ 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 () {

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

@@ -1,13 +1,21 @@
 LIC_FILES_CHKSUM = "file://COPYING.txt;md5=5bdceac872dffdec915b819654ee23ea"
 LICENSE = "BSD-3-Clause"
 
-BRANCH = "master"
-SRC_URI = "git://git.ti.com/keystone-rtos/iqn2-lld.git;destsuffix=git/ti/drv/iqn2;protocol=git;branch=${BRANCH}"
-# Following commit corresponds to DEV.IQN_LLD.01.00.00.07A
-SRCREV = "94017e30c87853e48f6e947186c5075289b190c6"
+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"
 
-PV = "1.0.0.7"
+# 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}/git/ti/drv/iqn2"
+S = "${WORKDIR}/${IQN2_LLD_GIT_DESTSUFFIX}"

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

@@ -4,6 +4,8 @@ DEPENDS = "common-csl-ip"
 
 include iqn2-lld.inc
 
+PR = "${INC_PR}.0"
+
 EXTRA_OEMAKE = "-f makefile_armv7 PDK_INSTALL_PATH=${STAGING_INCDIR}"
 
 do_compile () {

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

@@ -1,13 +1,17 @@
 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 = "k2h \
-              k2k \
-              k2e \
-"
+DEVICELIST_k2hk-evm = "k2h k2k"
+DEVICELIST_k2e-evm  = "k2e"
+DEVICELIST_k2l-evm  = "k2l"
+DEVICELIST_k2g-evm  = "k2g"
 
 CHOICELIST = " yes \
                no \

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

@@ -4,12 +4,19 @@ COMPATIBLE_MACHINE = "keystone"
 
 LIC_FILES_CHKSUM = "file://COPYING.txt;md5=b3315b8190036fe1c6a8263d02e15606"
 
-BRANCH="master"
-SRC_URI = "git://git.ti.com/keystone-rtos/mmap-lld.git;destsuffix=git/ti/runtime/mmap;protocol=git;branch=${BRANCH}"
-# Commit correspond to DEV.MMAP.02.00.00.04
-SRCREV = "306895eb2d5decd14a760e70d273946958ff716f"
+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"
 
-PV = "2.0.0.4"
-PR = "r1"
+# 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

@@ -1,6 +1,8 @@
 DESCRIPTION = "TI KEYSTONE mmap driver using Keystone MPAX Programming"
 include mmap-lld.inc
 
+PR = "${INC_PR}.0"
+
 DEPENDS="common-csl-ip"
 
 do_compile () {

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.8"
+PR = "r0"
+
+CLEANBROKEN = "1"
+
+COMPATIBLE_MACHINE = "k2hk-evm|k2l-evm|k2e-evm"
+
+PACKAGE_ARCH = "${MACHINE_ARCH}"
+
+SRCREV = "dd8db49ed57f8ac448451cc5e54973c71a99faea"
+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

@@ -4,6 +4,8 @@ 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 () {

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

@@ -2,17 +2,27 @@ LICENSE = "BSD-3-Clause"
 LIC_FILES_CHKSUM = "file://${WORKDIR}/git/COPYING.txt;md5=b7982a377c680ad71ca2fbb735982462"
 
 COMPATIBLE_MACHINE = "keystone"
+PACKAGE_ARCH = "${MACHINE_ARCH}"
 
-BRANCH = "master"
-SRC_URI = "git://git.ti.com/keystone-rtos/nwal-lld.git;protocol=git;branch=${BRANCH}"
+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.06"
-SRCREV = "a3494c9aaa2808f438d26b2c3b8b091448ffc445"
-PV = "02.01.00.06"
+# Below commit ID corresponds to "DEV.NWAL.02.01.00.10A"
+NWAL_LLD_SRCREV = "e7ed8c5abc4b93b99a5f45699eef8f3b8ca51d1e"
+
+BRANCH = "${NWAL_LLD_GIT_BRANCH}"
+SRC_URI = "${NWAL_LLD_GIT_URI};protocol=${NWAL_LLD_GIT_PROTOCOL};branch=${BRANCH}"
+SRCREV = "${NWAL_LLD_SRCREV}"
+
+PV = "02.01.00.10"
+INC_PR = "r1"
 
 BASEDIR = "${WORKDIR}/git"
 S = "${BASEDIR}/ti/drv/nwal"
 
-DEVICELIST = "k2h k2k k2l k2e"
+DEVICELIST_k2hk-evm = "k2h k2k"
+DEVICELIST_k2l-evm  = "k2l"
+DEVICELIST_k2e-evm  = "k2e"
 
 CHOICELIST = "yes no"

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

@@ -4,6 +4,8 @@ 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 () {

recipes-bsp/pa-lld/files/0001-makefile_armv7-fix-missing-separator-error.patch

@@ -0,0 +1,30 @@
+From 60a938e6902c7cb8bec34abbc5a3723c8094d728 Mon Sep 17 00:00:00 2001
+From: Denys Dmytriyenko <denys@ti.com>
+Date: Tue, 1 Dec 2015 00:00:00 -0500
+Subject: [PATCH] makefile_armv7: fix missing separator error
+
+Doesn't seem to work in all versions of Make, fails like this:
+makefile_armv7:27: *** missing separator.  Stop.
+
+Signed-off-by: Denys Dmytriyenko <denys@ti.com>
+---
+ makefile_armv7 | 3 ---
+ 1 file changed, 3 deletions(-)
+
+diff --git a/makefile_armv7 b/makefile_armv7
+index a2bc4f6..1ae6e0a 100644
+--- a/makefile_armv7
++++ b/makefile_armv7
+@@ -24,9 +24,6 @@ else
+     export LLD_NAME=pa
+ endif        
+ 
+-echo DEVICE=$(DEVICE)
+-echo LLD_NAME=$(LLD_NAME)
+-
+ # Output for prebuilt generated libraries
+ export ARMV7LIBDIR ?= ./lib
+ export ARMV7OBJDIR ?= ./obj/$(DEVICE)
+-- 
+2.2.0
+

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

@@ -4,7 +4,7 @@ DEPENDS = "common-csl-ip pa-lld cppi-lld qmss-lld sa-lld"
 
 include pa-lld.inc
 
-DEVICELIST = "k2h k2k k2l k2e"
+PR = "${INC_PR}.1"
 
 CHOICELIST = "yes no"
 

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

@@ -1,15 +1,33 @@
-LICENSE = "BSD-3-Clause"
-LIC_FILES_CHKSUM = "file://${WORKDIR}/git/ti/drv/pa/COPYING.txt;md5=e8f6789acdcda76d02ed9203fc2e603d"
+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}"
 
-BRANCH = "master"
-SRC_URI = "git://git.ti.com/keystone-rtos/pa-lld.git;destsuffix=git/ti/drv/pa;protocol=git;branch=${BRANCH}"
+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.01.04"
-SRCREV = "92de8879be3712af684bd031ca0ed291c05d6050"
-PV = "03.00.01.04"
-PR = "r1"
+# Below Commit ID corresponds to "DEV.PA_LLD.03.00.01.08A"
+PA_LLD_SRCREV = "9294e42fd5763555c28e46b51246bab439fd552e"
 
-BASEDIR = "${WORKDIR}/git"
-S = "${BASEDIR}/ti/drv/pa"
+BRANCH = "${PA_LLD_GIT_BRANCH}"
+SRC_URI = "${PA_LLD_GIT_URI};destsuffix=${PA_LLD_GIT_DESTSUFFIX};protocol=${PA_LLD_GIT_PROTOCOL};branch=${BRANCH} \
+            file://0001-makefile_armv7-fix-missing-separator-error.patch"
+SRCREV = "${PA_LLD_SRCREV}"
+
+PV = "03.00.01.08"
+INC_PR = "r1"
+
+S = "${WORKDIR}/${PA_LLD_GIT_DESTSUFFIX}"
+
+DEVICELIST = "k2h k2k k2l k2e"
+DEVICELIST_k2hk-evm = "k2h k2k"
+DEVICELIST_k2l-evm = "k2l"
+DEVICELIST_k2e-evm = "k2e"
+
+LIBPA = "libpa"
+LIBPA_k2hk-evm = "libpa"
+LIBPA_k2e-evm = "libpa2"
+LIBPA_k2l-evm = "libpa2"

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

@@ -4,12 +4,20 @@ DEPENDS = "common-csl-ip rm-lld"
 
 include pa-lld.inc
 
+PR = "${INC_PR}.1"
+
 do_compile () {
 #   Now build the lld in the updated directory
-	make -f makefile_armv7 DEVICE=k2h clean lib PDK_INSTALL_PATH=${STAGING_INCDIR}
-	make -f makefile_armv7 DEVICE=k2l lib 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
+    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-evm = "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

@@ -1,18 +1,11 @@
 DESCRIPTION = "Provides library for handling packet descriptors for keystone devices"
-LICENSE = "BSD-3-Clause"
 LIC_FILES_CHKSUM = "file://${WORKDIR}/git/COPYING.txt;md5=b7982a377c680ad71ca2fbb735982462"
 
 DEPENDS = "common-csl-ip rm-lld qmss-lld cppi-lld"
-COMPATIBLE_MACHINE = "keystone"
 
-BRANCH = "master"
-SRC_URI = "git://git.ti.com/keystone-rtos/pktlib.git;protocol=git;branch=${BRANCH}"
+include pktlib.inc
 
-# Corresponds to DEV.PKTLIB.2.1.0.4
-SRCREV = "a9aa56afed54b0a04f36d2fdb248cad5dcac6ff6"
-PV = "2.1.0.4"
-
-S = "${WORKDIR}/git/ti/runtime/pktlib"
+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}"
 

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

@@ -0,0 +1,34 @@
+DESCRIPTION =  "Kernel drivers for the PowerVR SGX chipset found in the TI SoCs"
+HOMEPAGE = "https://git.ti.com/graphics/omap5-sgx-ddk-linux"
+LICENSE = "MIT | GPLv2"
+LIC_FILES_CHKSUM = "file://eurasia_km/README;beginline=13;endline=22;md5=74506d9b8e5edbce66c2747c50fcef12"
+
+inherit module
+
+COMPATIBLE_MACHINE = "ti33x|ti43x|omap-a15"
+
+MACHINE_KERNEL_PR_append = "i"
+PR = "${MACHINE_KERNEL_PR}"
+
+PACKAGE_ARCH = "${MACHINE_ARCH}"
+
+BRANCH = "ti-img-sgx/${PV}/k4.1"
+
+SRC_URI = "git://git.ti.com/graphics/omap5-sgx-ddk-linux.git;protocol=git;branch=${BRANCH}"
+S = "${WORKDIR}/git"
+
+SRCREV = "fed0756f1b8b9d526da2821635c7d742989d47c3"
+
+TARGET_PRODUCT_omap-a15 = "jacinto6evm"
+TARGET_PRODUCT_ti33x = "ti335x"
+TARGET_PRODUCT_ti43x = "ti437x"
+
+EXTRA_OEMAKE += 'KERNELDIR="${STAGING_KERNEL_DIR}" TARGET_PRODUCT=${TARGET_PRODUCT}'
+
+do_compile_prepend() {
+    cd ${S}/eurasia_km/eurasiacon/build/linux2/omap_linux
+}
+
+do_install() {
+    make -C ${STAGING_KERNEL_DIR} SUBDIRS=${B}/eurasia_km/eurasiacon/binary2_omap_linux_release/target/kbuild INSTALL_MOD_PATH=${D} PREFIX=${STAGING_DIR_HOST} modules_install
+}

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

@@ -1,26 +0,0 @@
-DESCRIPTION =  "Kernel drivers for the PowerVR SGX chipset found in the omap5 SoCs"
-HOMEPAGE = "http://git.ti.com"
-LICENSE = "MIT | GPLv2"
-LIC_FILES_CHKSUM = "file://eurasia_km/README;beginline=13;endline=22;md5=2b841bfc03386bb4d8d9381b79d33898"
-
-inherit module
-
-MACHINE_KERNEL_PR_append = "k"
-PR = "${MACHINE_KERNEL_PR}"
-
-BRANCH = "dra7/k3.14"
-
-SRC_URI = "git://git.ti.com/graphics/omap5-sgx-ddk-linux.git;protocol=git;branch=${BRANCH}"
-S = "${WORKDIR}/git"
-
-SRCREV = "b6f1e4d6f55b05d15f67b91738b45a2b5bdffe65"
-
-EXTRA_OEMAKE += 'KERNELDIR="${STAGING_KERNEL_DIR}"'
-
-do_compile_prepend() {
-    cd ${S}/eurasia_km/eurasiacon/build/linux2/omap5430_linux
-}
-
-do_install() {
-    make -C ${STAGING_KERNEL_DIR} SUBDIRS=${B}/eurasia_km/eurasiacon/binary2_omap5430_linux_release/target/kbuild INSTALL_MOD_PATH=${D} PREFIX=${STAGING_DIR_HOST} modules_install
-}

recipes-bsp/pru/pru-icss_git.bb

@@ -0,0 +1,139 @@
+DESCRIPTION = "Programmable Real-time Unit Software Package"
+HOMEPAGE = "http://processors.wiki.ti.com/index.php/PRU-ICSS"
+LICENSE = "BSD-3-Clause & GPL-2.0 & PD"
+
+LIC_FILES_CHKSUM = "file://PRU-Package-v4.0-Manifest.html;md5=5ea937e4ff2c924a735d42e61ad8cbe3"
+
+inherit update-alternatives
+
+BRANCH = "master"
+SRC_URI = "git://git.ti.com/pru-software-support-package/pru-software-support-package.git;protocol=git;branch=${BRANCH}"
+SRCREV = "804b548e69ef9fdf44445f6d0968d81cb8a1e7b4"
+
+PV = "4.0.2"
+PR = "r2"
+
+require recipes-ti/includes/ti-paths.inc
+
+COMPATIBLE_MACHINE = "ti33x|ti43x|omap-a15"
+PACKAGE_ARCH = "${MACHINE_ARCH}"
+
+PACKAGES_prepend = " \
+    ${PN}-halt \
+    ${PN}-rpmsg-echo \
+"
+
+RDEPENDS_${PN}_append = " \
+    ${PN}-halt \
+    ${PN}-rpmsg-echo \
+"
+
+DEPENDS = "ti-cgt-pru-native"
+
+S = "${WORKDIR}/git"
+
+export PRU_CGT = "${TI_CGT_PRU_INSTALL_DIR}"
+
+SUBDIRS = "examples pru_cape/pru_fw lib/src labs"
+
+PLATFORM_ti33x = "am335x"
+PLATFORM_ti43x = "am437x"
+PLATFORM_omap-a15 = "am572x"
+
+do_compile() {
+    for dir in ${SUBDIRS}
+    do
+        make -C ${S}/$dir
+    done
+}
+
+do_install() {
+    install -d ${D}/lib/firmware/pru
+    install -m 644 ${S}/examples/${PLATFORM}/PRU_Halt/gen/PRU_Halt.out \
+                   ${D}/lib/firmware/pru
+}
+
+do_install_append_ti33x() {
+    for i in 0 1
+    do
+        install -m 0644 ${S}/examples/am335x/PRU_RPMsg_Echo_Interrupt${i}/gen/PRU_RPMsg_Echo_Interrupt${i}.out \
+                        ${D}/lib/firmware/pru
+    done
+}
+
+do_install_append_ti43x() {
+    for i in 0 1
+    do
+        install -m 0644 ${S}/examples/am437x/PRU_RPMsg_Echo_Interrupt1_${i}/gen/PRU_RPMsg_Echo_Interrupt1_${i}.out \
+                        ${D}/lib/firmware/pru
+    done
+}
+
+do_install_append_omap-a15() {
+    for i in 1 2
+    do
+        for j in 0 1
+        do
+            install -m 0644 ${S}/examples/am572x/PRU_RPMsg_Echo_Interrupt${i}_${j}/gen/PRU_RPMsg_Echo_Interrupt${i}_${j}.out \
+                            ${D}/lib/firmware/pru
+        done
+    done
+}
+
+FILES_${PN}-halt = "/lib/firmware/pru/PRU_Halt.out"
+FILES_${PN}-rpmsg-echo = "/lib/firmware/pru/PRU_RPMsg_Echo_Interrupt*"
+
+# Set up names for the firmwares
+PRU_ICSS_ALTERNATIVES_ti33x    = "am335x-pru0-fw am335x-pru1-fw"
+PRU_ICSS_ALTERNATIVES_ti43x    = "am437x-pru1_0-fw am437x-pru1_1-fw"
+PRU_ICSS_ALTERNATIVES_omap-a15 = "am57xx-pru1_0-fw am57xx-pru1_1-fw am57xx-pru2_0-fw am57xx-pru2_1-fw"
+
+# Set up link names for the firmwares
+ALTERNATIVE_LINK_NAME[am335x-pru0-fw] = "/lib/firmware/am335x-pru0-fw"
+ALTERNATIVE_LINK_NAME[am335x-pru1-fw] = "/lib/firmware/am335x-pru1-fw"
+
+ALTERNATIVE_LINK_NAME[am437x-pru1_0-fw] = "/lib/firmware/am437x-pru1_0-fw"
+ALTERNATIVE_LINK_NAME[am437x-pru1_1-fw] = "/lib/firmware/am437x-pru1_1-fw"
+
+ALTERNATIVE_LINK_NAME[am57xx-pru1_0-fw] = "/lib/firmware/am57xx-pru1_0-fw"
+ALTERNATIVE_LINK_NAME[am57xx-pru1_1-fw] = "/lib/firmware/am57xx-pru1_1-fw"
+ALTERNATIVE_LINK_NAME[am57xx-pru2_0-fw] = "/lib/firmware/am57xx-pru2_0-fw"
+ALTERNATIVE_LINK_NAME[am57xx-pru2_1-fw] = "/lib/firmware/am57xx-pru2_1-fw"
+
+# Create the pru-icss-halt firmware alternatives
+ALTERNATIVE_pru-icss-halt = "${PRU_ICSS_ALTERNATIVES}"
+
+ALTERNATIVE_TARGET_pru-icss-halt[am335x-pru0-fw] = "/lib/firmware/pru/PRU_Halt.out"
+ALTERNATIVE_TARGET_pru-icss-halt[am335x-pru1-fw] = "/lib/firmware/pru/PRU_Halt.out"
+
+ALTERNATIVE_TARGET_pru-icss-halt[am437x-pru1_0-fw] = "/lib/firmware/pru/PRU_Halt.out"
+ALTERNATIVE_TARGET_pru-icss-halt[am437x-pru1_1-fw] = "/lib/firmware/pru/PRU_Halt.out"
+
+ALTERNATIVE_TARGET_pru-icss-halt[am57xx-pru1_0-fw] = "/lib/firmware/pru/PRU_Halt.out"
+ALTERNATIVE_TARGET_pru-icss-halt[am57xx-pru1_1-fw] = "/lib/firmware/pru/PRU_Halt.out"
+ALTERNATIVE_TARGET_pru-icss-halt[am57xx-pru2_0-fw] = "/lib/firmware/pru/PRU_Halt.out"
+ALTERNATIVE_TARGET_pru-icss-halt[am57xx-pru2_1-fw] = "/lib/firmware/pru/PRU_Halt.out"
+
+ALTERNATIVE_PRIORITY_pru-icss-halt = "50"
+
+# Craete the pru-icss-rpmsg-echo firmware alternatives
+ALTERNATIVE_pru-icss-rpmsg-echo = "${PRU_ICSS_ALTERNATIVES}"
+
+ALTERNATIVE_TARGET_pru-icss-rpmsg-echo[am335x-pru0-fw] = "/lib/firmware/pru/PRU_RPMsg_Echo_Interrupt0.out"
+ALTERNATIVE_TARGET_pru-icss-rpmsg-echo[am335x-pru1-fw] = "/lib/firmware/pru/PRU_RPMsg_Echo_Interrupt1.out"
+
+ALTERNATIVE_TARGET_pru-icss-rpmsg-echo[am437x-pru1_0-fw] = "/lib/firmware/pru/PRU_RPMsg_Echo_Interrupt1_0.out"
+ALTERNATIVE_TARGET_pru-icss-rpmsg-echo[am437x-pru1_1-fw] = "/lib/firmware/pru/PRU_RPMsg_Echo_Interrupt1_1.out"
+
+ALTERNATIVE_TARGET_pru-icss-rpmsg-echo[am57xx-pru1_0-fw] = "/lib/firmware/pru/PRU_RPMsg_Echo_Interrupt1_0.out"
+ALTERNATIVE_TARGET_pru-icss-rpmsg-echo[am57xx-pru1_1-fw] = "/lib/firmware/pru/PRU_RPMsg_Echo_Interrupt1_1.out"
+ALTERNATIVE_TARGET_pru-icss-rpmsg-echo[am57xx-pru2_0-fw] = "/lib/firmware/pru/PRU_RPMsg_Echo_Interrupt2_0.out"
+ALTERNATIVE_TARGET_pru-icss-rpmsg-echo[am57xx-pru2_1-fw] = "/lib/firmware/pru/PRU_RPMsg_Echo_Interrupt2_1.out"
+
+ALTERNATIVE_PRIORITY_pru-icss-rpmsg-echo = "100"
+
+ALLOW_EMPTY_${PN} = "1"
+
+# This installs PRU firmware, so skip "arch" QA check
+INSANE_SKIP_${PN}-halt = "arch"
+INSANE_SKIP_${PN}-rpmsg-echo = "arch"

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

@@ -0,0 +1,36 @@
+DESCRIPTION = "PRU Ethernet firmware for AM57xx and AM437x"
+
+LICENSE = "TI-TFL"
+LIC_FILES_CHKSUM = "file://LICENSE.ti;md5=b5aebf0668bdf95621259288c4a46d76"
+
+PV_am57xx-evm = "1.0.0"
+PV_am437x-evm = "2.1.2"
+
+PR = "r1"
+
+CLEANBROKEN = "1"
+
+COMPATIBLE_MACHINE = "am57xx-evm|am437x-evm"
+
+PACKAGE_ARCH = "${MACHINE_ARCH}"
+
+SRCREV = "f6c712fd26044d90939ff774f07dfcb951bcefc9"
+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_am57xx-evm = "am57xx-pru0-prueth-fw.elf am57xx-pru1-prueth-fw.elf"
+TARGET_am437x-evm = "am437x-pru0-prueth-fw.elf am437x-pru1-prueth-fw.elf"
+
+do_install() {
+	install -d ${D}${base_libdir}/firmware/ti-pruss
+	for f in ${TARGET}; do
+		install -m 0644 ${S}/ti-pruss/$f ${D}${base_libdir}/firmware/ti-pruss/$f
+	done
+}
+
+FILES_${PN} = "${base_libdir}/firmware"
+
+INSANE_SKIP_${PN} = "arch"

recipes-bsp/qmss-lld/files/init_qmss.sh

@@ -1,47 +0,0 @@
-#*
-#* Copyright (C) 2015 Texas Instruments Incorporated - http://www.ti.com/
-#*
-#*
-#*  Redistribution and use in source and binary forms, with or without
-#*  modification, are permitted provided that the following conditions
-#*  are met:
-#*
-#*    Redistributions of source code must retain the above copyright
-#*    notice, this list of conditions and the following disclaimer.
-#*
-#*    Redistributions in binary form must reproduce the above copyright
-#*    notice, this list of conditions and the following disclaimer in the
-#*    documentation and/or other materials provided with the
-#*    distribution.
-#*
-#*    Neither the name of Texas Instruments Incorporated nor the names of
-#*    its contributors may be used to endorse or promote products derived
-#*    from this software without specific prior written permission.
-#*
-
-#! /bin/sh
-compatible=$(cat /proc/device-tree/compatible)
-
-cd /usr/lib
-case "$compatible" in
-	*k2hk*)
-		device=k2hk
-		ln -sf libqmss_k2h.so.1.0.0 libqmss_device.so.1
-	;;
-	*k2l*)
-		device=k2l
-		ln -sf libqmss_k2l.so.1.0.0 libqmss_device.so.1
-	;;
-	*k2e*)
-		device=k2e
-		ln -sf libqmss_k2e.so.1.0.0 libqmss_device.so.1
-	;;
-	*)
-		device=unknown
-	;;
-esac
-
-if [ $device != unknown ]; then
-	ln -sf libqmss_device.so.1 libqmss_device.so
-	echo qmss library link established for device : $device
-fi

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

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

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

@@ -1,10 +1,11 @@
 DESCRIPTION = "TI QMSS low level driver unit test and example binaries"
-COMPATIBLE_MACHINE = "keystone"
 
-DEPENDS="common-csl-ip rm-lld cppi-lld qmss-lld"
+DEPENDS="common-csl-ip rm-lld cppi-lld qmss-lld cmem uio-module-drv"
 
 include qmss-lld.inc
 
+PR = "${INC_PR}.2"
+
 CHOICELIST = "yes no"
 
 do_compile () {

recipes-bsp/qmss-lld/qmss-lld.inc

@@ -1,15 +1,27 @@
-LICENSE = "BSD-3-Clause"
-LIC_FILES_CHKSUM = "file://${WORKDIR}/git/ti/drv/qmss/COPYING.txt;md5=e8f6789acdcda76d02ed9203fc2e603d"
+LICENSE = "BSD-3-Clause & TI-TFL"
+LIC_FILES_CHKSUM = "file://${WORKDIR}/git/ti/drv/qmss/COPYING.txt;md5=cd04fb087063a2a82c4ce61983836871"
 
-BRANCH ="master"
-SRC_URI = "git://git.ti.com/keystone-rtos/qmss-lld.git;destsuffix=git/ti/drv/qmss;protocol=git;branch=${BRANCH}"
+COMPATIBLE_MACHINE = "keystone"
+PACKAGE_ARCH = "${MACHINE_ARCH}"
 
-# commit ID corresponding to DEV.QMSS_LLD.02.01.00.10
-SRCREV = "ffec14248f460b7cf4def4457f9c2335df62618d"
-PV = "02.01.00.10"
-PR = "r1"
+QMSS_LLD_GIT_URI = "git://git.ti.com/keystone-rtos/qmss-lld.git"
+QMSS_LLD_GIT_PROTOCOL = "git"
+QMSS_LLD_GIT_BRANCH = "master"
+QMSS_LLD_GIT_DESTSUFFIX = "git/ti/drv/qmss"
+
+# commit ID corresponding to DEV.QMSS_LLD.02.01.00.14A
+QMSS_LLD_SRCREV = "8fc6a846e509d6ad8499e1de68abd912d7947069"
+
+BRANCH ="${QMSS_LLD_GIT_BRANCH}"
+SRC_URI = "${QMSS_LLD_GIT_URI};destsuffix=${QMSS_LLD_GIT_DESTSUFFIX};protocol=${QMSS_LLD_GIT_PROTOCOL};branch=${BRANCH}"
+SRCREV = "${QMSS_LLD_SRCREV}"
+
+PV = "02.01.00.14"
+INC_PR = "r1"
 
 DEVICELIST = "k2h k2k k2l k2e"
+DEVICELIST_k2hk-evm = "k2h k2k"
+DEVICELIST_k2l-evm = "k2l"
+DEVICELIST_k2e-evm = "k2e"
 
-BASEDIR = "${WORKDIR}/git"
-S = "${BASEDIR}/ti/drv/qmss"
+S = "${WORKDIR}/${QMSS_LLD_GIT_DESTSUFFIX}"

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

@@ -1,17 +1,10 @@
 DESCRIPTION = "TI QMSS low level driver library"
-COMPATIBLE_MACHINE = "keystone"
 
 DEPENDS="common-csl-ip rm-lld"
 
 include qmss-lld.inc
 
-
-SRC_URI += "file://init_qmss.sh"
-
-inherit update-rc.d
-
-INITSCRIPT_NAME = "init_qmss.sh"
-INITSCRIPT_PARAMS = "defaults 10"
+PR = "${INC_PR}.1"
 
 do_compile () {
 #   Now build the lld
@@ -26,11 +19,14 @@ do_compile () {
 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
+    # Set the generic device library symbolic link to default k2h
     cd ${D}${libdir}
-    ln -sf libqmss_k2h.so.1.0.0 libqmss_device.so.1
+
+    # Link only the first device in the list
+    for device in ${DEVICELIST}
+    do
+        ln -sf libqmss_${device}.so.1.0.0 libqmss_device.so.1
+        break
+    done
     ln -sf libqmss_device.so.1 libqmss_device.so
-#   Copy init scripts
-	install -d ${D}${sysconfdir}/init.d/
-	install -c -m 755 ${WORKDIR}/init_qmss.sh ${D}${sysconfdir}/init.d/${INITSCRIPT_NAME}
 }

recipes-bsp/qmss-pdsp-fw/qmss-pdsp-fw_git.bb

@@ -0,0 +1,29 @@
+DESCRIPTION = "QMSS PDSP firmware"
+
+LICENSE = "TI-TFL"
+LIC_FILES_CHKSUM = "file://LICENCE.ti-keystone;md5=3a86335d32864b0bef996bee26cc0f2c"
+
+PV = "1.0.0.9"
+PR = "r1"
+
+CLEANBROKEN = "1"
+
+COMPATIBLE_MACHINE = "keystone"
+
+PACKAGE_ARCH = "${MACHINE_ARCH}"
+
+SRCREV = "778668c4bb5fe59870e549a4a2820b9f7f90e89e"
+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 = "ks2_qmss_pdsp_acc48_k2_le_1_0_0_9.bin"
+TARGET = "ks2_qmss_pdsp_acc48.bin"
+
+do_install() {
+	install -d ${D}${base_libdir}/firmware
+	install -m 0644 ${S}/ti-keystone/${ORIGIN} ${D}${base_libdir}/firmware/${TARGET}
+}
+
+FILES_${PN} = "${base_libdir}/firmware"

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

@@ -0,0 +1,12 @@
+inherit ti-pdk
+
+require rm-lld.inc
+
+PR = "${INC_PR}.0"
+
+PACKAGE_ARCH = "${MACHINE_ARCH}"
+
+XDCARGS_k2hk-evm = "k2h k2k"
+XDCARGS_k2e-evm = "k2e"
+XDCARGS_k2l-evm = "k2l"
+XDCARGS_k2g-evm = "k2g"

recipes-bsp/rm-lld/rm-lld.inc

@@ -0,0 +1,23 @@
+DESCRIPTION = "TI Resource Manager Low Level Driver"
+LICENSE = "BSD-3-Clause"
+LIC_FILES_CHKSUM = "file://${WORKDIR}/git/ti/drv/rm/COPYING.txt;md5=dc61631b65360e6beb73b6c337800afc"
+
+RM_LLD_GIT_URI = "git://git.ti.com/keystone-rtos/rm-lld.git"
+RM_LLD_GIT_PROTOCOL = "git"
+RM_LLD_GIT_BRANCH = "master"
+RM_LLD_GIT_DESTSUFFIX = "git/ti/drv/rm"
+
+# Below commit ID corresponds to DEV.RM_LLD.02.02.00.01
+RM_LLD_SRCREV = "841f2df9726f456d6c026c0aa03095699962d048"
+
+BRANCH = "${RM_LLD_GIT_BRANCH}"
+SRC_URI = "${RM_LLD_GIT_URI};destsuffix=${RM_LLD_GIT_DESTSUFFIX};protocol=${RM_LLD_GIT_PROTOCOL};branch=${BRANCH}"
+SRCREV = "${RM_LLD_SRCREV}"
+
+PV = "02.02.00.01"
+INC_PR = "r0"
+
+COMPATIBLE_MACHINE = "keystone"
+
+BASEDIR = "${WORKDIR}/git"
+S = "${BASEDIR}/ti/drv/rm"

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

@@ -1,15 +1,6 @@
-DESCRIPTION = "TI Resource Manager Low Level Driver"
-LICENSE = "BSD-3-Clause"
-LIC_FILES_CHKSUM = "file://${WORKDIR}/git/ti/drv/rm/COPYING.txt;md5=dc61631b65360e6beb73b6c337800afc"
+require rm-lld.inc
 
-BRANCH="master"
-SRC_URI = "git://git.ti.com/keystone-rtos/rm-lld.git;destsuffix=git/ti/drv/rm;protocol=git;branch=${BRANCH}"
-# Below commit ID corresponds to DEV.RM_LLD.02.01.00.08
-SRCREV = "7873d22076b4cb865365bbce20a244121414bb44"
-PV = "02.01.00.08"
-PR = "r1"
-
-COMPATIBLE_MACHINE = "keystone"
+PR = "${INC_PR}.0"
 
 DEPENDS = "ti-ipc libdaemon"
 
@@ -22,9 +13,6 @@ FILES_${PN}-test = "${bindir}/rmDspClientTest.out \
 
 CHOICELIST = "yes no"
 
-BASEDIR = "${WORKDIR}/git"
-S = "${BASEDIR}/ti/drv/rm"
-
 do_compile () {
 #   Now build the lld
     make -f makefile_armv7 clean lib PDK_INSTALL_PATH=${STAGING_INCDIR} RM_SRC_DIR=${S}

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

@@ -4,7 +4,13 @@ DEPENDS = "common-csl-ip cppi-lld qmss-lld pa-lld sa-lld"
 
 include sa-lld.inc
 
-DEVICELIST = "k2h k2k k2l k2e"
+PR = "${INC_PR}.1"
+
+PACKAGE_ARCH = "${MACHINE_ARCH}"
+
+DEVICELIST_k2hk-evm = "k2h k2k"
+DEVICELIST_k2l-evm  = "k2l"
+DEVICELIST_k2e-evm  = "k2e"
 
 CHOICELIST = "no yes"
 
@@ -15,7 +21,7 @@ do_compile () {
 		make -f makefile_armv7 clean PDK_INSTALL_PATH=${STAGING_INCDIR} DEVICE="$device" SA_SRC_DIR=${S}
 		for choice in ${CHOICELIST}
 		do
-			make -f makefile_armv7 examples PDK_INSTALL_PATH=${STAGING_INCDIR} DEVICE="$device" SA_SRC_DIR=${S} USEDYNAMIC_LIB="$choice"
+			make -f makefile_armv7 examples utils PDK_INSTALL_PATH=${STAGING_INCDIR} DEVICE="$device" SA_SRC_DIR=${S} USEDYNAMIC_LIB="$choice"
 		done
 	done
 }

recipes-bsp/sa-lld/sa-lld.inc

@@ -1,14 +1,21 @@
-LICENSE = "BSD-3-Clause"
+LICENSE = "BSD-3-Clause & TI-TFL"
 COMPATIBLE_MACHINE = "keystone"
 
-LIC_FILES_CHKSUM = "file://${WORKDIR}/git/ti/drv/sa/COPYING.txt;md5=4709d353574a9569e129ebdf20e732dd"
+LIC_FILES_CHKSUM = "file://${WORKDIR}/git/ti/drv/sa/COPYING.txt;md5=cd04fb087063a2a82c4ce61983836871"
 
-BRANCH = "master"
-SRC_URI = "git://git.ti.com/keystone-rtos/sa-lld.git;destsuffix=git/ti/drv/sa;protocol=git;branch=${BRANCH}"
-# Following commit DEV.SA_LLD.03.00.00.10
-SRCREV = "533aec7ef0e28c3faff4ee64a861c8935262dc33"
-PV = "03.00.00.10"
-PR = "r1"
+SA_LLD_GIT_URI = "git://git.ti.com/keystone-rtos/sa-lld.git"
+SA_LLD_GIT_PROTOCOL = "git"
+SA_LLD_GIT_BRANCH = "master"
+SA_LLD_GIT_DESTSUFFIX = "git/ti/drv/sa"
 
-BASEDIR = "${WORKDIR}/git"
-S = "${BASEDIR}/ti/drv/sa"
+# Following commit DEV.SA_LLD.03.00.00.13A
+SA_LLD_SRCREV = "5918d9a519789c34368388c49869cb857d6255f7"
+
+BRANCH = "${SA_LLD_GIT_BRANCH}"
+SRC_URI = "${SA_LLD_GIT_URI};destsuffix=${SA_LLD_GIT_DESTSUFFIX};protocol=${SA_LLD_GIT_PROTOCOL};branch=${BRANCH}"
+SRCREV = "${SA_LLD_SRCREV}"
+
+PV = "03.00.00.13"
+INC_PR = "r1"
+
+S = "${WORKDIR}/${SA_LLD_GIT_DESTSUFFIX}"

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

@@ -4,6 +4,8 @@ DEPENDS = "common-csl-ip"
 
 include sa-lld.inc
 
+PR = "${INC_PR}.0"
+
 do_compile () {
 #   Now build the lld in the updated directory
 	make -f makefile_armv7 clean lib PDK_INSTALL_PATH=${STAGING_INCDIR}
@@ -11,4 +13,8 @@ do_compile () {
 
 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 libsa.so.1.0.0 ${D}${libdir}/libsa_device.so.1
+	ln -sf libsa_device.so.1 ${D}${libdir}/libsa_device.so
 }

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

@@ -0,0 +1,36 @@
+DESCRIPTION = "SerDes firmware for Keystone PCIe and 1/10GigE"
+
+LICENSE = "TI-TFL"
+LIC_FILES_CHKSUM = "file://LICENCE.ti-keystone;md5=3a86335d32864b0bef996bee26cc0f2c"
+
+PV = "1.0.0"
+PR = "r0"
+
+CLEANBROKEN = "1"
+
+COMPATIBLE_MACHINE = "keystone"
+
+PACKAGE_ARCH = "${MACHINE_ARCH}"
+
+SRCREV = "8756d98081e1011a1334b0769f13ffb31d3b41bd"
+BRANCH ?= "ti-linux-firmware-4.1.y"
+
+SRC_URI = "git://git.ti.com/processor-firmware/ti-linux-firmware.git;protocol=git;branch=${BRANCH}"
+
+S = "${WORKDIR}/git"
+ORIGINPCIE = "ks2_pcie_serdes_1.0.0.bin"
+ORIGINGBE = "ks2_gbe_serdes_1.0.0.bin"
+ORIGINXGBE = "ks2_xgbe_serdes_1.0.0.bin"
+
+TARGETPCIE = "ks2_pcie_serdes.bin"
+TARGETGBE = "ks2_gbe_serdes.bin"
+TARGETXGBE = "ks2_xgbe_serdes.bin"
+
+do_install() {
+	install -d ${D}${base_libdir}/firmware
+	install -m 0644 ${S}/ti-keystone/${ORIGINPCIE} ${D}${base_libdir}/firmware/${TARGETPCIE}
+	install -m 0644 ${S}/ti-keystone/${ORIGINGBE} ${D}${base_libdir}/firmware/${TARGETGBE}
+	install -m 0644 ${S}/ti-keystone/${ORIGINXGBE} ${D}${base_libdir}/firmware/${TARGETXGBE}
+}
+
+FILES_${PN} = "${base_libdir}/firmware"