linux-ti-staging: update with opp core fix

Signed-off-by: Denys Dmytriyenko <denys@ti.com>
u-boot-ti-staging: update with latest fixes
2026-01-12 01:20:20 +00:00 · 2017-03-31 12:24:29 -04:00 · 2017-03-30 14:15:23 -04:00 · 2017-03-30 14:15:18 -04:00 · 2017-03-15 17:44:22 -04:00 · 2017-03-15 17:44:16 -04:00
146 changed files with 609 additions and 1048 deletions
--- a/2
+++ b/2
@@ -8,7 +8,7 @@ This layer depends on:

 URI: git://git.openembedded.org/openembedded-core
 layers: meta
-branch: morty
+branch: krogoth


 The base BSP part of meta-ti should work with different OpenEmbedded/Yocto
--- a/classes/ti-pdk.bbclass
+++ b/classes/ti-pdk.bbclass
@@ -5,7 +5,7 @@ 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-cgt-arm-native"
+DEPENDS_append_omap-a15 = " ti-ccsv6-native"
 DEPENDS_remove_ti33x = "ti-cgt6x-native"
 DEPENDS_remove_ti43x = "ti-cgt6x-native"

@@ -89,7 +89,7 @@ do_compile() {

 do_install () {
    install -d ${D}${PDK_INSTALL_DIR_RECIPE}/packages
-    find -name "*.tar" -exec tar xf {} --no-same-owner -C ${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
--- a/conf/layer.conf
+++ b/conf/layer.conf
@@ -10,8 +10,6 @@ BBFILE_PRIORITY_meta-ti = "6"

 LICENSE_PATH += "${LAYERDIR}/licenses"

-LAYERDEPENDS_meta-ti = "core"
-
 SIGGEN_EXCLUDERECIPES_ABISAFE += " \
    ti-sgx-ddk-km \
    ti-sgx-ddk-um \
--- a/conf/machine/omapl138-lcdk.conf
+++ b/conf/machine/omapl138-lcdk.conf
@@ -1,18 +1,16 @@
 #@TYPE: Machine
-#@NAME: OMAP-L138 LCDK
-#@DESCRIPTION: Machine configuration for the TI OMAP-L138 LCDK board
+#@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 = "omapl138_lcdk_config"
+UBOOT_MACHINE = "da850_am18xxevm_config"
 UBOOT_SUFFIX = "ais"

 UBOOT_ENTRYPOINT = "0xc0008000"
 UBOOT_LOADADDRESS = "0xc0008000"

-IMAGE_FSTYPES += "tar.xz"
+IMAGE_FSTYPES += "tar.gz"

 SERIAL_CONSOLE = "115200 ttyS2"
-
-KERNEL_DEVICETREE = "da850-evm.dtb da850-lcdk.dtb"
--- a/conf/machine/am335x-evm.conf
+++ b/conf/machine/am335x-evm.conf
@@ -11,9 +11,8 @@ MACHINE_FEATURES += "touchscreen"

 IMAGE_FSTYPES += "ubifs ubi tar.xz"

-# Normally AM335 boards use ttyS0, but ICE uses ttyS3, so try both
 SERIAL_CONSOLE = ""
-SERIAL_CONSOLES = "115200;ttyS0 115200;ttyS3"
+SERIAL_CONSOLES = "115200;ttyS0 115200;ttyO0 115200;ttyS3 115200;ttyO3"
 SERIAL_CONSOLES_CHECK = "${SERIAL_CONSOLES}"

 # UBI information.  Note that this is board and kernel specific.  Changes
@@ -27,7 +26,7 @@ SERIAL_CONSOLES_CHECK = "${SERIAL_CONSOLES}"
 # UBI: logical eraseblock size:    126976 bytes
 # from ubiattach stdout:
 # UBI device number 0, total 1988 LEBs
-MKUBIFS_ARGS = "-F -m 2048 -e 126976 -c 7000"
+MKUBIFS_ARGS = "-F -m 2048 -e 126976 -c 5700"

 # do ubiattach /dev/ubi_ctrl -m 7 -O 2048
 # from dmesg:
--- a/conf/machine/am335x-hs-evm.conf
+++ b/conf/machine/am335x-hs-evm.conf
@@ -4,7 +4,7 @@

 require conf/machine/am335x-evm.conf

-UBOOT_MACHINE = "am335x_hs_evm_config"
+UBOOT_MACHINE = "am335x_hs_evm_mmc_config"

 UBOOT_ENTRYPOINT = "0x82000000"
 UBOOT_LOADADDRESS = "0x82000000"
--- a/conf/machine/am3517-evm.conf
+++ b/conf/machine/am3517-evm.conf
@@ -12,11 +12,9 @@ MACHINE_FEATURES += "touchscreen ethernet"
 IMAGE_FSTYPES += "ubi tar.gz"
 EXTRA_IMAGECMD_jffs2 = "-lnp -e 0x20000 -s 2048"

-SERIAL_CONSOLE = "115200 ttyS2"
+SERIAL_CONSOLE = "115200 ttyO2"
 USE_VT = "2"

-KERNEL_DEVICETREE = "am3517-evm.dtb"
-
 UBOOT_MACHINE = "am3517_evm_config"
 XLOAD_MACHINE = "am3517evm_config"

--- a/conf/machine/am37x-evm.conf
+++ b/conf/machine/am37x-evm.conf
@@ -12,9 +12,7 @@ MACHINE_FEATURES += "touchscreen ethernet"
 IMAGE_FSTYPES += "ubi tar.gz"
 EXTRA_IMAGECMD_jffs2 = "-lnp -e 0x20000 -s 2048"

-KERNEL_DEVICETREE = "omap3-evm-37xx.dtb"
-
-SERIAL_CONSOLE = "115200 ttyS0"
+SERIAL_CONSOLE = "115200 ttyO0"

 # NOTE: there are NAND and OneNAND versions of this board...
 # do ubiattach /dev/ubi_ctrl -m 4
--- a/conf/machine/am437x-evm.conf
+++ b/conf/machine/am437x-evm.conf
@@ -11,7 +11,9 @@ MACHINE_FEATURES += "touchscreen"

 IMAGE_FSTYPES += "ubifs ubi tar.xz"

-SERIAL_CONSOLE = "115200 ttyS0"
+SERIAL_CONSOLE = ""
+SERIAL_CONSOLES = "115200;ttyS0 115200;ttyO0"
+SERIAL_CONSOLES_CHECK = "${SERIAL_CONSOLES}"

 # UBI information.  Note that this is board and kernel specific.  Changes
 # in your kernel port may require changes in these variables.  For more
@@ -24,7 +26,7 @@ SERIAL_CONSOLE = "115200 ttyS0"
 # UBI: logical eraseblock size:    253952 bytes
 # from ubiattach stdout:
 # UBI device number 0, total 994 LEBs
-MKUBIFS_ARGS = "-F -m 4096 -e 253952 -c 4000"
+MKUBIFS_ARGS = "-F -m 4096 -e 253952 -c 2700"

 # do ubiattach /dev/ubi_ctrl -m 11 -O 4096
 # from dmesg:
--- a/conf/machine/am57xx-evm.conf
+++ b/conf/machine/am57xx-evm.conf
@@ -1,6 +1,6 @@
 #@TYPE: Machine
-#@NAME: AM57xx EVM
-#@DESCRIPTION: Machine configuration for the TI AM57xx EVM
+#@NAME: DRA7xx EVM
+#@DESCRIPTION: Machine configuration for the TI DRA7xx EVM

 require conf/machine/include/dra7xx.inc

@@ -8,13 +8,9 @@ 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-cam-mt9t111.dtb am57xx-evm-cam-ov10635.dtb \
-                    am57xx-evm-reva3.dtb am57xx-evm-reva3-cam-mt9t111.dtb am57xx-evm-reva3-cam-ov10635.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"
+SERIAL_CONSOLE = ""
+SERIAL_CONSOLES = "115200;ttyS2 115200;ttyO2"
+SERIAL_CONSOLES_CHECK = "${SERIAL_CONSOLES}"

 UBOOT_MACHINE = "am57xx_evm_config"

--- a/conf/machine/beagle-x15.conf
+++ b/conf/machine/beagle-x15.conf
@@ -1,36 +0,0 @@
-#@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"
--- a/conf/machine/beagleboard.conf
+++ b/conf/machine/beagleboard.conf
@@ -10,9 +10,7 @@ MACHINE_GUI_CLASS = "bigscreen"
 IMAGE_FSTYPES += "tar.gz ubi"
 EXTRA_IMAGECMD_jffs2 = "-lnp"

-KERNEL_DEVICETREE = "omap3-beagle.dtb omap3-beagle-xm.dtb omap3-beagle-xm-ab.dtb"
-
-SERIAL_CONSOLE = "115200 ttyS2"
+SERIAL_CONSOLE = "115200 ttyO2"

 UBOOT_MACHINE = "omap3_beagle_config"

--- a/conf/machine/beaglebone.conf
+++ b/conf/machine/beaglebone.conf
@@ -3,19 +3,12 @@
 #@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
 MACHINE_GUI_CLASS = "bigscreen"

-WKS_FILE = "sdimage-bootpart.wks"
-IMAGE_BOOT_FILES = "MLO u-boot.img"
-IMAGE_FSTYPES += "tar.xz wic.xz"
+IMAGE_FSTYPES += "tar.gz"

-SERIAL_CONSOLE = "115200 ttyS0"
+SERIAL_CONSOLE = "115200 ttyO0"

 UBOOT_MACHINE = "am335x_boneblack_config"
-
-do_image_wic[depends] += "mtools-native:do_populate_sysroot dosfstools-native:do_populate_sysroot"
--- a/conf/machine/dra7xx-evm.conf
+++ b/conf/machine/dra7xx-evm.conf
@@ -8,12 +8,9 @@ MACHINE_FEATURES += "touchscreen"

 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"
+SERIAL_CONSOLE = ""
+SERIAL_CONSOLES = "115200;ttyS0 115200;ttyO0"
+SERIAL_CONSOLES_CHECK = "${SERIAL_CONSOLES}"

 UBOOT_MACHINE = "dra7xx_evm_config"

--- a/conf/machine/include/beaglebone.inc
+++ b/conf/machine/include/beaglebone.inc
@@ -1,12 +0,0 @@
-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.")
-}
--- a/conf/machine/include/dra7xx.inc
+++ b/conf/machine/include/dra7xx.inc
@@ -1,4 +1,4 @@
 require conf/machine/include/omap-a15.inc
 SOC_FAMILY_append = ":dra7xx"

-MACHINE_FEATURES += "pci"
+MACHINE_FEATURES += "pci opencl"
--- a/conf/machine/include/k2hk.inc
+++ b/conf/machine/include/k2hk.inc
@@ -1,2 +0,0 @@
-require conf/machine/include/keystone.inc
-SOC_FAMILY_append = ":k2hk"
--- a/conf/machine/include/keystone.inc
+++ b/conf/machine/include/keystone.inc
@@ -23,5 +23,5 @@ UBI_VOLNAME = "rootfs"
 EXTRA_IMAGEDEPENDS += "u-boot"
 EXTRA_IMAGEDEPENDS += "boot-monitor"

-MACHINE_FEATURES = "kernel26 apm usbgadget usbhost vfat pci dsp"
+MACHINE_FEATURES = "kernel26 apm usbgadget usbhost vfat pci"
 MACHINE_FEATURES_BACKFILL_CONSIDERED = "rtc"
--- a/conf/machine/include/omap-a15.inc
+++ b/conf/machine/include/omap-a15.inc
@@ -12,8 +12,6 @@ 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"
@@ -33,4 +31,4 @@ MACHINE_GUI_CLASS = "smallscreen"
 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"
+MACHINE_FEATURES = "kernel26 apm usbgadget usbhost vfat ext2 screen alsa ethernet sgx mmip"
--- a/conf/machine/include/omap3.inc
+++ b/conf/machine/include/omap3.inc
@@ -26,8 +26,6 @@ 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"
 XLOAD_MACHINE = "omap3evm_config"
--- a/conf/machine/include/ti33x.inc
+++ b/conf/machine/include/ti33x.inc
@@ -26,8 +26,6 @@ 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"

--- a/conf/machine/include/ti43x.inc
+++ b/conf/machine/include/ti43x.inc
@@ -26,8 +26,6 @@ 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"

--- a/conf/machine/k2e-evm.conf
+++ b/conf/machine/k2e-evm.conf
@@ -4,7 +4,7 @@

 require conf/machine/include/k2e.inc

-KERNEL_DEVICETREE = "keystone-k2e-evm.dtb"
+MACHINE_FEATURES += "opencl"

 UBOOT_MACHINE = "k2e_evm_config"

@@ -12,7 +12,9 @@ BOOT_MONITOR_MAKE_TARGET = "k2e"

 IMAGE_FSTYPES += "ubifs ubi tar.xz"

-SERIAL_CONSOLE = "115200 ttyS0"
+SERIAL_CONSOLE = ""
+SERIAL_CONSOLES = "115200;ttyS0 115200;ttyO0"
+SERIAL_CONSOLES_CHECK = "${SERIAL_CONSOLES}"

 SYSVINIT_ENABLED_GETTYS = ""

@@ -22,7 +24,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 4000"
+MKUBIFS_ARGS = "-F -m 2048 -e 126976 -c 3856"

 # do ubiattach /dev/ubi_ctrl -m 4
 # from dmesg:
--- a/conf/machine/k2g-evm.conf
+++ b/conf/machine/k2g-evm.conf
@@ -4,9 +4,7 @@

 require conf/machine/include/k2g.inc

-MACHINE_FEATURES += "alsa"
-
-KERNEL_DEVICETREE = "keystone-k2g-evm.dtb keystone-k2g-evm-lcd.dtb keystone-k2g-ice.dtb"
+MACHINE_FEATURES += "alsa opencl"

 UBOOT_MACHINE = "k2g_evm_config"

@@ -14,7 +12,9 @@ BOOT_MONITOR_MAKE_TARGET = "k2g"

 IMAGE_FSTYPES += "ubifs ubi tar.xz"

-SERIAL_CONSOLE = "115200 ttyS0"
+SERIAL_CONSOLE = ""
+SERIAL_CONSOLES = "115200;ttyS0 115200;ttyO0"
+SERIAL_CONSOLES_CHECK = "${SERIAL_CONSOLES}"

 SYSVINIT_ENABLED_GETTYS = ""

@@ -24,7 +24,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 2000"
+MKUBIFS_ARGS = "-F -m 4096 -e 253952 -c 1926"

 # do ubiattach /dev/ubi_ctrl -m 4
 # from dmesg:
--- a/conf/machine/k2g-hs-evm.conf
+++ b/conf/machine/k2g-hs-evm.conf
@@ -1,14 +0,0 @@
-#@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"
--- a/conf/machine/k2g-ice.conf
+++ b/conf/machine/k2g-ice.conf
@@ -0,0 +1,7 @@
+#@TYPE: Machine
+#@NAME: Keystone 2 K2G ICE machine
+#@DESCRIPTION: Machine configuration for the TI Keystone 2 K2G ICE
+
+require conf/machine/k2g-evm.conf
+
+UBOOT_MACHINE = "k2g_ice_config"
--- a/conf/machine/k2hk-evm.conf
+++ b/conf/machine/k2hk-evm.conf
@@ -2,9 +2,9 @@
 #@NAME: Keystone 2 K2HK machine
 #@DESCRIPTION: Machine configuration for the TI Keystone 2 K2HK EVM

-require conf/machine/include/k2hk.inc
+require conf/machine/include/keystone.inc

-KERNEL_DEVICETREE = "keystone-k2hk-evm.dtb"
+MACHINE_FEATURES += "opencl"

 UBOOT_MACHINE = "k2hk_evm_config"

@@ -12,7 +12,9 @@ BOOT_MONITOR_MAKE_TARGET = "k2hk"

 IMAGE_FSTYPES += "ubifs ubi tar.xz"

-SERIAL_CONSOLE = "115200 ttyS0"
+SERIAL_CONSOLE = ""
+SERIAL_CONSOLES = "115200;ttyS0 115200;ttyO0"
+SERIAL_CONSOLES_CHECK = "${SERIAL_CONSOLES}"

 SYSVINIT_ENABLED_GETTYS = ""

@@ -22,7 +24,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 4000"
+MKUBIFS_ARGS = "-F -m 2048 -e 126976 -c 3900"

 # do ubiattach /dev/ubi_ctrl -m 4
 # from dmesg:
--- a/conf/machine/k2hk-hs-evm.conf
+++ b/conf/machine/k2hk-hs-evm.conf
@@ -1,14 +0,0 @@
-#@TYPE: Machine
-#@NAME: Keystone 2 K2HK HS EVM
-#@DESCRIPTION: Machine configuration for the TI Keystone 2 K2HK HS EVM
-
-require conf/machine/k2hk-evm.conf
-
-UBOOT_MACHINE = "k2hk_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}/k2hk"
--- a/conf/machine/k2l-evm.conf
+++ b/conf/machine/k2l-evm.conf
@@ -4,7 +4,7 @@

 require conf/machine/include/keystone.inc

-KERNEL_DEVICETREE = "keystone-k2l-evm.dtb"
+MACHINE_FEATURES += "opencl"

 UBOOT_MACHINE = "k2l_evm_config"

@@ -12,7 +12,9 @@ BOOT_MONITOR_MAKE_TARGET = "k2l"

 IMAGE_FSTYPES += "ubifs ubi tar.xz"

-SERIAL_CONSOLE = "115200 ttyS0"
+SERIAL_CONSOLE = ""
+SERIAL_CONSOLES = "115200;ttyS0 115200;ttyO0"
+SERIAL_CONSOLES_CHECK = "${SERIAL_CONSOLES}"

 SYSVINIT_ENABLED_GETTYS = ""

@@ -22,7 +24,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 2000"
+MKUBIFS_ARGS = "-F -m 4096 -e 253952 -c 1926"

 # do ubiattach /dev/ubi_ctrl -m 4
 # from dmesg:
--- a/conf/machine/omap5-evm.conf
+++ b/conf/machine/omap5-evm.conf
@@ -6,9 +6,7 @@ require conf/machine/include/omap-a15.inc

 IMAGE_FSTYPES += "ubi tar.gz"

-KERNEL_DEVICETREE = "omap5-uevm.dtb"
-
-SERIAL_CONSOLE = "115200 ttyS2"
+SERIAL_CONSOLE = "115200 ttyO2"

 # UBI information.  Note that this is board and kernel specific.  Changes
 # in your kernel port may require changes in these variables.  For more
--- a/conf/machine/pandaboard.conf
+++ b/conf/machine/pandaboard.conf
@@ -8,9 +8,7 @@ MACHINE_GUI_CLASS = "bigscreen"

 IMAGE_FSTYPES += "tar.gz"

-KERNEL_DEVICETREE = "omap4-panda.dtb omap4-panda-a4.dtb omap4-panda-es.dtb"
-
-SERIAL_CONSOLE = "115200 ttyS2"
+SERIAL_CONSOLE = "115200 ttyO2"

 MACHINE_EXTRA_RRECOMMENDS = " kernel-modules"
 MACHINE_FEATURES = "kernel26 wifi bluetooth alsa apm ext2 screen usbgadget usbhost vfat sgx"
--- a/recipes-bsp/aif2-lld/aif2-lld.inc
+++ b/recipes-bsp/aif2-lld/aif2-lld.inc
@@ -17,6 +17,6 @@ SRCREV = "${AIF2_LLD_SRCREV}"
 PV = "1.2.0.1"
 INC_PR = "r0"

-COMPATIBLE_MACHINE = "k2hk"
+COMPATIBLE_MACHINE = "k2hk-evm"

 S = "${WORKDIR}/${AIF2_LLD_GIT_DESTSUFFIX}"
--- a/recipes-bsp/boot-monitor/boot-monitor_git.bb
+++ b/recipes-bsp/boot-monitor/boot-monitor_git.bb
@@ -15,7 +15,7 @@ BRANCH = "master"

 S = "${WORKDIR}/git"

-SRCREV = "e1f885ab6dc544884728e333cc6e396f7eb08286"
+SRCREV = "cf8b431e8b3b2ee4a4aa08964d56d3ce1b11da24"

 BOOT_MONITOR_IMAGE  ?= "skern-${BOOT_MONITOR_MAKE_TARGET}.bin"

--- a/recipes-bsp/bt-fw/bt-fw_git.bb
+++ b/recipes-bsp/bt-fw/bt-fw_git.bb
@@ -1,24 +0,0 @@
-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/*"
--- a/recipes-bsp/cmem/cmem-mod_git.bb
+++ b/recipes-bsp/cmem/cmem-mod_git.bb
@@ -12,7 +12,3 @@ EXTRA_OEMAKE += '-f lu.mak KERNEL_INSTALL_DIR="${STAGING_KERNEL_DIR}" TOOLCHAIN_
 MAKE_TARGETS = "module"

 KERNEL_MODULE_AUTOLOAD += "cmemk"
-
-do_install_prepend() {
-    cp ${B}/src/cmem/module/Module.symvers ${B}/ || true
-}
--- a/recipes-bsp/cmem/cmem.inc
+++ b/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.14.00.00_eng
-SRCREV = "b514a99ac45c64f0439282d0774d7cff5def4c6f"
+# This corresponds to version 4.13.00.01_eng
+SRCREV = "1389059f01eabc1e853a384f0e5f51c4f3e4f197"

-PV = "4.14.00.00+git${SRCPV}"
+PV = "4.13.00.01+git${SRCPV}"

 SRC_URI = "git://git.ti.com/ipc/ludev.git;protocol=git;branch=${BRANCH}"

--- a/recipes-bsp/common-csl-ip/common-csl-ip-rtos_git.bb
+++ b/recipes-bsp/common-csl-ip/common-csl-ip-rtos_git.bb
@@ -13,7 +13,7 @@ XDCMAKE = "0"
 LIMSOCS_ti33x = "am335x"
 LIMSOCS_ti43x = "am437x"
 LIMSOCS_omap-a15 = "am571x am572x"
-LIMSOCS_k2hk = "k2h k2k"
+LIMSOCS_k2hk-evm = "k2h k2k"
 LIMSOCS_k2l-evm = "k2l"
 LIMSOCS_k2e = "k2e"
 LIMSOCS_k2g = "k2g"
--- a/recipes-bsp/common-csl-ip/common-csl-ip.inc
+++ b/recipes-bsp/common-csl-ip/common-csl-ip.inc
@@ -4,7 +4,7 @@ LIC_FILES_CHKSUM = "file://COPYING.txt;md5=5857833e20836213677fac33f9aded21"

 COMPATIBLE_MACHINE = "keystone|dra7xx"

-PV = "03.03.00.06C"
+PV = "03.03.00.05A"
 INC_PR = "r0"

 CSL_GIT_URI = "git://git.ti.com/keystone-rtos/common-csl-ip.git"
@@ -12,8 +12,8 @@ CSL_GIT_PROTOCOL ="git"
 CSL_GIT_BRANCH = "master"
 CSL_GIT_DESTSUFFIX = "git"

-# Below commit ID corresponding to "DEV.CSL_PROCESSOR-SDK.03.03.00.06C"
-CSL_SRCREV = "ce2bbf96b08fa69eda7bfc92aa7760b7ca70dddf"
+# 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}"
--- a/recipes-bsp/cppi-lld/cppi-lld-rtos_git.bb
+++ b/recipes-bsp/cppi-lld/cppi-lld-rtos_git.bb
@@ -7,7 +7,7 @@ DEPENDS_append = " rm-lld-rtos \
                   qmss-lld-rtos \
 "

-XDCARGS_k2hk = "k2h k2k"
+XDCARGS_k2hk-evm = "k2h k2k"
 XDCARGS_k2e = "k2e"
 XDCARGS_k2l-evm = "k2l"
 XDCARGS_k2g = "k2g"
--- a/recipes-bsp/cppi-lld/cppi-lld.inc
+++ b/recipes-bsp/cppi-lld/cppi-lld.inc
@@ -20,7 +20,7 @@ PV = "02.01.00.12"
 INC_PR = "r1"

 DEVICELIST = "k2h k2k k2l k2e"
-DEVICELIST_k2hk = "k2h k2k"
+DEVICELIST_k2hk-evm = "k2h k2k"
 DEVICELIST_k2l-evm  = "k2l"
 DEVICELIST_k2e  = "k2e"

--- a/recipes-bsp/dspdce-fw/dspdce-fw_git.bb
+++ b/recipes-bsp/dspdce-fw/dspdce-fw_git.bb
@@ -6,16 +6,16 @@ COMPATIBLE_MACHINE = "dra7xx"

 SRC_URI = "git://git.ti.com/glsdk/dspdce.git;protocol=git"

-SRCREV = "de6e599f067b25c46cc0c8f74a22cc3b8aafbae8"
+SRCREV = "3b9cea492f23d7dabb9ffa0e69631b858ba8e90a"

-PV = "1.00.00.07"
+PV = "1.00.00.06"

 S = "${WORKDIR}/git"

 require recipes-ti/includes/ti-paths.inc
 require recipes-ti/includes/ti-staging.inc

-PR = "r4"
+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"
--- a/recipes-bsp/edma3-lld/edma3-lld-rtos_git.bb
+++ b/recipes-bsp/edma3-lld/edma3-lld-rtos_git.bb
@@ -2,9 +2,9 @@ require edma3-lld.inc
 require recipes-ti/includes/ti-paths.inc
 require recipes-ti/includes/ti-staging.inc

-PR = "${INC_PR}.1"
+PR = "${INC_PR}.0"

-DEPENDS = "ti-sysbios ti-xdctools gcc-arm-none-eabi-native ti-cgt-arm-native ti-cgt6x-native"
+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}"
@@ -106,9 +106,8 @@ do_compile () {
 }

 do_install () {
-    CP_ARGS="-Prf --preserve=mode,timestamps --no-preserve=ownership"
    install -d ${D}${EDMA3_LLD_INSTALL_DIR_RECIPE}
-    cp ${CP_ARGS} ${S}/* ${D}${EDMA3_LLD_INSTALL_DIR_RECIPE}
+    cp -pPrf ${S}/* ${D}${EDMA3_LLD_INSTALL_DIR_RECIPE}
 }

 INSANE_SKIP_${PN}-dev = "arch ldflags"
--- a/recipes-bsp/edma3-lld/edma3-lld.inc
+++ b/recipes-bsp/edma3-lld/edma3-lld.inc
@@ -6,12 +6,12 @@ EDMA3_LLD_GIT_URI = "git://git.ti.com/keystone-rtos/edma3_lld.git"
 EDMA3_LLD_GIT_PROTOCOL = "git"
 EDMA3_LLD_GIT_BRANCH = "master"

-# Below commit ID corresponds to tag "DEV_EDMA3_LLD_02_12_03_27"
-EDMA3_LLD_SRCREV = "ed434ef4019b696b753dae0f98fe6594a7ce35a3"
+# 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.03.27"
+PV = "2.12.02.26"
 INC_PR = "r0"
--- a/recipes-bsp/gc320-drivers/ti-gc320-driver_5.0.11.p7.bb
+++ b/recipes-bsp/gc320-drivers/ti-gc320-driver_5.0.11.p7.bb
@@ -5,13 +5,13 @@ LIC_FILES_CHKSUM = "file://../LICENSE;md5=78d9818a51b9a8e9bb89dea418bac297"

 inherit module

-MACHINE_KERNEL_PR_append = "d"
+MACHINE_KERNEL_PR_append = "b"
 PR = "${MACHINE_KERNEL_PR}"

 # Need to branch out with ${PV} var
-BRANCH = "ti-${PV}-k4.9"
+BRANCH = "ti-${PV}-k4.4"

-SRCREV = "295443bf56f2100b7b2714c2c30b31ba86e96a0c"
+SRCREV = "65887c911db495fb66c6847c8b6eadc76c7470f4"

 SRC_URI = "git://git.ti.com/graphics/ti-gc320-driver.git;protocol=git;branch=${BRANCH}"
 S = "${WORKDIR}/git/src"
--- a/recipes-bsp/hplib/hplib.inc
+++ b/recipes-bsp/hplib/hplib.inc
@@ -1,7 +1,7 @@
 COMPATIBLE_MACHINE = "keystone"
 PACKAGE_ARCH = "${MACHINE_ARCH}"

-DEVICELIST_k2hk = "k2h k2k"
+DEVICELIST_k2hk-evm = "k2h k2k"
 DEVICELIST_k2l-evm  = "k2l"
 DEVICELIST_k2e  = "k2e"

--- a/recipes-bsp/hyplnk-lld/hyplnk-lld.inc
+++ b/recipes-bsp/hyplnk-lld/hyplnk-lld.inc
@@ -1,7 +1,7 @@
 DESCRIPTION = "TI Hyperlink Low Level Driver"
 LICENSE = "BSD-3-Clause"

-COMPATIBLE_MACHINE = "k2hk|k2e"
+COMPATIBLE_MACHINE = "k2hk-evm|k2e"
 PACKAGE_ARCH = "${MACHINE_ARCH}"

 LLDNAME="hyplnk"
@@ -23,7 +23,7 @@ SRCREV = "${HYPLNK_SRCREV}"
 PV = "2.1.0.6"
 INC_PR = "r0"

-DEVICELIST_k2hk = "k2h k2k"
+DEVICELIST_k2hk-evm = "k2h k2k"
 DEVICELIST_k2e  = "k2e"

 S = "${WORKDIR}/${HYPLNK_GIT_DESTSUFFIX}"
--- a/recipes-bsp/ipumm-fw/ipumm-fw_git.bb
+++ b/recipes-bsp/ipumm-fw/ipumm-fw_git.bb
@@ -29,7 +29,7 @@ require recipes-ti/includes/ti-staging.inc

 inherit update-alternatives

-DEPENDS = "ti-xdctools ti-sysbios ti-codec-engine ti-framework-components ti-xdais ti-cgt-arm-native ti-ipc-rtos"
+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"
--- a/recipes-bsp/mmap-lld/mmap-lld-test_git.bb
+++ b/recipes-bsp/mmap-lld/mmap-lld-test_git.bb
@@ -8,7 +8,7 @@ PACKAGE_ARCH = "${MACHINE_ARCH}"
 DEPENDS="common-csl-ip mmap-lld"
 RDEPENDS_${PN}="uio-module-drv"

-DEVICELIST_k2hk = "k2h k2k"
+DEVICELIST_k2hk-evm = "k2h k2k"
 DEVICELIST_k2e = "k2e"
 DEVICELIST_k2l-evm = "k2l"
 DEVICELIST_k2g = "k2g"
--- a/recipes-bsp/netcp-pa-fw/netcp-pa-fw_git.bb
+++ b/recipes-bsp/netcp-pa-fw/netcp-pa-fw_git.bb
@@ -8,7 +8,7 @@ PR = "r0"

 CLEANBROKEN = "1"

-COMPATIBLE_MACHINE = "k2hk|k2l-evm|k2e"
+COMPATIBLE_MACHINE = "k2hk-evm|k2l-evm|k2e"

 PACKAGE_ARCH = "${MACHINE_ARCH}"

@@ -37,7 +37,7 @@ ks2_pa_post_pdsp0 \
 ks2_pa_post_pdsp1 \
 "

-FWBASENAME_k2hk = " \
+FWBASENAME_k2hk-evm = " \
 ks2_pa_pdsp0_classify1 \
 ks2_pa_pdsp1_classify1 \
 ks2_pa_pdsp2_classify1 \
--- a/recipes-bsp/nwal-lld/nwal-lld.inc
+++ b/recipes-bsp/nwal-lld/nwal-lld.inc
@@ -21,7 +21,7 @@ INC_PR = "r0"
 BASEDIR = "${WORKDIR}/git"
 S = "${BASEDIR}/ti/drv/nwal"

-DEVICELIST_k2hk = "k2h k2k"
+DEVICELIST_k2hk-evm = "k2h k2k"
 DEVICELIST_k2l-evm  = "k2l"
 DEVICELIST_k2e  = "k2e"

--- a/recipes-bsp/osal/osal-test_git.bb
+++ b/recipes-bsp/osal/osal-test_git.bb
@@ -4,19 +4,17 @@ DEPENDS="common-csl-ip osal"

 include osal.inc

-PR = "${INC_PR}.1"
+PR = "${INC_PR}.0"

 S = "${WORKDIR}/${OSAL_GIT_DESTSUFFIX}"

-EXTRA_OEMAKE = "-f makefile_armv7 PDK_INSTALL_PATH=${STAGING_INCDIR} OSAL_SRC_DIR=${S}"
-
 do_compile () {
 #   Build the tests
-    oe_runmake clean
-    oe_runmake 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
-    oe_runmake installbin INSTALL_BIN_BASE_DIR=${D}${bindir}
+    make -f makefile_armv7 installbin PDK_INSTALL_PATH=${STAGING_INCDIR} INSTALL_BIN_BASE_DIR=${D}${bindir} OSAL_SRC_DIR=${S}
 }
--- a/recipes-bsp/osal/osal.inc
+++ b/recipes-bsp/osal/osal.inc
@@ -1,5 +1,5 @@
 LICENSE = "BSD-3-Clause"
-LIC_FILES_CHKSUM = "file://osal.h;beginline=1;endline=31;md5=ae7b9f0410f26c80dcf790ef3f622fad"
+LIC_FILES_CHKSUM = "file://osal.h;beginline=1;endline=31;md5=8cbd8efb1460e4f16e6b00c8a7686be4"

 COMPATIBLE_MACHINE = "ti33x|ti43x|omap-a15|keystone"
 PACKAGE_ARCH = "${MACHINE_ARCH}"
@@ -9,12 +9,12 @@ OSAL_GIT_PROTOCOL = "git"
 OSAL_GIT_BRANCH = "master"
 OSAL_GIT_DESTSUFFIX = "git/ti/osal"

-# Below commit ID corresponding to "DEV.OSAL.01.00.00.06E"
-OSAL_SRCREV = "072ab0f76fa272ace5b1756075475f848c14221a"
+# 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.06E"
+PV = "01.00.00.05E"
 INC_PR = "r0"
--- a/recipes-bsp/osal/osal_git.bb
+++ b/recipes-bsp/osal/osal_git.bb
@@ -4,19 +4,17 @@ DEPENDS="common-csl-ip"

 include osal.inc

-PR = "${INC_PR}.1"
+PR = "${INC_PR}.0"

 S = "${WORKDIR}/${OSAL_GIT_DESTSUFFIX}"

-EXTRA_OEMAKE = "-f makefile_armv7 PDK_INSTALL_PATH=${STAGING_INCDIR}"
-
 do_compile () {
 #   Build the lib
-    oe_runmake clean
-    oe_runmake 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
-    oe_runmake install INSTALL_INC_BASE_DIR=${D}${includedir} INSTALL_LIB_BASE_DIR=${D}${libdir}
+    make -f makefile_armv7 install PDK_INSTALL_PATH=${STAGING_INCDIR} INSTALL_INC_BASE_DIR=${D}${includedir} INSTALL_LIB_BASE_DIR=${D}${libdir}
 }
--- a/recipes-bsp/pa-lld/pa-lld.inc
+++ b/recipes-bsp/pa-lld/pa-lld.inc
@@ -9,24 +9,24 @@ PA_LLD_GIT_PROTOCOL = "git"
 PA_LLD_GIT_BRANCH = "master"
 PA_LLD_GIT_DESTSUFFIX = "git/ti/drv/pa"

-# Below commit ID corresponding to "DEV.PA_LLD.03.00.02.03"
-PA_LLD_SRCREV = "5fef109f4ce43c6bc45000f2e609321d262165b2"
+# 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.03"
+PV = "03.00.02.01"
 INC_PR = "r0"

 S = "${WORKDIR}/${PA_LLD_GIT_DESTSUFFIX}"

 DEVICELIST = "k2h k2k k2l k2e"
-DEVICELIST_k2hk = "k2h k2k"
+DEVICELIST_k2hk-evm = "k2h k2k"
 DEVICELIST_k2l-evm = "k2l"
 DEVICELIST_k2e = "k2e"

 LIBPA = "libpa"
-LIBPA_k2hk = "libpa"
+LIBPA_k2hk-evm = "libpa"
 LIBPA_k2e = "libpa2"
 LIBPA_k2l-evm = "libpa2"
--- a/recipes-bsp/pktlib/pktlib-rtos_git.bb
+++ b/recipes-bsp/pktlib/pktlib-rtos_git.bb
@@ -8,6 +8,6 @@ DEPENDS_append = " rm-lld-rtos \
                   cppi-lld-rtos \
 "

-XDCARGS_k2hk = "k2h k2k"
+XDCARGS_k2hk-evm = "k2h k2k"
 XDCARGS_k2e = "k2e"
 XDCARGS_k2l-evm = "k2l"
--- a/recipes-bsp/powervr-drivers/ti-sgx-ddk-km_1.14.3699939.bb
+++ b/recipes-bsp/powervr-drivers/ti-sgx-ddk-km_1.14.3699939.bb
@@ -7,7 +7,7 @@ inherit module

 COMPATIBLE_MACHINE = "ti33x|ti43x|omap-a15"

-MACHINE_KERNEL_PR_append = "m"
+MACHINE_KERNEL_PR_append = "l"
 PR = "${MACHINE_KERNEL_PR}"

 PACKAGE_ARCH = "${MACHINE_ARCH}"
@@ -20,12 +20,12 @@ RPROVIDES_${PN} = "omapdrm-pvr"
 RREPLACES_${PN} = "omapdrm-pvr"
 RCONFLICTS_${PN} = "omapdrm-pvr"

-BRANCH = "ti-img-sgx/${PV}/k4.9"
+BRANCH = "ti-img-sgx/${PV}/k4.4"

 SRC_URI = "git://git.ti.com/graphics/omap5-sgx-ddk-linux.git;protocol=git;branch=${BRANCH}"
 S = "${WORKDIR}/git"

-SRCREV = "0086977380d3320d70a3abc78b95fa0641427073"
+SRCREV = "fd47e44b18944cf7ade480ac67a9c0172619ff7e"

 TARGET_PRODUCT_omap-a15 = "jacinto6evm"
 TARGET_PRODUCT_ti33x = "ti335x"
--- a/recipes-bsp/prueth-fw/prueth-fw_git.bb
+++ b/recipes-bsp/prueth-fw/prueth-fw_git.bb
@@ -4,7 +4,7 @@ LICENSE = "TI-TFL"
 LIC_FILES_CHKSUM = "file://LICENSE.ti;md5=b5aebf0668bdf95621259288c4a46d76"

 PV = "3.1.4"
-PR = "r2"
+PR = "r1"

 CLEANBROKEN = "1"

@@ -12,7 +12,7 @@ COMPATIBLE_MACHINE = "am57xx-evm|am437x-evm|am335x-evm|k2g"

 PACKAGE_ARCH = "${MACHINE_ARCH}"

-SRCREV = "6e1cf7bbc7e8050cb5c64a9098ed0b8a5c9de884"
+SRCREV = "4ed1022c62bfe4ed4c66112024c8ee1301e9439d"
 BRANCH ?= "ti-linux-firmware-4.1.y"

 SRC_URI = "git://git.ti.com/processor-firmware/ti-linux-firmware.git;protocol=git;branch=${BRANCH}"
--- a/recipes-bsp/pruss-lld/pruss-lld.inc
+++ b/recipes-bsp/pruss-lld/pruss-lld.inc
@@ -1,7 +1,7 @@
 LICENSE = "BSD-3-Clause"
 LIC_FILES_CHKSUM = "file://pruicss.h;beginline=1;endline=31;md5=315177aa03d58bcd124a6e799e2bd458"

-COMPATIBLE_MACHINE = "ti33x|ti43x|am57xx-evm|k2g-evm"
+COMPATIBLE_MACHINE = "ti33x|ti43x|omap-a15|k2g-evm"
 PACKAGE_ARCH = "${MACHINE_ARCH}"

 PRUSS_LLD_GIT_URI = "git://git.ti.com/keystone-rtos/pruss-lld.git"
@@ -9,12 +9,12 @@ PRUSS_LLD_GIT_PROTOCOL = "git"
 PRUSS_LLD_GIT_BRANCH = "master"
 PRUSS_LLD_GIT_DESTSUFFIX = "git/ti/drv/pruss"

-# Below commit ID corresponds to "DEV.PRUSS_LLD.01.00.00.06A"
-PRUSS_LLD_SRCREV = "b98729cc1fc26c9ac32846146892646a23c28adb"
+# Below commit ID corresponds to "DEV.PRUSS_LLD.01.00.00.05A"
+PRUSS_LLD_SRCREV = "7421ea14f163fb3c95c3645fe0add1e05da9d748"

 BRANCH = "${PRUSS_LLD_GIT_BRANCH}"
 SRC_URI = "${PRUSS_LLD_GIT_URI};destsuffix=${PRUSS_LLD_GIT_DESTSUFFIX};protocol=${PRUSS_LLD_GIT_PROTOCOL};branch=${BRANCH}"

 SRCREV = "${PRUSS_LLD_SRCREV}"
-PV = "01.00.00.06A"
+PV = "01.00.00.05A"
 INC_PR = "r0"
--- a/recipes-bsp/qmss-lld/qmss-lld-rtos_git.bb
+++ b/recipes-bsp/qmss-lld/qmss-lld-rtos_git.bb
@@ -6,7 +6,7 @@ PR = "${INC_PR}.0"

 DEPENDS_append = " rm-lld-rtos"

-XDCARGS_k2hk = "k2h k2k"
+XDCARGS_k2hk-evm = "k2h k2k"
 XDCARGS_k2l-evm = "k2l"
 XDCARGS_k2e = "k2e"
 XDCARGS_k2g = "k2g"
--- a/recipes-bsp/qmss-lld/qmss-lld.inc
+++ b/recipes-bsp/qmss-lld/qmss-lld.inc
@@ -9,18 +9,18 @@ QMSS_LLD_GIT_PROTOCOL = "git"
 QMSS_LLD_GIT_BRANCH = "master"
 QMSS_LLD_GIT_DESTSUFFIX = "git/ti/drv/qmss"

-# Below commit ID corresponding to "DEV.QMSS_LLD.02.01.00.15A"
-QMSS_LLD_SRCREV = "72fe9dc35b9e128a95b4e3e4403cb197616e2e88"
+# commit ID corresponding to "DEV.QMSS_LLD.02.01.00.14B"
+QMSS_LLD_SRCREV = "04095405680f4ec92eeef9312ba04f7808b1c813"

 BRANCH ="${QMSS_LLD_GIT_BRANCH}"
 SRC_URI = "${QMSS_LLD_GIT_URI};destsuffix=${QMSS_LLD_GIT_DESTSUFFIX};protocol=${QMSS_LLD_GIT_PROTOCOL};branch=${BRANCH}"
 SRCREV = "${QMSS_LLD_SRCREV}"

-PV = "02.01.00.15A"
+PV = "02.01.00.14B"
 INC_PR = "r0"

 DEVICELIST = "k2h k2k k2l k2e"
-DEVICELIST_k2hk = "k2h k2k"
+DEVICELIST_k2hk-evm = "k2h k2k"
 DEVICELIST_k2l-evm = "k2l"
 DEVICELIST_k2e = "k2e"

--- a/recipes-bsp/rm-lld/rm-lld-rtos_git.bb
+++ b/recipes-bsp/rm-lld/rm-lld-rtos_git.bb
@@ -6,7 +6,7 @@ PR = "${INC_PR}.0"

 PACKAGE_ARCH = "${MACHINE_ARCH}"

-XDCARGS_k2hk = "k2h k2k"
+XDCARGS_k2hk-evm = "k2h k2k"
 XDCARGS_k2e = "k2e"
 XDCARGS_k2l-evm = "k2l"
 XDCARGS_k2g = "k2g"
--- a/recipes-bsp/sa-lld/sa-lld-test_git.bb
+++ b/recipes-bsp/sa-lld/sa-lld-test_git.bb
@@ -8,7 +8,7 @@ PR = "${INC_PR}.1"

 PACKAGE_ARCH = "${MACHINE_ARCH}"

-DEVICELIST_k2hk = "k2h k2k"
+DEVICELIST_k2hk-evm = "k2h k2k"
 DEVICELIST_k2l-evm  = "k2l"
 DEVICELIST_k2e  = "k2e"

--- a/recipes-bsp/sa-lld/sa-lld.inc
+++ b/recipes-bsp/sa-lld/sa-lld.inc
@@ -8,14 +8,14 @@ SA_LLD_GIT_PROTOCOL = "git"
 SA_LLD_GIT_BRANCH = "master"
 SA_LLD_GIT_DESTSUFFIX = "git/ti/drv/sa"

-# Below commit ID corresponding to "DEV.SA_LLD.03.00.00.17"
-SA_LLD_SRCREV = "5f153253b1874420b04bd8f95450a2b0c8c11335"
+# Below commit ID corresponds to "DEV.SA_LLD.03.00.00.16"
+SA_LLD_SRCREV = "eb1508714586f92e66bf5a8a4c212e8277f6b065"

 BRANCH = "${SA_LLD_GIT_BRANCH}"
 SRC_URI = "${SA_LLD_GIT_URI};destsuffix=${SA_LLD_GIT_DESTSUFFIX};protocol=${SA_LLD_GIT_PROTOCOL};branch=${BRANCH}"
 SRCREV = "${SA_LLD_SRCREV}"

-PV = "03.00.00.17"
+PV = "03.00.00.16"
 INC_PR = "r0"

 S = "${WORKDIR}/${SA_LLD_GIT_DESTSUFFIX}"
--- a/recipes-bsp/srio-lld/srio-lld.inc
+++ b/recipes-bsp/srio-lld/srio-lld.inc
@@ -1,7 +1,7 @@
 LICENSE = "BSD-3-Clause"
 LIC_FILES_CHKSUM = "file://${WORKDIR}/git/ti/drv/srio/srio_drv.h;beginline=1;endline=41;md5=469096088e072d883ff7eef301b34093"

-COMPATIBLE_MACHINE = "k2hk"
+COMPATIBLE_MACHINE = "k2hk-evm"

 SRIO_LLD_GIT_URI = "git://git.ti.com/keystone-rtos/srio-lld.git"
 SRIO_LLD_GIT_PROTOCOL = "git"
--- a/recipes-bsp/ti-sci-fw/ti-sci-fw_git.bb
+++ b/recipes-bsp/ti-sci-fw/ti-sci-fw_git.bb
@@ -3,8 +3,8 @@ DESCRIPTION = "TI SCI firmware"
 LICENSE = "TI-TFL"
 LIC_FILES_CHKSUM = "file://LICENCE.ti-keystone;md5=3a86335d32864b0bef996bee26cc0f2c"

-PV = "0.1.1.50"
-PR = "r2"
+PV = "0.1.1.37"
+PR = "r0"

 CLEANBROKEN = "1"

@@ -12,7 +12,7 @@ COMPATIBLE_MACHINE = "k2g"

 PACKAGE_ARCH = "${MACHINE_ARCH}"

-SRCREV = "ab507546f0f3f217f4c782a20845856e14b38224"
+SRCREV = "9fe8861924a990dcd48ada5099df592273c2e166"
 BRANCH ?= "ti-linux-firmware-4.1.y"

 SRC_URI = "git://git.ti.com/processor-firmware/ti-linux-firmware.git;protocol=git;branch=${BRANCH}"
--- a/recipes-bsp/traceframework/traceframework.inc
+++ b/recipes-bsp/traceframework/traceframework.inc
@@ -20,7 +20,8 @@ PV = "01.01.01.08"
 INC_PR = "r1"

 DEVICELIST = "k2k k2h k2e k2l"
-DEVICELIST_k2hk    = "k2k k2h"
+DEVICELIST_tci6614-evm = "c6614"
+DEVICELIST_k2hk-evm    = "k2k k2h"
 DEVICELIST_k2e     = "k2e"
 DEVICELIST_k2l-evm     = "k2l"

--- a/recipes-bsp/u-boot/u-boot-ti-staging_2016.05.bb
+++ b/recipes-bsp/u-boot/u-boot-ti-staging_2016.05.bb
@@ -1,7 +1,113 @@
 require u-boot-ti.inc

-PR = "r30"
+# u-boot needs devtree compiler to parse dts files
+DEPENDS += "dtc-native"

-BRANCH = "ti-u-boot-2016.05"
+DESCRIPTION = "u-boot bootloader for TI devices"

-SRCREV = "4db46a6bbde46e4587b77e14763787f66c292701"
+LIC_FILES_CHKSUM = "file://Licenses/README;md5=a2c678cfd4a4d97135585cad908541c6"
+
+PR = "r31"
+PV_append = "+git${SRCPV}"
+
+SRC_URI = "git://git.ti.com/ti-u-boot/ti-u-boot.git;protocol=git;branch=${BRANCH}"
+
+BRANCH ?= "ti-u-boot-2016.05"
+
+SRCREV = "e646599450834807fd334dd9593112e89aee11c7"
+
+# Support for secure devices - detailed info is in doc/README.ti-secure
+TI_SECURE_DEV_PKG ?= ""
+export TI_SECURE_DEV_PKG
+
+SPL_BINARY = "MLO"
+SPL_BINARY_k2e-hs-evm = ""
+SPL_UART_BINARY = "u-boot-spl.bin"
+
+# Keystone specifics
+UBOOT_SUFFIX_keystone = "bin"
+SPL_UART_BINARY_keystone = ""
+
+# SPI NOR Flash binaries
+UBOOT_SPI_SPL_BINARY = "u-boot-spl.bin"
+UBOOT_SPI_BINARY = "u-boot.img"
+UBOOT_SPI_GPH_BINARY = "u-boot-spi.gph"
+
+# SPI NOR Flash deployed images
+UBOOT_SPI_SPL_IMAGE = "u-boot-spl-${MACHINE}-${PV}-${PR}.bin"
+UBOOT_SPI_SPL_SYMLINK = "u-boot-spl-${MACHINE}.bin"
+UBOOT_SPI_IMAGE = "u-boot-${MACHINE}-${PV}-${PR}.img"
+UBOOT_SPI_SYMLINK = "u-boot-${MACHINE}.img"
+UBOOT_SPI_GPH_IMAGE = "u-boot-spi-${MACHINE}-${PV}-${PR}.gph"
+UBOOT_SPI_GPH_SYMLINK = "u-boot-spi-${MACHINE}.gph"
+
+# HS XLD
+UBOOT_HS_XLD_BINARY = "u-boot-spl_HS_X-LOADER"
+UBOOT_HS_XLD_IMAGE = "u-boot-spl_HS_X-LOADER-${MACHINE}-${PV}-${PR}"
+UBOOT_HS_XLD_SYMLINK = "u-boot-spl_HS_X-LOADER-${MACHINE}"
+
+# HS MLO
+UBOOT_HS_MLO_BINARY = "u-boot_HS_MLO"
+UBOOT_HS_MLO_IMAGE = "u-boot_HS_MLO-${MACHINE}-${PV}-${PR}"
+UBOOT_HS_MLO_SYMLINK = "u-boot_HS_MLO-${MACHINE}"
+
+do_compile_append_am437x-hs-evm () {
+	if [ -f ${S}/u-boot-spl_HS_ISSW ]; then
+		rm -rf ${S}/MLO
+		cp ${S}/u-boot-spl_HS_ISSW ${S}/MLO
+	fi
+}
+
+do_install_append () {
+	if [ -f ${S}/${UBOOT_HS_XLD_BINARY} ]; then
+		install ${S}/${UBOOT_HS_XLD_BINARY} ${D}/boot/${UBOOT_HS_XLD_IMAGE}
+		ln -sf ${UBOOT_HS_XLD_IMAGE} ${D}/boot/${UBOOT_HS_XLD_BINARY}
+	fi
+	if [ -f ${S}/${UBOOT_HS_MLO_BINARY} ]; then
+		install ${S}/${UBOOT_HS_MLO_BINARY} ${D}/boot/${UBOOT_HS_MLO_IMAGE}
+		ln -sf ${UBOOT_HS_MLO_IMAGE} ${D}/boot/${UBOOT_HS_MLO_BINARY}
+	fi
+}
+
+do_deploy_append () {
+	if [ -f ${S}/${UBOOT_HS_XLD_BINARY} ]; then
+		install ${S}/${UBOOT_HS_XLD_BINARY} ${DEPLOYDIR}/${UBOOT_HS_XLD_IMAGE}
+		rm -f ${UBOOT_HS_XLD_BINARY} ${UBOOT_HS_XLD_SYMLINK}
+		ln -sf ${UBOOT_HS_XLD_IMAGE} ${UBOOT_HS_XLD_SYMLINK}
+		ln -sf ${UBOOT_HS_XLD_IMAGE} ${UBOOT_HS_XLD_BINARY}
+	fi
+	if [ -f ${S}/${UBOOT_HS_MLO_BINARY} ]; then
+		install ${S}/${UBOOT_HS_MLO_BINARY} ${DEPLOYDIR}/${UBOOT_HS_MLO_IMAGE}
+		rm -f ${UBOOT_HS_MLO_BINARY} ${UBOOT_HS_MLO_SYMLINK}
+		ln -sf ${UBOOT_HS_MLO_IMAGE} ${UBOOT_HS_MLO_SYMLINK}
+		ln -sf ${UBOOT_HS_MLO_IMAGE} ${UBOOT_HS_MLO_BINARY}
+	fi
+}
+
+do_install_append_keystone () {
+	install ${S}/spl/${UBOOT_SPI_SPL_BINARY} ${D}/boot/${UBOOT_SPI_SPL_IMAGE}
+	ln -sf ${UBOOT_SPI_SPL_IMAGE} ${D}/boot/${UBOOT_SPI_SPL_BINARY}
+
+	install ${S}/${UBOOT_SPI_BINARY} ${D}/boot/${UBOOT_SPI_IMAGE}
+	ln -sf ${UBOOT_SPI_IMAGE} ${D}/boot/${UBOOT_SPI_BINARY}
+
+	install ${S}/${UBOOT_SPI_GPH_BINARY} ${D}/boot/${UBOOT_SPI_GPH_IMAGE}
+	ln -sf ${UBOOT_SPI_GPH_IMAGE} ${D}/boot/${UBOOT_SPI_GPH_BINARY}
+}
+
+do_deploy_append_keystone () {
+	install ${S}/spl/${UBOOT_SPI_SPL_BINARY} ${DEPLOYDIR}/${UBOOT_SPI_SPL_IMAGE}
+	rm -f ${UBOOT_SPI_SPL_BINARY} ${UBOOT_SPI_SPL_SYMLINK}
+	ln -sf ${UBOOT_SPI_SPL_IMAGE} ${UBOOT_SPI_SPL_SYMLINK}
+	ln -sf ${UBOOT_SPI_SPL_IMAGE} ${UBOOT_SPI_SPL_BINARY}
+
+	install ${S}/${UBOOT_SPI_BINARY} ${DEPLOYDIR}/${UBOOT_SPI_IMAGE}
+	rm -f ${UBOOT_SPI_BINARY} ${UBOOT_SPI_SYMLINK}
+	ln -sf ${UBOOT_SPI_IMAGE} ${UBOOT_SPI_SYMLINK}
+	ln -sf ${UBOOT_SPI_IMAGE} ${UBOOT_SPI_BINARY}
+
+	install ${S}/${UBOOT_SPI_GPH_BINARY} ${DEPLOYDIR}/${UBOOT_SPI_GPH_IMAGE}
+	rm -f ${UBOOT_SPI_GPH_BINARY} ${UBOOT_SPI_GPH_SYMLINK}
+	ln -sf ${UBOOT_SPI_GPH_IMAGE} ${UBOOT_SPI_GPH_SYMLINK}
+	ln -sf ${UBOOT_SPI_GPH_IMAGE} ${UBOOT_SPI_GPH_BINARY}
+}
--- a/recipes-bsp/u-boot/u-boot-ti-staging_2017.01.bb
+++ b/recipes-bsp/u-boot/u-boot-ti-staging_2017.01.bb
@@ -1,7 +0,0 @@
-require u-boot-ti.inc
-
-PR = "r4"
-
-BRANCH = "ti-u-boot-2017.01"
-
-SRCREV = "9fd60700db4562ffac00317a9a44761b8c3255f1"
--- a/recipes-bsp/u-boot/u-boot-ti.inc
+++ b/recipes-bsp/u-boot/u-boot-ti.inc
@@ -4,7 +4,7 @@ def get_git_revision(p):
    import subprocess

    try:
-        return subprocess.Popen("git rev-parse HEAD 2>/dev/null ", cwd=p, shell=True, stdout=subprocess.PIPE, universal_newlines=True).communicate()[0].rstrip()
+        return subprocess.Popen("git rev-parse HEAD 2>/dev/null ", cwd=p, shell=True, stdout=subprocess.PIPE).communicate()[0].rstrip()
    except OSError:
        return None

@@ -16,18 +16,8 @@ require ${COREBASE}/meta/recipes-bsp/u-boot/u-boot.inc

 FILESEXTRAPATHS_prepend := "${THISDIR}/u-boot:"

-SUMMARY = "u-boot bootloader for TI devices"
-
 LICENSE = "GPLv2+"
-LIC_FILES_CHKSUM = "file://Licenses/README;md5=a2c678cfd4a4d97135585cad908541c6"
-
-BRANCH ?= "master"
-SRC_URI = "git://git.ti.com/ti-u-boot/ti-u-boot.git;protocol=git;branch=${BRANCH}"
-
-PV_append = "+git${SRCPV}"
-
-# u-boot needs devtree compiler to parse dts files
-DEPENDS += "dtc-native bc-native"
+LIC_FILES_CHKSUM = "file://COPYING;md5=1707d6db1d42237583f50183a5651ecb"

 PACKAGE_ARCH = "${MACHINE_ARCH}"

@@ -38,132 +28,26 @@ PKG_${PN}-dbg = "u-boot-dbg"

 S = "${WORKDIR}/git"

-# Support for secure devices - detailed info is in doc/README.ti-secure
-TI_SECURE_DEV_PKG ?= ""
-export TI_SECURE_DEV_PKG
-
-# SPL (Second Program Loader)
-SPL_BINARY = "MLO"
-SPL_BINARY_k2e-hs-evm = ""
-SPL_BINARY_k2hk-hs-evm = ""
-SPL_BINARY_k2g-hs-evm = ""
-SPL_BINARY_omapl138 = ""
-
 # SPL (Second Program Loader) to be loaded over UART
-SPL_UART_BINARY = "u-boot-spl.bin"
-SPL_UART_BINARY_keystone = ""
-
+SPL_UART_BINARY ?= ""
 SPL_UART_IMAGE ?= "${SPL_UART_BINARY}-${MACHINE}-${PV}-${PR}"
 SPL_UART_SYMLINK ?= "${SPL_UART_BINARY}-${MACHINE}"

-# Keystone specifics
-UBOOT_SUFFIX_keystone = "bin"
-
-# SPI NOR Flash binaries
-UBOOT_SPI_SPL_BINARY = "u-boot-spl.bin"
-UBOOT_SPI_SPL_BINARY_k2e-hs-evm = ""
-UBOOT_SPI_SPL_BINARY_k2hk-hs-evm = ""
-UBOOT_SPI_SPL_BINARY_k2g-hs-evm = ""
-UBOOT_SPI_BINARY = "u-boot.img"
-UBOOT_SPI_GPH_BINARY = "u-boot-spi.gph"
-UBOOT_SPI_GPH_BINARY_k2e-hs-evm = ""
-UBOOT_SPI_GPH_BINARY_k2hk-hs-evm = ""
-UBOOT_SPI_GPH_BINARY_k2g-hs-evm = ""
-
-# SPI NOR Flash deployed images
-UBOOT_SPI_SPL_IMAGE = "u-boot-spl-${MACHINE}-${PV}-${PR}.bin"
-UBOOT_SPI_SPL_SYMLINK = "u-boot-spl-${MACHINE}.bin"
-UBOOT_SPI_IMAGE = "u-boot-${MACHINE}-${PV}-${PR}.img"
-UBOOT_SPI_SYMLINK = "u-boot-${MACHINE}.img"
-UBOOT_SPI_GPH_IMAGE = "u-boot-spi-${MACHINE}-${PV}-${PR}.gph"
-UBOOT_SPI_GPH_SYMLINK = "u-boot-spi-${MACHINE}.gph"
-
-# HS XLD
-UBOOT_HS_XLD_BINARY = "u-boot-spl_HS_X-LOADER"
-UBOOT_HS_XLD_IMAGE = "u-boot-spl_HS_X-LOADER-${MACHINE}-${PV}-${PR}"
-UBOOT_HS_XLD_SYMLINK = "u-boot-spl_HS_X-LOADER-${MACHINE}"
-
-# HS MLO
-UBOOT_HS_MLO_BINARY = "u-boot_HS_MLO"
-UBOOT_HS_MLO_IMAGE = "u-boot_HS_MLO-${MACHINE}-${PV}-${PR}"
-UBOOT_HS_MLO_SYMLINK = "u-boot_HS_MLO-${MACHINE}"
-
-do_compile_append_am437x-hs-evm () {
-	if [ -f ${B}/u-boot-spl_HS_ISSW ]; then
-		rm -rf ${B}/MLO
-		cp ${B}/u-boot-spl_HS_ISSW ${B}/MLO
-	fi
-}
-
 do_install_append () {
-	if [ "x${SPL_UART_BINARY}" != "x" ]; then
-		install ${B}/spl/${SPL_UART_BINARY} ${D}/boot/${SPL_UART_IMAGE}
-		ln -sf ${SPL_UART_IMAGE} ${D}/boot/${SPL_UART_BINARY}
-	fi
-	if [ -f ${B}/${UBOOT_HS_XLD_BINARY} ]; then
-		install ${B}/${UBOOT_HS_XLD_BINARY} ${D}/boot/${UBOOT_HS_XLD_IMAGE}
-		ln -sf ${UBOOT_HS_XLD_IMAGE} ${D}/boot/${UBOOT_HS_XLD_BINARY}
-	fi
-	if [ -f ${B}/${UBOOT_HS_MLO_BINARY} ]; then
-		install ${B}/${UBOOT_HS_MLO_BINARY} ${D}/boot/${UBOOT_HS_MLO_IMAGE}
-		ln -sf ${UBOOT_HS_MLO_IMAGE} ${D}/boot/${UBOOT_HS_MLO_BINARY}
-	fi
+    if [ "x${SPL_UART_BINARY}" != "x" ]
+    then
+        install ${S}/spl/${SPL_UART_BINARY} ${D}/boot/${SPL_UART_IMAGE}
+        ln -sf ${SPL_UART_IMAGE} ${D}/boot/${SPL_UART_BINARY}
+    fi
 }

 do_deploy_append () {
-	cd ${DEPLOYDIR}
-	if [ "x${SPL_UART_BINARY}" != "x" ]; then
-		install ${B}/spl/${SPL_UART_BINARY} ${DEPLOYDIR}/${SPL_UART_IMAGE}
-		rm -f ${DEPLOYDIR}/${SPL_UART_BINARY} ${DEPLOYDIR}/${SPL_UART_SYMLINK}
-		ln -sf ${SPL_UART_IMAGE} ${DEPLOYDIR}/${SPL_UART_BINARY}
-		ln -sf ${SPL_UART_IMAGE} ${DEPLOYDIR}/${SPL_UART_SYMLINK}
-	fi
-	if [ -f ${B}/${UBOOT_HS_XLD_BINARY} ]; then
-		install ${B}/${UBOOT_HS_XLD_BINARY} ${DEPLOYDIR}/${UBOOT_HS_XLD_IMAGE}
-		rm -f ${UBOOT_HS_XLD_BINARY} ${UBOOT_HS_XLD_SYMLINK}
-		ln -sf ${UBOOT_HS_XLD_IMAGE} ${UBOOT_HS_XLD_SYMLINK}
-		ln -sf ${UBOOT_HS_XLD_IMAGE} ${UBOOT_HS_XLD_BINARY}
-	fi
-	if [ -f ${B}/${UBOOT_HS_MLO_BINARY} ]; then
-		install ${B}/${UBOOT_HS_MLO_BINARY} ${DEPLOYDIR}/${UBOOT_HS_MLO_IMAGE}
-		rm -f ${UBOOT_HS_MLO_BINARY} ${UBOOT_HS_MLO_SYMLINK}
-		ln -sf ${UBOOT_HS_MLO_IMAGE} ${UBOOT_HS_MLO_SYMLINK}
-		ln -sf ${UBOOT_HS_MLO_IMAGE} ${UBOOT_HS_MLO_BINARY}
-	fi
-}
-
-do_install_append_keystone () {
-	if [ "x${UBOOT_SPI_SPL_BINARY}" != "x" ]; then
-		install ${B}/spl/${UBOOT_SPI_SPL_BINARY} ${D}/boot/${UBOOT_SPI_SPL_IMAGE}
-		ln -sf ${UBOOT_SPI_SPL_IMAGE} ${D}/boot/${UBOOT_SPI_SPL_BINARY}
-	fi
-
-	install ${B}/${UBOOT_SPI_BINARY} ${D}/boot/${UBOOT_SPI_IMAGE}
-	ln -sf ${UBOOT_SPI_IMAGE} ${D}/boot/${UBOOT_SPI_BINARY}
-
-	if [ "x${UBOOT_SPI_GPH_BINARY}" != "x" ]; then
-		install ${B}/${UBOOT_SPI_GPH_BINARY} ${D}/boot/${UBOOT_SPI_GPH_IMAGE}
-		ln -sf ${UBOOT_SPI_GPH_IMAGE} ${D}/boot/${UBOOT_SPI_GPH_BINARY}
-	fi
-}
-
-do_deploy_append_keystone () {
-	if [ "x${UBOOT_SPI_SPL_BINARY}" != "x" ]; then
-		install ${B}/spl/${UBOOT_SPI_SPL_BINARY} ${DEPLOYDIR}/${UBOOT_SPI_SPL_IMAGE}
-		rm -f ${UBOOT_SPI_SPL_BINARY} ${UBOOT_SPI_SPL_SYMLINK}
-		ln -sf ${UBOOT_SPI_SPL_IMAGE} ${UBOOT_SPI_SPL_SYMLINK}
-		ln -sf ${UBOOT_SPI_SPL_IMAGE} ${UBOOT_SPI_SPL_BINARY}
-	fi
-
-	install ${B}/${UBOOT_SPI_BINARY} ${DEPLOYDIR}/${UBOOT_SPI_IMAGE}
-	rm -f ${UBOOT_SPI_BINARY} ${UBOOT_SPI_SYMLINK}
-	ln -sf ${UBOOT_SPI_IMAGE} ${UBOOT_SPI_SYMLINK}
-	ln -sf ${UBOOT_SPI_IMAGE} ${UBOOT_SPI_BINARY}
-
-	if [ "x${UBOOT_SPI_GPH_BINARY}" != "x" ]; then
-		install ${B}/${UBOOT_SPI_GPH_BINARY} ${DEPLOYDIR}/${UBOOT_SPI_GPH_IMAGE}
-		rm -f ${UBOOT_SPI_GPH_BINARY} ${UBOOT_SPI_GPH_SYMLINK}
-		ln -sf ${UBOOT_SPI_GPH_IMAGE} ${UBOOT_SPI_GPH_SYMLINK}
-		ln -sf ${UBOOT_SPI_GPH_IMAGE} ${UBOOT_SPI_GPH_BINARY}
-	fi
+    cd ${DEPLOYDIR}
+    if [ "x${SPL_UART_BINARY}" != "x" ]
+    then
+        install ${S}/spl/${SPL_UART_BINARY} ${DEPLOYDIR}/${SPL_UART_IMAGE}
+        rm -f ${DEPLOYDIR}/${SPL_UART_BINARY} ${DEPLOYDIR}/${SPL_UART_SYMLINK}
+        ln -sf ${SPL_UART_IMAGE} ${DEPLOYDIR}/${SPL_UART_BINARY}
+        ln -sf ${SPL_UART_IMAGE} ${DEPLOYDIR}/${SPL_UART_SYMLINK}
+    fi
 }
--- a/recipes-bsp/wl18xx-fw/wl18xx-fw/0001-Add-Makefile-to-install-firmware-files.patch
+++ b/recipes-bsp/wl18xx-fw/wl18xx-fw/0001-Add-Makefile-to-install-firmware-files.patch
@@ -1,29 +0,0 @@
-From 3a8fc3ccf00796254d6cef4b6d4cd70dc37012e1 Mon Sep 17 00:00:00 2001
-From: Denys Dmytriyenko <denys@ti.com>
-Date: Fri, 10 Mar 2017 13:28:29 -0500
-Subject: [PATCH] Add Makefile to install firmware files
-
-Signed-off-by: Denys Dmytriyenko <denys@ti.com>
---
- Makefile | 9 +++++++++
- 1 file changed, 9 insertions(+)
- create mode 100644 Makefile
-
-diff --git a/Makefile b/Makefile
-new file mode 100644
-index 0000000..1cf38e3
--- /dev/null
-+++ b/Makefile
-@@ -0,0 +1,9 @@
-+# Installs the the ti-connectivity wlan firmware files into the root file system
-+
-+install:
-+	@if [ ! -d $(DESTDIR) ] ; then \
-+		echo "Target filesystem directory doesn't exist."; \
-+		exit 1; \
-+	fi
-+	install -d  $(DEST_DIR)/lib/firmware/ti-connectivity
-+	cp *.bin $(DEST_DIR)/lib/firmware/ti-connectivity/
-- 
-2.7.4
-
--- a/recipes-bsp/wl18xx-fw/wl18xx-fw_8.7.1.bb
+++ b/recipes-bsp/wl18xx-fw/wl18xx-fw_8.7.1.bb
@@ -1,26 +0,0 @@
-DESCRIPTION = "Firmware files for use with TI wl18xx"
-LICENSE = "TI-TSPA"
-LIC_FILES_CHKSUM = "file://LICENCE;md5=4977a0fe767ee17765ae63c435a32a9e"
-
-SRC_URI = " \
-	git://git.ti.com/wilink8-wlan/wl18xx_fw.git;protocol=git;branch=${BRANCH} \
-	file://0001-Add-Makefile-to-install-firmware-files.patch \
-"
-
-# Tag: R8.7-SP1 (8.7.1)
-SRCREV = "fe3909e93d15a4b17e43699dde2bba0e9a3c0abc"
-BRANCH = "master"
-
-S = "${WORKDIR}/git"
-
-CLEANBROKEN = "1"
-
-do_compile() {
-    :
-}
-
-do_install() {
-    oe_runmake 'DEST_DIR=${D}' install
-}
-
-FILES_${PN} = "/lib/firmware/ti-connectivity/*"
--- a/recipes-connectivity/wl18xx-calibrator/wl18xx-calibrator_8.7.1.bb
+++ b/recipes-connectivity/wl18xx-calibrator/wl18xx-calibrator_8.7.1.bb
@@ -1,24 +0,0 @@
-DESCRIPTION = "The calibrator utility for TI wireless solution based on wl18xx driver"
-LICENSE = "BSD"
-LIC_FILES_CHKSUM = "file://COPYING;md5=4725015cb0be7be389cf06deeae3683d"
-
-DEPENDS = "libnl"
-RDEPENDS_${PN} = "wl18xx-fw"
-
-#Tag: R8.7_SP1 (8.7.1)
-SRCREV = "39542357111d1f24e866c2857d561a348c04cce4"
-SRC_URI = "git://git.ti.com/wilink8-wlan/18xx-ti-utils.git"
-
-S = "${WORKDIR}/git"
-
-export CROSS_COMPILE = "${TARGET_PREFIX}"
-
-EXTRA_OEMAKE = "CFLAGS="${CFLAGS} -I${STAGING_INCDIR}/libnl3/ -DCONFIG_LIBNL32 " \
-		LDFLAGS="${LDFLAGS} -L${STAGING_LIBDIR}" \
-		CC="${CC}" \
-		NLVER=3"
-
-do_install() {
-    install -d ${D}${bindir}
-    install -m 0755 calibrator ${D}${bindir}/
-}
--- a/recipes-connectivity/wl18xx-target-scripts/wl18xx-target-scripts_8.7.1.bb
+++ b/recipes-connectivity/wl18xx-target-scripts/wl18xx-target-scripts_8.7.1.bb
@@ -1,22 +0,0 @@
-DESCRIPTION = "Scripts and configuration files for TI wireless drivers"
-LICENSE = "GPLv2"
-LIC_FILES_CHKSUM = "file://README;beginline=1;endline=21;md5=b8d6a0865f50159bf5c0d175d1f4a705"
-
-# Tag: R8.7_SP1 (8.7.1)
-SRCREV = "a07b6e711d2a70608101d3d6cdc5749c4d8a96d5"
-BRANCH = "sitara-scripts"
-SRC_URI = "git://git.ti.com/wilink8-wlan/wl18xx-target-scripts.git;protocol=git;branch=${BRANCH}"
-
-S = "${WORKDIR}/git"
-
-FILES_${PN} += "${datadir}/wl18xx/"
-
-do_install() {
-	install -d ${D}${datadir}/wl18xx/
-
-	scripts=`find ./ -type f -name "*.*"`
-	for s in $scripts
-	do
-		install -m 0755 $s ${D}${datadir}/wl18xx/
-	done
-}
--- a/recipes-connectivity/wlconf/wlconf_8.7.1.bb
+++ b/recipes-connectivity/wlconf/wlconf_8.7.1.bb
@@ -1,39 +0,0 @@
-DESCRIPTION = "Configuration utility for TI wireless drivers"
-LICENSE = "GPLv2"
-LIC_FILES_CHKSUM = "file://README;beginline=1;endline=21;md5=adc05a1903d3f107f85c90328e3a9438"
-
-# Tag: R8.7_SP1 (8.7.1) +fix
-SRCREV = "ee653d2845b0029c14f49ca83a2f6c02037ec239"
-SRC_URI = "git://git.ti.com/wilink8-wlan/18xx-ti-utils.git"
-
-S = "${WORKDIR}/git/wlconf"
-
-EXTRA_OEMAKE = "CC="${CC}""
-
-do_install() {
-	install -d ${D}${bindir}
-	install -d ${D}${bindir}/wlconf/
-	install -d ${D}${bindir}/wlconf/official_inis
-	install -d ${D}/lib/firmware/ti-connectivity
-
-	install -m 0755 wlconf ${D}${bindir}/wlconf/
-	install -m 0755 dictionary.txt ${D}${bindir}/wlconf/
-	install -m 0755 struct.bin ${D}${bindir}/wlconf/
-	install -m 0755 default.conf ${D}${bindir}/wlconf/
-	install -m 0755 wl18xx-conf-default.bin ${D}${bindir}/wlconf/
-	install -m 0755 wl18xx-conf-default.bin ${D}/lib/firmware/ti-connectivity/wl18xx-conf.bin
-	install -m 0755 README ${D}${bindir}/wlconf/
-	install -m 0755 example.conf ${D}${bindir}/wlconf/
-	install -m 0755 example.ini ${D}${bindir}/wlconf/
-	install -m 0755 configure-device.sh ${D}${bindir}/wlconf/
-	install -m 0755 ${S}/official_inis/* \
-			${D}${bindir}/wlconf/official_inis/
-}
-
-FILES_${PN} += " \
-	${bindir}/wlconf \
-	${bindir}/wlconf/official_inis \
-	/lib/firmware/ti-connectivity/wl18xx-conf.bin \
-"
-
-FILES_${PN}-dbg += "${bindir}/wlconf/.debug"
--- a/recipes-graphics/gbm/libgbm_10.0.0.bb
+++ b/recipes-graphics/gbm/libgbm_10.0.0.bb
@@ -1,10 +1,8 @@
-SUMMARY = "Userspace interface for the kernel GBM services"
-HOMEPAGE = "http://git.ti.com/glsdk/libgbm.git"
-
+DESCRIPTION = "Userspace interface for the kernel GBM services."
+HOMEPAGE = "http://git.ti.com"
 LICENSE = "MIT"
 LIC_FILES_CHKSUM = "file://gbm.c;beginline=1;endline=26;md5=b871c7f2f477df29ee4c0ec437b187f7"
-
-DEPENDS = "libdrm udev"
+DEPENDS = "libdrm"

 inherit autotools pkgconfig

--- a/recipes-graphics/libgles/ti-sgx-ddk-um_1.14.3699939.bb
+++ b/recipes-graphics/libgles/ti-sgx-ddk-um_1.14.3699939.bb
@@ -31,7 +31,7 @@ INITSCRIPT_PARAMS = "defaults 8"

 inherit update-rc.d

-PR = "r24"
+PR = "r23"
 PROVIDES += "virtual/egl virtual/libgles1 virtual/libgles2 omap5-sgx-ddk-um-linux"

 DEPENDS += "libdrm udev libgbm wayland libffi"
@@ -73,6 +73,5 @@ INHIBIT_SYSROOT_STRIP = "1"

 INSANE_SKIP_${PN} += "dev-so ldflags useless-rpaths"
 INSANE_SKIP_${PN}-plugins = "dev-so"
-INSANE_SKIP_${PN} += "already-stripped"

 CLEANBROKEN = "1"
--- a/recipes-kernel/kselftests/kselftests_4.4.bb
+++ b/recipes-kernel/kselftests/kselftests_4.4.bb
@@ -0,0 +1,89 @@
+SUMMARY = "Linux Kernel Selftests"
+LICENSE = "GPLv2"
+LIC_FILES_CHKSUM = "file://COPYING;md5=d7810fab7487fb0aad327b76f1be7cd7"
+
+SRC_URI = "https://www.kernel.org/pub/linux/kernel/v4.x/linux-${PV}.tar.xz"
+
+SRC_URI[md5sum] = "9a78fa2eb6c68ca5a40ed5af08142599"
+SRC_URI[sha256sum] = "401d7c8fef594999a460d10c72c5a94e9c2e1022f16795ec51746b0d165418b2"
+
+S = "${WORKDIR}/linux-${PV}"
+
+PACKAGE_ARCH = "${MACHINE_ARCH}"
+
+DEPENDS = "popt"
+
+inherit kernel-arch
+
+TARGETS = "cpu-hotplug efivarfs exec firmware ftrace kcmp memfd memory-hotplug \
+	mount mqueue net ptrace size sysctl timers user vm"
+
+# Arch specific tests
+TARGETS_append_x86 = " breakpoints ipc x86"
+TARGETS_append_x86-64 = " breakpoints ipc x86"
+TARGETS_append_powerpc = " powerpc"
+TARGETS_append_powerpc64 = " powerpc"
+
+EXTRA_OEMAKE += "-C tools/testing/selftests TARGETS="${TARGETS}" INSTALL_PATH=${D}${bindir}/kselftests CC="${CC}""
+
+# Their Makefiles are so sloppy, let's clean up a bit
+do_configure () {
+	sed "s|^CC := .*||g" -i ${S}/tools/testing/selftests/lib.mk
+	sed "s|^CC = .*||g" -i ${S}/tools/testing/selftests/timers/Makefile
+	sed "s|^CC = .*||g" -i ${S}/tools/testing/selftests/memfd/Makefile
+	sed "s|^CC := .*||g" -i ${S}/tools/testing/selftests/powerpc/switch_endian/Makefile
+	sed "s|gcc|\$(CC)|g" -i ${S}/tools/testing/selftests/breakpoints/Makefile
+	sed "s|^LDFLAGS += -lrt -lpthread|LDLIBS += -lrt -lpthread|g" -i ${S}/tools/testing/selftests/timers/Makefile
+}
+
+do_compile () {
+	oe_runmake
+}
+
+do_install () {
+	oe_runmake install
+	chown -R root:root ${D}
+}
+
+PACKAGE_BEFORE_PN = "${PN}-breakpoints ${PN}-cpu-hotplug ${PN}-efivarfs ${PN}-exec ${PN}-firmware ${PN}-ftrace \
+	${PN}-ipc ${PN}-kcmp ${PN}-memfd ${PN}-memory-hotplug ${PN}-mount ${PN}-mqueue ${PN}-net ${PN}-powerpc \
+	${PN}-ptrace ${PN}-size ${PN}-sysctl ${PN}-timers ${PN}-user ${PN}-vm ${PN}-x86"
+
+FILES_${PN}-breakpoints = "${bindir}/kselftests/breakpoints"
+FILES_${PN}-cpu-hotplug = "${bindir}/kselftests/cpu-hotplug"
+FILES_${PN}-efivarfs = "${bindir}/kselftests/efivarfs"
+FILES_${PN}-exec = "${bindir}/kselftests/exec"
+FILES_${PN}-firmware = "${bindir}/kselftests/firmware"
+FILES_${PN}-ftrace = "${bindir}/kselftests/ftrace"
+FILES_${PN}-ipc = "${bindir}/kselftests/ipc"
+FILES_${PN}-kcmp = "${bindir}/kselftests/kcmp"
+FILES_${PN}-memfd = "${bindir}/kselftests/memfd"
+FILES_${PN}-memory-hotplug = "${bindir}/kselftests/memory-hotplug"
+FILES_${PN}-mount = "${bindir}/kselftests/mount"
+FILES_${PN}-mqueue = "${bindir}/kselftests/mqueue"
+FILES_${PN}-net = "${bindir}/kselftests/net"
+FILES_${PN}-powerpc = "${bindir}/kselftests/powerpc"
+FILES_${PN}-ptrace = "${bindir}/kselftests/ptrace"
+FILES_${PN}-size = "${bindir}/kselftests/size"
+FILES_${PN}-sysctl = "${bindir}/kselftests/sysctl"
+FILES_${PN}-timers = "${bindir}/kselftests/timers"
+FILES_${PN}-user = "${bindir}/kselftests/user"
+FILES_${PN}-vm = "${bindir}/kselftests/vm"
+FILES_${PN}-x86 = "${bindir}/kselftests/x86"
+FILES_${PN}-dbg += "${bindir}/kselftests/*/.debug"
+
+RDEPENDS_${PN}-cpu-hotplug += "bash"
+RDEPENDS_${PN}-efivarfs += "bash"
+RDEPENDS_${PN}-memory-hotplug += "bash"
+RDEPENDS_${PN}-net += "bash"
+RDEPENDS_${PN}-vm += "bash"
+RDEPENDS_${PN} += "bash ${PN}-cpu-hotplug ${PN}-efivarfs ${PN}-exec ${PN}-firmware ${PN}-ftrace \
+	${PN}-kcmp ${PN}-memfd ${PN}-memory-hotplug ${PN}-mount ${PN}-mqueue ${PN}-net ${PN}-ptrace \
+	${PN}-size ${PN}-sysctl ${PN}-timers ${PN}-user ${PN}-vm"
+
+RDEPENDS_${PN}_append_x86 = " ${PN}-breakpoints ${PN}-ipc ${PN}-x86"
+RDEPENDS_${PN}_append_x86-64 = " ${PN}-breakpoints ${PN}-ipc ${PN}-x86"
+RDEPENDS_${PN}_append_powerpc = " ${PN}-powerpc"
+RDEPENDS_${PN}_append_powerpc64 = " ${PN}-powerpc"
+
+INSANE_SKIP_${PN} = "already-stripped"
--- a/recipes-kernel/kselftests/kselftests_4.9.bb
+++ b/recipes-kernel/kselftests/kselftests_4.9.bb
@@ -1,188 +0,0 @@
-SUMMARY = "Linux Kernel Selftests"
-LICENSE = "GPLv2"
-LIC_FILES_CHKSUM = "file://COPYING;md5=d7810fab7487fb0aad327b76f1be7cd7"
-
-SRC_URI = "https://www.kernel.org/pub/linux/kernel/v4.x/linux-${PV}.tar.xz"
-
-SRC_URI[md5sum] = "0a68ef3615c64bd5ee54a3320e46667d"
-SRC_URI[sha256sum] = "029098dcffab74875e086ae970e3828456838da6e0ba22ce3f64ef764f3d7f1a"
-
-S = "${WORKDIR}/linux-${PV}"
-
-PACKAGE_ARCH = "${MACHINE_ARCH}"
-
-DEPENDS = "libcap libcap-ng popt rsync-native"
-
-inherit kernel-arch
-
-# Filter out arch specific tests
-TARGETS = " \
-	${@bb.utils.contains_any("TARGET_ARCH", [ "x86", "x86-64" ], "breakpoints", "", d)} \
-	capabilities \
-	cpu-hotplug \
-	efivarfs \
-	exec \
-	firmware \
-	ftrace \
-	futex \
-	${@bb.utils.contains_any("TARGET_ARCH", [ "x86", "x86-64" ], "ipc", "", d)} \
-	kcmp \
-	lib \
-	membarrier \
-	memfd \
-	memory-hotplug \
-	mount \
-	mqueue \
-	net \
-	nsfs \
-	${@bb.utils.contains_any("TARGET_ARCH", [ "powerpc", "powerpc64" ], "powerpc", "", d)} \
-	pstore \
-	ptrace \
-	seccomp \
-	sigaltstack \
-	size \
-	static_keys \
-	sysctl \
-	timers \
-	user \
-	vm \
-	${@bb.utils.contains_any("TARGET_ARCH", [ "x86", "x86-64" ], "x86", "", d)} \
-	zram \
-"
-
-EXTRA_OEMAKE += "-C tools/testing/selftests TARGETS="${TARGETS}" INSTALL_PATH=${D}${bindir}/kselftests CC="${CC}""
-
-# Their Makefiles are so sloppy, let's clean up a bit
-do_configure () {
-	sed "s|^CC := .*||g" -i ${S}/tools/testing/selftests/lib.mk
-	sed "s|^CC = .*||g" -i ${S}/tools/testing/selftests/timers/Makefile
-	sed "s|^CC = .*||g" -i ${S}/tools/testing/selftests/memfd/Makefile
-	sed "s|^CC := .*||g" -i ${S}/tools/testing/selftests/powerpc/switch_endian/Makefile
-	sed "s|gcc|\$(CC)|g" -i ${S}/tools/testing/selftests/breakpoints/Makefile
-	sed "s|TARGETS|F_TARGETS|g" -i ${S}/tools/testing/selftests/futex/functional/Makefile
-	sed "s|^LDFLAGS += -lpthread|LDLIBS += -lpthread|g" -i ${S}/tools/testing/selftests/seccomp/Makefile
-	sed "s|^LDFLAGS += -lrt -lpthread|LDLIBS += -lrt -lpthread|g" -i ${S}/tools/testing/selftests/timers/Makefile
-	sed "s|BINARIES|TEST_PROGS|g" -i ${S}/tools/testing/selftests/sigaltstack/Makefile
-}
-
-do_compile () {
-	oe_runmake
-}
-
-do_install () {
-	oe_runmake install
-	chown -R root:root ${D}
-	# fixup run_kselftest.sh due to spurious lines starting by "make[1]:"
-	sed -i '/^make/d' ${D}${bindir}/kselftests/run_kselftest.sh
-}
-
-PACKAGE_BEFORE_PN = " \
-	${PN}-breakpoints \
-	${PN}-capabilities \
-	${PN}-cpu-hotplug \
-	${PN}-efivarfs \
-	${PN}-exec \
-	${PN}-firmware \
-	${PN}-ftrace \
-	${PN}-futex \
-	${PN}-ipc \
-	${PN}-kcmp \
-	${PN}-lib \
-	${PN}-membarrier \
-	${PN}-memfd \
-	${PN}-memory-hotplug \
-	${PN}-mount \
-	${PN}-mqueue \
-	${PN}-net \
-	${PN}-nsfs \
-	${PN}-powerpc \
-	${PN}-pstore \
-	${PN}-ptrace \
-	${PN}-seccomp \
-	${PN}-sigaltstack \
-	${PN}-size \
-	${PN}-static-keys \
-	${PN}-sysctl \
-	${PN}-timers \
-	${PN}-user \
-	${PN}-vm \
-	${PN}-x86 \
-	${PN}-zram \
-"
-
-FILES_${PN}-breakpoints = "${bindir}/kselftests/breakpoints"
-FILES_${PN}-capabilities = "${bindir}/kselftests/capabilities"
-FILES_${PN}-cpu-hotplug = "${bindir}/kselftests/cpu-hotplug"
-FILES_${PN}-efivarfs = "${bindir}/kselftests/efivarfs"
-FILES_${PN}-exec = "${bindir}/kselftests/exec"
-FILES_${PN}-firmware = "${bindir}/kselftests/firmware"
-FILES_${PN}-ftrace = "${bindir}/kselftests/ftrace"
-FILES_${PN}-futex = "${bindir}/kselftests/futex"
-FILES_${PN}-ipc = "${bindir}/kselftests/ipc"
-FILES_${PN}-kcmp = "${bindir}/kselftests/kcmp"
-FILES_${PN}-lib = "${bindir}/kselftests/lib"
-FILES_${PN}-membarrier = "${bindir}/kselftests/membarrier"
-FILES_${PN}-memfd = "${bindir}/kselftests/memfd"
-FILES_${PN}-memory-hotplug = "${bindir}/kselftests/memory-hotplug"
-FILES_${PN}-mount = "${bindir}/kselftests/mount"
-FILES_${PN}-mqueue = "${bindir}/kselftests/mqueue"
-FILES_${PN}-net = "${bindir}/kselftests/net"
-FILES_${PN}-nsfs = "${bindir}/kselftests/nsfs"
-FILES_${PN}-powerpc = "${bindir}/kselftests/powerpc"
-FILES_${PN}-pstore = "${bindir}/kselftests/pstore"
-FILES_${PN}-ptrace = "${bindir}/kselftests/ptrace"
-FILES_${PN}-seccomp = "${bindir}/kselftests/seccomp"
-FILES_${PN}-sigaltstack = "${bindir}/kselftests/sigaltstack"
-FILES_${PN}-size = "${bindir}/kselftests/size"
-FILES_${PN}-static-keys = "${bindir}/kselftests/static_keys"
-FILES_${PN}-sysctl = "${bindir}/kselftests/sysctl"
-FILES_${PN}-timers = "${bindir}/kselftests/timers"
-FILES_${PN}-user = "${bindir}/kselftests/user"
-FILES_${PN}-vm = "${bindir}/kselftests/vm"
-FILES_${PN}-x86 = "${bindir}/kselftests/x86"
-FILES_${PN}-zram = "${bindir}/kselftests/zram"
-FILES_${PN}-dbg += "${bindir}/kselftests/*/.debug"
-
-RDEPENDS_${PN}-cpu-hotplug += "bash"
-RDEPENDS_${PN}-efivarfs += "bash"
-RDEPENDS_${PN}-futex += "bash ncurses"
-RDEPENDS_${PN}-memory-hotplug += "bash"
-RDEPENDS_${PN}-net += "bash"
-RDEPENDS_${PN}-vm += "bash"
-RDEPENDS_${PN}-zram += "bash"
-RDEPENDS_${PN} += "bash \
-	${PN}-capabilities \
-	${PN}-cpu-hotplug \
-	${PN}-efivarfs \
-	${PN}-exec \
-	${PN}-firmware \
-	${PN}-ftrace \
-	${PN}-futex \
-	${PN}-kcmp \
-	${PN}-lib \
-	${PN}-membarrier \
-	${PN}-memfd \
-	${PN}-memory-hotplug \
-	${PN}-mount \
-	${PN}-mqueue \
-	${PN}-net \
-	${PN}-nsfs \
-	${PN}-pstore \
-	${PN}-ptrace \
-	${PN}-seccomp \
-	${PN}-sigaltstack \
-	${PN}-size \
-	${PN}-static-keys \
-	${PN}-sysctl \
-	${PN}-timers \
-	${PN}-user \
-	${PN}-vm \
-	${PN}-zram \
-"
-
-RDEPENDS_${PN}_append_x86 = " ${PN}-breakpoints ${PN}-ipc ${PN}-x86"
-RDEPENDS_${PN}_append_x86-64 = " ${PN}-breakpoints ${PN}-ipc ${PN}-x86"
-RDEPENDS_${PN}_append_powerpc = " ${PN}-powerpc"
-RDEPENDS_${PN}_append_powerpc64 = " ${PN}-powerpc"
-
-INSANE_SKIP_${PN} = "already-stripped"
--- a/recipes-kernel/linux/cmem.inc
+++ b/recipes-kernel/linux/cmem.inc
@@ -27,7 +27,7 @@ CMEM_DEVICETREE_dra74x = "dra7-evm.dtb dra7-evm-lcd-lg.dtb dra7-evm-lcd-osd.dtb
 RESERVE_CMEM ?= "0"

 # Add correct cmem.dtsi to SRC_URI for each variant for a given machine
-python do_unpack() {
+python() {
    old_overrides = d.getVar('OVERRIDES', False)

    # Initialize with empty string to simplify logic to append to SRC_URI
@@ -42,7 +42,6 @@ python do_unpack() {
        cmem_dtsi.add(localdata.getVar('CMEM_DTSI', True))

    d.appendVar('SRC_URI', ' file://'.join(cmem_dtsi))
-    bb.build.exec_func('base_do_unpack', d)
 }

 python do_setup_cmem() {
--- a/recipes-kernel/linux/files/k2hk-evm/cmem.dtsi
+++ b/recipes-kernel/linux/files/k2hk-evm/cmem.dtsi
--- a/recipes-kernel/linux/files/k2hk-evm/k2hk-uio.dtsi
+++ b/recipes-kernel/linux/files/k2hk-evm/k2hk-uio.dtsi
--- a/recipes-kernel/linux/linux-ti-staging-4.1/defconfig
+++ b/recipes-kernel/linux/linux-ti-staging-4.1/defconfig
@@ -0,0 +1 @@
+use-combined-config=ti_config_fragments/defconfig_fragment
--- a/recipes-kernel/linux/linux-ti-staging-4.1/keystone/defconfig
+++ b/recipes-kernel/linux/linux-ti-staging-4.1/keystone/defconfig
@@ -0,0 +1 @@
+use-combined-config=ti_config_fragments/multi_core_defconfig_fragment
--- a/recipes-kernel/linux/linux-ti-staging-4.9/defconfig
+++ b/recipes-kernel/linux/linux-ti-staging-4.9/defconfig
@@ -1 +0,0 @@
-use-tisdk-config=ti_sdk_omap2_release
--- a/recipes-kernel/linux/linux-ti-staging-4.9/dra7xx/defconfig
+++ b/recipes-kernel/linux/linux-ti-staging-4.9/dra7xx/defconfig
@@ -1 +0,0 @@
-use-tisdk-config=ti_sdk_dra7x_release
--- a/recipes-kernel/linux/linux-ti-staging-4.9/k2g/defconfig
+++ b/recipes-kernel/linux/linux-ti-staging-4.9/k2g/defconfig
@@ -1 +0,0 @@
-use-tisdk-config=ti_sdk_k2g_release
--- a/recipes-kernel/linux/linux-ti-staging-4.9/keystone/defconfig
+++ b/recipes-kernel/linux/linux-ti-staging-4.9/keystone/defconfig
@@ -1 +0,0 @@
-use-tisdk-config=ti_sdk_keystone_release
--- a/recipes-kernel/linux/linux-ti-staging-4.9/omapl138/defconfig
+++ b/recipes-kernel/linux/linux-ti-staging-4.9/omapl138/defconfig
@@ -1 +0,0 @@
-use-tisdk-config=ti_sdk_omapl138_release
--- a/recipes-kernel/linux/linux-ti-staging-4.9/ti33x/defconfig
+++ b/recipes-kernel/linux/linux-ti-staging-4.9/ti33x/defconfig
@@ -1 +0,0 @@
-use-tisdk-config=ti_sdk_am3x_release
--- a/recipes-kernel/linux/linux-ti-staging-4.9/ti43x/defconfig
+++ b/recipes-kernel/linux/linux-ti-staging-4.9/ti43x/defconfig
@@ -1 +0,0 @@
-use-tisdk-config=ti_sdk_am4x_release
--- a/recipes-kernel/linux/linux-ti-staging-rt-4.1/defconfig
+++ b/recipes-kernel/linux/linux-ti-staging-rt-4.1/defconfig
@@ -0,0 +1 @@
+use-combined-config=ti_config_fragments/rt_defconfig_fragment
--- a/recipes-kernel/linux/linux-ti-staging-rt-4.1/keystone/defconfig
+++ b/recipes-kernel/linux/linux-ti-staging-rt-4.1/keystone/defconfig
@@ -0,0 +1 @@
+use-combined-config=ti_config_fragments/rt_multi_core_defconfig_fragment
--- a/recipes-kernel/linux/linux-ti-staging-rt-4.9/defconfig
+++ b/recipes-kernel/linux/linux-ti-staging-rt-4.9/defconfig
@@ -1 +0,0 @@
-use-tisdk-config=ti_sdk_omap2_rt_release
--- a/recipes-kernel/linux/linux-ti-staging-rt-4.9/dra7xx/defconfig
+++ b/recipes-kernel/linux/linux-ti-staging-rt-4.9/dra7xx/defconfig
@@ -1 +0,0 @@
-use-tisdk-config=ti_sdk_dra7x_rt_release
--- a/recipes-kernel/linux/linux-ti-staging-rt-4.9/k2g/defconfig
+++ b/recipes-kernel/linux/linux-ti-staging-rt-4.9/k2g/defconfig
@@ -1 +0,0 @@
-use-tisdk-config=ti_sdk_k2g_rt_release
--- a/recipes-kernel/linux/linux-ti-staging-rt-4.9/keystone/defconfig
+++ b/recipes-kernel/linux/linux-ti-staging-rt-4.9/keystone/defconfig
@@ -1 +0,0 @@
-use-tisdk-config=ti_sdk_keystone_rt_release
--- a/recipes-kernel/linux/linux-ti-staging-rt-4.9/ti33x/defconfig
+++ b/recipes-kernel/linux/linux-ti-staging-rt-4.9/ti33x/defconfig
@@ -1 +0,0 @@
-use-tisdk-config=ti_sdk_am3x_rt_release
--- a/recipes-kernel/linux/linux-ti-staging-rt-4.9/ti43x/defconfig
+++ b/recipes-kernel/linux/linux-ti-staging-rt-4.9/ti43x/defconfig
@@ -1 +0,0 @@
-use-tisdk-config=ti_sdk_am4x_rt_release
--- a/recipes-kernel/linux/linux-ti-staging-rt_4.1.bb
+++ b/recipes-kernel/linux/linux-ti-staging-rt_4.1.bb
@@ -0,0 +1,9 @@
+require linux-ti-staging_4.1.bb
+
+# Look in the generic major.minor directory for files
+# This will have priority over generic non-rt path
+FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}-4.1:"
+
+BRANCH = "ti-rt-linux-4.1.y"
+
+SRCREV = "3bef1493dbbc61880f09cfda285cd0032a501d41"
--- a/recipes-kernel/linux/linux-ti-staging-rt_4.4.bb
+++ b/recipes-kernel/linux/linux-ti-staging-rt_4.4.bb
@@ -6,4 +6,4 @@ FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}-4.4:"

 BRANCH = "ti-rt-linux-4.4.y"

-SRCREV = "00eb0a0737110139728384e2be21656f9669f8a8"
+SRCREV = "de9a74a4c9e5122c34b6825f51793910dd8155b5"
--- a/Show More
+++ b/Show More
				`@@ -0,0 +1 @@`
				`use-combined-config=ti_config_fragments/defconfig_fragment`
				`@@ -1 +0,0 @@`
				`use-tisdk-config=ti_sdk_keystone_rt_release`