am65xx-hs-evm: fix load address for FIT image

Signed-off-by: Denys Dmytriyenko <denys@ti.com>
u-boot-ti-staging: switch to ti-2019.01 branch
2026-04-20 19:53:43 +00:00 · 2019-05-24 20:57:52 +00:00 · 2019-05-24 19:22:41 +00:00 · 2019-05-23 21:37:40 +00:00 · 2019-05-21 20:23:00 +00:00 · 2019-05-17 22:31:45 +00:00
368 changed files with 1833 additions and 4821 deletions
--- a/16
+++ b/16
@@ -8,11 +8,7 @@ This layer depends on:

 URI: git://git.openembedded.org/openembedded-core
 layers: meta
-branch: dunfell
-
-URI: git://git.yoctoproject.org/meta-arm
-layers: meta-arm
-branch: dunfell
+branch: thud


 The base BSP part of meta-ti should work with different OpenEmbedded/Yocto
@@ -22,12 +18,8 @@ distro-less (only with OE-Core), with Yocto/Poky, with Angstrom or Arago.
 Please follow the recommended setup procedures of your OE distribution.


-Send pull requests, patches, comments or questions to:
-meta-ti@lists.yoctoproject.org
-
+Send pull requests, patches, comments or questions to meta-ti@yoctoproject.org
 Please note - meta-ti mailing list requires subscription for posting:
-https://lists.yoctoproject.org/g/meta-ti
+https://lists.yoctoproject.org/listinfo/meta-ti

-Maintainers:
-Ryan Eatmon <reatmon@ti.com>
-Denys Dmytriyenko <denys@konsulko.com>
+Maintainers: Denys Dmytriyenko <denys@ti.com>
--- a/classes/ti-pdk-fetch.bbclass
+++ b/classes/ti-pdk-fetch.bbclass
@@ -1,47 +0,0 @@
-TI_PDK_GIT_URI ?= "git://git.ti.com/processor-sdk/pdk.git"
-TI_PDK_GIT_BRANCH ?= "master"
-TI_PDK_GIT_PROTOCOL ?= "git"
-TI_PDK_SRCREV ?= "a1ace885998e9adbcbbd0abf8b9ded6ba9ec54ff"
-
-TI_PDK_VERSION ?= "2020.5.6"
-
-PV = "${TI_PDK_VERSION}"
-PE = "2"
-
-TI_PDK_COMP ?= ""
-TI_PDK_COMP_PATH = "${@'${TI_PDK_COMP}'.replace('.','/')}"
-
-TI_PDK_SOURCE_PN = "ti-pdk-source"
-TI_PDK_SOURCE_WORKDIR = "${TMPDIR}/work-shared/ti-pdk-${PV}"
-TI_PDK_SOURCE = "${TI_PDK_SOURCE_WORKDIR}/git"
-
-S = "${@'${WORKDIR}/git/${TI_PDK_COMP_PATH}'.rstrip('/')}"
-
-# Hard-link only required sources from PDK
-python do_unpack_append() {
-    if len(d.getVar('TI_PDK_COMP') or '') > 0:
-        import shutil
-
-        # Get src/dst paths
-        src = os.path.join(d.getVar('TI_PDK_SOURCE'),'packages',d.getVar('TI_PDK_COMP_PATH'))
-        s = d.getVar('S')
-
-        # Set up the directory structure, except for the root of the sources
-        # hard-linked.
-        bb.utils.mkdirhier(s)
-        os.rmdir(s)
-
-        # Recursively hard-link the sources
-        shutil.copytree(src, s, copy_function=os.link)
-
-        # Recursively hard-link the git directory
-        shutil.copytree(os.path.join(d.getVar('TI_PDK_SOURCE'),'.git'), os.path.join(s,'.git'), copy_function=os.link)
-}
-
-# Make sure that ti-pdk-source is unpacked before we set up the hardlinks.
-python __anonymous () {
-    pn = d.getVar('PN')
-    pdk_src_pn = d.getVar('TI_PDK_SOURCE_PN')
-    if pn != pdk_src_pn:
-        d.appendVarFlag('do_unpack', 'depends', ' ${TI_PDK_SOURCE_PN}:do_unpack')
-}
--- a/classes/ti-pdk.bbclass
+++ b/classes/ti-pdk.bbclass
@@ -3,16 +3,14 @@ require recipes-ti/includes/ti-staging.inc

 inherit perlnative

-DEPENDS = "ti-xdctools-native ti-cg-xml-native ti-sysbios common-csl-ip-rtos libxml-simple-perl-native gcc-arm-baremetal-native ti-cgt6x-native ti-cgt-pru-native ti-pdk-build-rtos doxygen-native"
+DEPENDS = "ti-xdctools-native ti-cg-xml-native ti-sysbios common-csl-ip-rtos libxml-simple-perl-native gcc-arm-none-eabi-native ti-cgt6x-native ti-cgt-pru-native ti-pdk-build-rtos doxygen-native"

 DEPENDS_append_omap-a15 = " ti-cgt-arm-native"
 DEPENDS_remove_ti33x = "ti-cgt6x-native"
 DEPENDS_remove_ti43x = "ti-cgt6x-native"
 DEPENDS_append_omapl1 = " ti-cgt-arm-native"
-DEPENDS_remove_am65xx = "gcc-arm-baremetal-native ti-cgt6x-native"
-DEPENDS_append_am65xx = " ti-cgt-arm-native gcc-linaro-baremetal-aarch64-native"
-DEPENDS_remove_j7 = "gcc-arm-baremetal-native"
-DEPENDS_append_j7 = " ti-cgt-arm-native gcc-linaro-baremetal-aarch64-native ti-cgt7x-native"
+DEPENDS_remove_k3 = "gcc-arm-none-eabi-native ti-cgt6x-native"
+DEPENDS_append_k3 = " ti-cgt-arm-native gcc-linaro-baremetal-aarch64-native"

 S = "${WORKDIR}/git"
 B = "${WORKDIR}/build"
@@ -45,7 +43,6 @@ export TOOLCHAIN_PATH_A15 = "${GCC_ARM_NONE_TOOLCHAIN}"
 export TOOLCHAIN_PATH_M4 = "${M4_TOOLCHAIN_INSTALL_DIR}"
 export TOOLCHAIN_PATH_Arm9 = "${M4_TOOLCHAIN_INSTALL_DIR}"
 export C6X_GEN_INSTALL_PATH = "${STAGING_DIR_NATIVE}/usr/share/ti/cgt-c6x"
-export C7X_GEN_INSTALL_PATH = "${STAGING_DIR_NATIVE}/usr/share/ti/cgt-c7x"
 export TOOLCHAIN_PATH_EVE = "${STAGING_DIR_NATIVE}/usr/share/ti/cgt-arp32"
 export CL_PRU_INSTALL_PATH = "${TI_CGT_PRU_INSTALL_DIR}"
 export TOOLCHAIN_PATH_GCC_ARCH64 = "${GCC_LINARO_BAREMETAL_AARCH64_TOOLCHAIN}"
@@ -62,7 +59,7 @@ export SECTTI="perl ${CG_XML_INSTALL_DIR}/ofd/sectti.pl"
 TI_PDK_XDCMAKE ?= "1"

 # By default, only build the cores with available toolchains
-TI_PDK_LIMIT_CORES ?= "a15_0 ipu1_0 ipu1_1 ipu2_0 ipu2_1 mpu1_0 mcu1_0 mcu1_1 mcu2_0 mcu2_1 mcu3_0 mcu3_1 c66x c66xdsp_1 c66xdsp_2 c7x_1 arm9_0 c674x a9host a8host pru_0 pru_1"
+TI_PDK_LIMIT_CORES ?= "a15_0 ipu1_0 ipu1_1 ipu2_0 ipu2_1 c66x c66xdsp_1 c66xdsp_2 arm9_0 c674x a9host a8host pru_0 pru_1"
 TI_PDK_LIMIT_SOCS ?= ""
 TI_PDK_LIMIT_BOARDS ?= ""
 TI_PDK_MAKE_TARGET ?= "release"
@@ -71,7 +68,7 @@ TI_PDK_DOXYGEN_SUPPORT ?= "1"

 TI_PDK_XDC_ARGS ?= "${TI_PDK_LIMIT_SOCS}"

-PARALLEL_XDC = "${@oe.utils.parallel_make_argument(d, '--jobs=%d')}"
+PARALLEL_XDC = "--jobs=${BB_NUMBER_THREADS}"
 PARALLEL_MAKE = ""

 def get_doxygen_support(d):
--- a/conf/layer.conf
+++ b/conf/layer.conf
@@ -1,6 +1,5 @@
 # We have a conf and classes directory, append to BBPATH
 BBPATH .= ":${LAYERDIR}"
-METATIBASE := '${@os.path.normpath("${LAYERDIR}/")}'

 # We have a recipes directory, add to BBFILES
 BBFILES += "${LAYERDIR}/recipes*/*/*.bb ${LAYERDIR}/recipes*/*/*.bbappend"
@@ -9,18 +8,17 @@ BBFILE_COLLECTIONS += "meta-ti"
 BBFILE_PATTERN_meta-ti := "^${LAYERDIR}/"
 BBFILE_PRIORITY_meta-ti = "6"

-LAYERSERIES_COMPAT_meta-ti = "dunfell"
+LAYERSERIES_COMPAT_meta-ti = "sumo thud"

 LICENSE_PATH += "${LAYERDIR}/licenses"

-LAYERDEPENDS_meta-ti = " \
-    core \
-    meta-arm \
-"
+LAYERDEPENDS_meta-ti = "core"

 SIGGEN_EXCLUDERECIPES_ABISAFE += " \
    ti-sgx-ddk-km \
    ti-sgx-ddk-um \
+    ti-ipc \
+    ti-ipc-rtos \
    cmem-mod \
    hplib-mod \
    gdbserverproxy-module-drv \
--- a/conf/machine/am335x-evm.conf
+++ b/conf/machine/am335x-evm.conf
@@ -7,7 +7,7 @@ require conf/machine/include/ti33x.inc
 MACHINE_GUI_CLASS = "smallscreen"
 MACHINE_FEATURES += "touchscreen"

-IMAGE_FSTYPES += "ubifs ubi"
+IMAGE_FSTYPES += "ubifs ubi tar.xz"

 # Normally AM335 boards use ttyS0, but ICE uses ttyS3, so try both
 SERIAL_CONSOLES = "115200;ttyS0 115200;ttyS3"
@@ -24,7 +24,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 9900"
+MKUBIFS_ARGS = "-F -m 2048 -e 126976 -c 8800"

 # do ubiattach /dev/ubi_ctrl -m 7 -O 2048
 # from dmesg:
@@ -32,4 +32,4 @@ MKUBIFS_ARGS ?= "-F -m 2048 -e 126976 -c 9900"
 # 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"
+UBINIZE_ARGS = "-m 2048 -p 128KiB -s 512 -O 2048"
--- a/conf/machine/am335x-hs-evm.conf
+++ b/conf/machine/am335x-hs-evm.conf
@@ -1,6 +1,6 @@
 #@TYPE: Machine
 #@NAME: AM335x HS EVM
-#@DESCRIPTION: Machine configuration for the TI AM335x HS EVM
+#@DESCRIPTION: Machine configuration for the TI AM435x HS EVM

 require conf/machine/am335x-evm.conf

--- a/conf/machine/am3517-evm.conf
+++ b/conf/machine/am3517-evm.conf
@@ -7,7 +7,7 @@ require conf/machine/include/omap3.inc
 MACHINE_GUI_CLASS = "smallscreen"
 MACHINE_FEATURES += "touchscreen ethernet"

-IMAGE_FSTYPES += "ubi tar.xz"
+IMAGE_FSTYPES += "ubi tar.gz"
 EXTRA_IMAGECMD_jffs2 = "-lnp -e 0x20000 -s 2048"

 SERIAL_CONSOLES = "115200;ttyS2"
--- a/conf/machine/am37x-evm.conf
+++ b/conf/machine/am37x-evm.conf
@@ -7,7 +7,7 @@ require conf/machine/include/omap3.inc
 MACHINE_GUI_CLASS = "smallscreen"
 MACHINE_FEATURES += "touchscreen ethernet"

-IMAGE_FSTYPES += "ubi tar.xz"
+IMAGE_FSTYPES += "ubi tar.gz"
 EXTRA_IMAGECMD_jffs2 = "-lnp -e 0x20000 -s 2048"

 KERNEL_DEVICETREE = "omap3-evm-37xx.dtb"
--- a/conf/machine/am437x-evm.conf
+++ b/conf/machine/am437x-evm.conf
@@ -7,7 +7,7 @@ require conf/machine/include/ti43x.inc
 MACHINE_GUI_CLASS = "smallscreen"
 MACHINE_FEATURES += "touchscreen"

-IMAGE_FSTYPES += "ubifs ubi"
+IMAGE_FSTYPES += "ubifs ubi tar.xz"

 SERIAL_CONSOLES = "115200;ttyS0"

@@ -22,7 +22,7 @@ SERIAL_CONSOLES = "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 4800"
+MKUBIFS_ARGS = "-F -m 4096 -e 253952 -c 4200"

 # do ubiattach /dev/ubi_ctrl -m 11 -O 4096
 # from dmesg:
--- a/conf/machine/am437x-hs-evm.conf
+++ b/conf/machine/am437x-hs-evm.conf
@@ -13,6 +13,6 @@ UBOOT_RD_ENTRYPOINT = "0x84000000"

 TI_SECURE_DEV_PKG = "${TI_SECURE_DEV_PKG_CAT}/am4x"

-OPTEEMACHINE = "ti-am43xx"
+OPTEEMACHINE = "ti"
 OPTEEFLAVOR = "am43xx"
 OPTEEOUTPUTMACHINE = "ti"
--- a/conf/machine/am57xx-evm.conf
+++ b/conf/machine/am57xx-evm.conf
@@ -6,26 +6,17 @@ require conf/machine/include/dra7xx.inc

 MACHINE_FEATURES += "touchscreen"

+IMAGE_FSTYPES += "tar.xz"
+
 SERIAL_CONSOLES = "115200;ttyS2"

 KERNEL_DEVICETREE = " \
-    am57xx-beagle-x15.dtb \
-    am57xx-beagle-x15-revb1.dtb \
-    am57xx-beagle-x15-revc.dtb \
-    am5729-beagleboneai.dtb \
-    am57xx-evm.dtb \
-    ti/am57xx-evm-common.dtbo \
-    am57xx-evm-reva3.dtb \
-    ti/am57xx-evm-reva3.dtbo \
-    am571x-idk.dtb \
-    ti/am571x-idk-touchscreen.dtbo \
-    am572x-idk.dtb \
-    am574x-idk.dtb \
-    ti/am57xx-idk-osd-lcd-common.dtbo \
-    ti/am572x-idk-touchscreen.dtbo \
-    ti/lcd-osd101t2587.dtbo \
-    ti/lcd-osd101t2045.dtbo \
-    ti/ov10635.dtbo \
+    am57xx-beagle-x15.dtb am57xx-beagle-x15-revb1.dtb am57xx-beagle-x15-revc.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 \
+    am574x-idk.dtb am574x-idk-lcd-osd101t2587.dtb \
 "

 KERNEL_DEVICETREE += "${@oe.utils.conditional('ENABLE_TI_UIO_DEVICES', '1', 'am574x-idk-pru-excl-uio.dtb am572x-idk-pru-excl-uio.dtb am571x-idk-pru-excl-uio.dtb', '', d)}"
--- a/conf/machine/am57xx-hs-evm.conf
+++ b/conf/machine/am57xx-hs-evm.conf
@@ -13,7 +13,7 @@ UBOOT_RD_ENTRYPOINT = "0x84000000"

 TI_SECURE_DEV_PKG = "${TI_SECURE_DEV_PKG_AUTO}/am5x"

-OPTEEMACHINE = "ti-am57xx"
+OPTEEMACHINE = "ti"
 OPTEEFLAVOR = "am57xx"
 OPTEEOUTPUTMACHINE = "ti"
 OPTEEPAGER = "y"
--- a/conf/machine/am62xx-evm-k3r5.conf
+++ b/conf/machine/am62xx-evm-k3r5.conf
@@ -1,11 +0,0 @@
-#@TYPE: Machine
-#@NAME: AM62XX EVM (R5F)
-#@DESCRIPTION: Machine configuration for the TI AM62xx EVM (R5F core)
-
-require conf/machine/include/k3r5.inc
-
-SYSFW_SOC = "am62x"
-SYSFW_CONFIG = "evm"
-SYSFW_SUFFIX = "gp"
-
-UBOOT_MACHINE = "am62x_evm_r5_defconfig"
--- a/conf/machine/am62xx-evm.conf
+++ b/conf/machine/am62xx-evm.conf
@@ -1,13 +0,0 @@
-#@TYPE: Machine
-#@NAME: AM62XX EVM
-#@DESCRIPTION: Machine configuration for the TI AM62XX EVM
-
-require conf/machine/include/am62xx.inc
-
-MACHINE_FEATURES += "gpu"
-
-KERNEL_DEVICETREE = " \
-    ti/k3-am625-sk.dtb \
-"
-
-UBOOT_MACHINE = "am62x_evm_a53_defconfig"
--- a/conf/machine/am64xx-evm-k3r5.conf
+++ b/conf/machine/am64xx-evm-k3r5.conf
@@ -1,11 +0,0 @@
-#@TYPE: Machine
-#@NAME: AM64xx EVM (R5F)
-#@DESCRIPTION: Machine configuration for the TI AM64xx EVM (R5F core)
-
-require conf/machine/include/k3r5.inc
-
-SYSFW_SOC = "am64x"
-SYSFW_CONFIG = "evm"
-SYSFW_SUFFIX = "gp"
-
-UBOOT_MACHINE = "am64x_evm_r5_defconfig"
--- a/conf/machine/am64xx-evm.conf
+++ b/conf/machine/am64xx-evm.conf
@@ -1,7 +0,0 @@
-#@TYPE: Machine
-#@NAME: AM64xx EVM
-#@DESCRIPTION: Machine configuration for the TI AM64xx EVM
-
-require conf/machine/include/am64xx.inc
-
-UBOOT_MACHINE = "am64x_evm_a53_defconfig"
--- a/conf/machine/am64xx-hs-evm-k3r5.conf
+++ b/conf/machine/am64xx-hs-evm-k3r5.conf
@@ -1,14 +0,0 @@
-#@TYPE: Machine
-#@NAME: AM64xx HS EVM (R5F)
-#@DESCRIPTION: Machine configuration for the TI AM64xx HS EVM (R5F core)
-
-require conf/machine/include/k3r5.inc
-
-SYSFW_SOC = "am64x"
-SYSFW_CONFIG = "evm"
-SYSFW_SUFFIX = "hs"
-SYSFW_SYMLINK = ""
-
-UBOOT_MACHINE = "am64x_hs_evm_r5_defconfig"
-
-TI_SECURE_DEV_PKG = "${TI_SECURE_DEV_PKG_K3}"
--- a/conf/machine/am64xx-hs-evm.conf
+++ b/conf/machine/am64xx-hs-evm.conf
@@ -1,22 +0,0 @@
-#@TYPE: Machine
-#@NAME: AM64xx HS EVM
-#@DESCRIPTION: Machine configuration for the TI AM64xx HS EVM
-
-require conf/machine/include/am64xx.inc
-
-UBOOT_MACHINE = "am64x_hs_evm_a53_defconfig"
-
-UBOOT_ENTRYPOINT =       "0x80080000"
-UBOOT_LOADADDRESS =      "0x80080000"
-UBOOT_RD_LOADADDRESS =   "0x84000000"
-UBOOT_RD_ENTRYPOINT =    "0x84000000"
-UBOOT_DTB_LOADADDRESS =  "0x83000000"
-UBOOT_DTBO_LOADADDRESS = "0x83080000"
-UBOOT_DTBO_OFFSET =      "0x00010000"
-
-SPL_BINARY = "tispl.bin_HS"
-SPL_BINARYNAME = "tispl.bin"
-UBOOT_BINARY = "u-boot.img_HS"
-IMAGE_BOOT_FILES = "${UBOOT_BINARY}"
-
-TI_SECURE_DEV_PKG = "${TI_SECURE_DEV_PKG_K3}"
--- a/conf/machine/am65xx-evm-k3r5-sr2.conf
+++ b/conf/machine/am65xx-evm-k3r5-sr2.conf
@@ -1,11 +0,0 @@
-#@TYPE: Machine
-#@NAME: AM65xx SR2.0 EVM (R5F)
-#@DESCRIPTION: Machine configuration for the TI AM65xx SR2.0 EVM (R5F core)
-
-# Booting SR2 requires different SYSFW, the rest is handled at runtime
-
-require conf/machine/am65xx-evm-k3r5.conf
-SOC_FAMILY_append = ":k3r5-sr2"
-
-SYSFW_SOC = "am65x_sr2"
-SYSFW_SYMLINK = "sysfw.itb"
--- a/conf/machine/am65xx-evm-k3r5.conf
+++ b/conf/machine/am65xx-evm-k3r5.conf
@@ -1,12 +0,0 @@
-#@TYPE: Machine
-#@NAME: AM65xx EVM (R5F)
-#@DESCRIPTION: Machine configuration for the TI AM65xx EVM (R5F core)
-
-require conf/machine/include/k3r5.inc
-
-SYSFW_SOC = "am65x"
-SYSFW_CONFIG = "evm"
-SYSFW_SUFFIX = "gp"
-SYSFW_SYMLINK = ""
-
-UBOOT_MACHINE = "am65x_evm_r5_defconfig"
--- a/conf/machine/am65xx-evm.conf
+++ b/conf/machine/am65xx-evm.conf
@@ -4,4 +4,27 @@

 require conf/machine/include/am65xx.inc

+MACHINE_FEATURES += "touchscreen"
+
+IMAGE_FSTYPES += "tar.xz wic.xz"
+
+SERIAL_CONSOLES = "115200;ttyS2"
+
+KERNEL_DEVICETREE = " \
+    ti/k3-am654-base-board.dtb ti/k3-am654-gp.dtbo \
+    ti/k3-am654-evm-hdmi.dtbo ti/k3-am654-idk.dtbo \
+    ti/k3-am654-evm-csi2-ov490.dtbo ti/k3-am654-evm-csi2-ov5640.dtbo \
+    ti/k3-am654-evm-oldi-lcd1evm.dtbo ti/k3-am654-evm-tc358876.dtbo \
+    ti/k3-am654-pcie-usb2.dtbo ti/k3-am654-pcie-usb3.dtbo \
+"
+
 UBOOT_MACHINE = "am65x_evm_a53_defconfig"
+
+OPTEEMACHINE = "k3"
+OPTEEFLAVOR = "am65x"
+OPTEEOUTPUTMACHINE = "k3"
+
+WKS_FILE = "sdimage-bootpart.wks"
+IMAGE_BOOT_FILES = "u-boot.img"
+
+do_image_wic[depends] += "mtools-native:do_populate_sysroot dosfstools-native:do_populate_sysroot u-boot:do_deploy"
--- a/conf/machine/am65xx-hs-evm-k3r5-sr2.conf
+++ b/conf/machine/am65xx-hs-evm-k3r5-sr2.conf
@@ -1,11 +0,0 @@
-#@TYPE: Machine
-#@NAME: AM65xx SR2.0 HS EVM (R5F)
-#@DESCRIPTION: Machine configuration for the TI AM65xx SR2.0 HS EVM (R5F core)
-
-# Booting SR2 requires different SYSFW, the rest is handled at runtime
-
-require conf/machine/am65xx-hs-evm-k3r5.conf
-SOC_FAMILY_append = ":k3r5-sr2"
-
-SYSFW_SOC = "am65x_sr2"
-SYSFW_SYMLINK = "sysfw.itb"
--- a/conf/machine/am65xx-hs-evm-k3r5.conf
+++ b/conf/machine/am65xx-hs-evm-k3r5.conf
@@ -1,14 +0,0 @@
-#@TYPE: Machine
-#@NAME: AM65xx HS EVM (R5F)
-#@DESCRIPTION: Machine configuration for the TI AM65xx HS EVM (R5F core)
-
-require conf/machine/include/k3r5.inc
-
-SYSFW_SOC = "am65x"
-SYSFW_CONFIG = "evm"
-SYSFW_SUFFIX = "hs"
-SYSFW_SYMLINK = ""
-
-UBOOT_MACHINE = "am65x_hs_evm_r5_defconfig"
-
-TI_SECURE_DEV_PKG = "${TI_SECURE_DEV_PKG_K3}"
--- a/conf/machine/am65xx-hs-evm.conf
+++ b/conf/machine/am65xx-hs-evm.conf
@@ -2,17 +2,14 @@
 #@NAME: AM65xx HS EVM
 #@DESCRIPTION: Machine configuration for the TI AM65xx HS EVM

-require conf/machine/include/am65xx.inc
+require conf/machine/am65xx-evm.conf

 UBOOT_MACHINE = "am65x_hs_evm_a53_defconfig"

-UBOOT_ENTRYPOINT =       "0x80080000"
-UBOOT_LOADADDRESS =      "0x80080000"
-UBOOT_RD_LOADADDRESS =   "0x84000000"
-UBOOT_RD_ENTRYPOINT =    "0x84000000"
-UBOOT_DTB_LOADADDRESS =  "0x83000000"
-UBOOT_DTBO_LOADADDRESS = "0x83080000"
-UBOOT_DTBO_OFFSET =      "0x00010000"
+UBOOT_ENTRYPOINT = "0x80080000"
+UBOOT_LOADADDRESS = "0x80080000"
+UBOOT_RD_LOADADDRESS = "0x84000000"
+UBOOT_RD_ENTRYPOINT = "0x84000000"

 SPL_BINARY = "tispl.bin_HS"
 SPL_BINARYNAME = "tispl.bin"
@@ -20,3 +17,7 @@ UBOOT_BINARY = "u-boot.img_HS"
 IMAGE_BOOT_FILES = "${UBOOT_BINARY}"

 TI_SECURE_DEV_PKG = "${TI_SECURE_DEV_PKG_K3}"
+
+OPTEEMACHINE = "k3"
+OPTEEFLAVOR = "am65x"
+OPTEEOUTPUTMACHINE = "k3"
--- a/conf/machine/beagle-x15.conf
+++ b/conf/machine/beagle-x15.conf
@@ -11,3 +11,30 @@ MACHINE_GUI_CLASS = "bigscreen"
 SERIAL_CONSOLES = "115200;ttyS2"

 UBOOT_MACHINE = "am57xx_evm_config"
+
+WKS_FILE = "sdimage-bootpart.wks"
+IMAGE_BOOT_FILES = "MLO u-boot.img"
+IMAGE_FSTYPES += "tar.xz wic.xz"
+
+do_image_wic[depends] += "mtools-native:do_populate_sysroot dosfstools-native:do_populate_sysroot"
+
+# 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
@@ -7,7 +7,7 @@ require conf/machine/include/omap3.inc
 # Only has DVI connector for external screen
 MACHINE_GUI_CLASS = "bigscreen"

-IMAGE_FSTYPES += "tar.xz ubi"
+IMAGE_FSTYPES += "tar.gz ubi"
 EXTRA_IMAGECMD_jffs2 = "-lnp"

 KERNEL_DEVICETREE = "omap3-beagle.dtb omap3-beagle-xm.dtb omap3-beagle-xm-ab.dtb"
--- a/conf/machine/beaglebone.conf
+++ b/conf/machine/beaglebone.conf
@@ -13,6 +13,13 @@ MACHINE_GUI_CLASS = "bigscreen"

 SERIAL_CONSOLES = "115200;ttyS0"

+WKS_FILE = "sdimage-bootpart.wks"
+
+do_image_wic[depends] += "mtools-native:do_populate_sysroot dosfstools-native:do_populate_sysroot"
+IMAGE_BOOT_FILES ?= "u-boot.${UBOOT_SUFFIX} ${SPL_BINARY}"
+
+IMAGE_FSTYPES += "tar.xz wic.xz"
+
 IMAGE_INSTALL_append = " kernel-devicetree kernel-image-zimage"

 # Refine the list of device targets for ti-pdk class recipes
--- a/conf/machine/dra7xx-evm.conf
+++ b/conf/machine/dra7xx-evm.conf
@@ -6,22 +6,17 @@ require conf/machine/include/dra7xx.inc

 MACHINE_FEATURES += "touchscreen"

+IMAGE_FSTYPES += "tar.xz"
+
 SERIAL_CONSOLES = "115200;ttyS0"

 KERNEL_DEVICETREE = " \
-    dra7-evm.dtb \
-    ti/dra7x-evm-osd-lcd-common.dtbo \
-    dra71-evm.dtb \
-    dra71-evm-nand.dtb \
-    ti/dra71-evm-lcd-auo-g101evn01.0.dtbo \
-    dra72-evm.dtb \
-    dra72-evm-revc.dtb \
-    ti/dra72-evm-touchscreen.dtbo \
-    ti/dra74-evm-touchscreen.dtbo \
-    dra76-evm.dtb \
-    ti/dra76-evm-tfp410.dtbo \
-    ti/lcd-osd101t2045.dtbo \
-    ti/lcd-osd101t2587.dtbo \
+    dra7-evm.dtb dra7-evm-lcd-osd101t2045.dtb dra7-evm-lcd-osd101t2587.dtb \
+    dra71-evm.dtb dra71-evm-nand.dtb dra71-evm-lcd-auo-g101evn01.0.dtb \
+    dra72-evm.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 \
+    dra76-evm.dtb dra76-evm-tfp410.dtb dra76-evm-ov490.dtb dra76-evm-ov5640.dtb \
+    dra76-evm-tfp410-ov490.dtb dra76-evm-tfp410-ov5640.dtb \
 "

 UBOOT_MACHINE = "dra7xx_evm_config"
--- a/conf/machine/dra7xx-hs-evm.conf
+++ b/conf/machine/dra7xx-hs-evm.conf
@@ -13,7 +13,7 @@ UBOOT_RD_ENTRYPOINT = "0x84000000"

 TI_SECURE_DEV_PKG = "${TI_SECURE_DEV_PKG_AUTO}/dra7"

-OPTEEMACHINE = "ti-dra7xx"
+OPTEEMACHINE = "ti"
 OPTEEFLAVOR = "dra7xx"
 OPTEEOUTPUTMACHINE = "ti"
 OPTEEPAGER = "y"
--- a/conf/machine/include/am62xx.inc
+++ b/conf/machine/include/am62xx.inc
@@ -1,17 +0,0 @@
-require conf/machine/include/k3.inc
-SOC_FAMILY_append = ":am62xx"
-
-MACHINE_FEATURES += "screen touchscreen"
-
-SERIAL_CONSOLES = "115200;ttyS2"
-SERIAL_CONSOLES_CHECK = "${SERIAL_CONSOLES}"
-
-# AM62 supports multi-certificate images, use the same
-IMAGE_BOOT_FILES = "${IMAGE_BOOT_FILES_MULTI_CERT}"
-
-do_image_wic[mcdepends] = "mc::k3r5:ti-sci-fw:do_deploy"
-do_image_tar[mcdepends] = "mc::k3r5:ti-sci-fw:do_deploy"
-
-TFA_BOARD = "lite"
-OPTEEMACHINE = "k3-am65x"
-OPTEEOUTPUTMACHINE = "k3"
--- a/conf/machine/include/am64xx.inc
+++ b/conf/machine/include/am64xx.inc
@@ -1,29 +0,0 @@
-require conf/machine/include/k3.inc
-SOC_FAMILY_append = ":am64xx"
-
-MACHINE_FEATURES += "screen touchscreen"
-
-SERIAL_CONSOLES = "115200;ttyS2 115200;ttyS1"
-SERIAL_CONSOLES_CHECK = "${SERIAL_CONSOLES}"
-
-KERNEL_DEVICETREE = " \
-    ti/k3-am642-evm.dtb \
-    ti/k3-am642-sk.dtb \
-    ti/k3-am642-evm-icssg1-dualemac.dtbo \
-    ti/k3-am642-evm-nand.dtbo \
-"
-
-# AM64 supports multi-certificate images, use the same
-IMAGE_BOOT_FILES = "${IMAGE_BOOT_FILES_MULTI_CERT}"
-
-do_image_wic[mcdepends] = "mc::k3r5:ti-sci-fw:do_deploy"
-do_image_tar[mcdepends] = "mc::k3r5:ti-sci-fw:do_deploy"
-
-TFA_BOARD = "lite"
-OPTEEMACHINE = "k3-am65x"
-OPTEEOUTPUTMACHINE = "k3"
-
-# Set the list of device targets for ti-pdk class recipes
-TI_PDK_LIMIT_SOCS = "am64x"
-TI_PDK_LIMIT_BOARDS = "am64x_evm"
-TI_PDK_LIMIT_CORES = "mcu1_0 mpu1_0 mcu1_1 mcu2_0 mcu2_1"
--- a/conf/machine/include/am65xx.inc
+++ b/conf/machine/include/am65xx.inc
@@ -1,36 +1,6 @@
 require conf/machine/include/k3.inc
 SOC_FAMILY_append = ":am65xx"

-MACHINE_FEATURES += "screen touchscreen gpu"
-
-SERIAL_CONSOLES = "115200;ttyS2 115200;ttyS1"
-SERIAL_CONSOLES_CHECK = "${SERIAL_CONSOLES}"
-
-KERNEL_DEVICETREE = " \
-    ti/k3-am654-base-board.dtb \
-    ti/k3-am654-base-board-sr1.dtbo \
-    ti/k3-am654-gp.dtbo \
-    ti/k3-am654-idk.dtbo \
-    ti/k3-am654-idk-sr1.dtbo \
-    ti/k3-am654-sr1.dtbo \
-    ti/k3-am654-pcie-usb2.dtbo \
-    ti/k3-am654-pcie-usb3.dtbo \
-    ti/k3-am654-evm-tc358876.dtbo \
-    ti/k3-am654-evm-oldi-lcd1evm.dtbo \
-    ti/k3-am654-evm-ov5640.dtbo \
-"
-
-BBMULTICONFIG += "k3r5-sr2"
-
-# Use default IMAGE_BOOT_FILES_LEGACY files
-# Since default sysfw.itb on AM65x is for SR2.0, add a version for SR1.0
-IMAGE_BOOT_FILES += "sysfw-am65x-evm.itb"
-do_image_wic[mcdepends] += "mc::k3r5-sr2:ti-sci-fw:do_deploy"
-do_image_tar[mcdepends] += "mc::k3r5-sr2:ti-sci-fw:do_deploy"
-
-OPTEEMACHINE = "k3-am65x"
-OPTEEOUTPUTMACHINE = "k3"
-
 # Set the list of device targets for ti-pdk class recipes
 TI_PDK_LIMIT_SOCS = "am65xx"
 TI_PDK_LIMIT_BOARDS = "am65xx_evm am65xx_idk"
--- a/conf/machine/include/davinci.inc
+++ b/conf/machine/include/davinci.inc
@@ -5,7 +5,7 @@ MACHINE_KERNEL_PR = "r54"

 KERNEL_IMAGETYPE = "zImage"

-PREFERRED_PROVIDER_virtual/kernel ?= "linux-ti-staging"
+PREFERRED_PROVIDER_virtual/kernel = "linux-ti-staging"
 PREFERRED_PROVIDER_virtual/bootloader = "u-boot-ti-staging"
 PREFERRED_PROVIDER_u-boot = "u-boot-ti-staging"

--- a/conf/machine/include/j7.inc
+++ b/conf/machine/include/j7.inc
@@ -1,12 +0,0 @@
-require conf/machine/include/k3.inc
-SOC_FAMILY_append = ":j7"
-
-OPTEEMACHINE = "k3-j721e"
-OPTEEOUTPUTMACHINE = "k3"
-
-# Use default IMAGE_BOOT_FILES_LEGACY files
-
-# Set the list of device targets for ti-pdk class recipes
-TI_PDK_LIMIT_SOCS = "j721e j7200"
-TI_PDK_LIMIT_BOARDS = "j721e_evm j7200_evm"
-TI_PDK_LIMIT_CORES = "mpu1_0 mcu1_0 mcu1_1 mcu2_0 mcu2_1 mcu3_0 mcu3_1 c66xdsp_1 c66xdsp_2 c7x_1"
--- a/conf/machine/include/k3.inc
+++ b/conf/machine/include/k3.inc
@@ -1,16 +1,12 @@
-# TI K3 Aarch64 profile for Cortex-A53/A72 cores
-
 require conf/machine/include/ti-soc.inc
 SOC_FAMILY_append = ":k3"

 require conf/machine/include/arm/arch-arm64.inc

-BBMULTICONFIG += "k3r5"
-
 # Increase this everytime you change something in the kernel
 MACHINE_KERNEL_PR = "r0"

-PREFERRED_PROVIDER_virtual/kernel ?= "linux-ti-staging"
+PREFERRED_PROVIDER_virtual/kernel = "linux-ti-staging"
 PREFERRED_PROVIDER_virtual/bootloader = "u-boot-ti-staging"
 PREFERRED_PROVIDER_u-boot = "u-boot-ti-staging"

@@ -26,9 +22,6 @@ UBOOT_SUFFIX = "img"

 EXTRA_IMAGEDEPENDS += "virtual/bootloader"

-TFA_PLATFORM = "k3"
-TFA_BOARD = "generic"
-
 MACHINE_GUI_CLASS = "smallscreen"

 # Use the expected value of the ubifs filesystem's volume name in the kernel
@@ -36,16 +29,5 @@ 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 alsa ethernet pci"
-
-IMAGE_FSTYPES += "tar.xz wic.xz wic.bmap"
-
-IMAGE_BOOT_FILES_LEGACY = "${SPL_BINARY} u-boot.${UBOOT_SUFFIX} tiboot3.bin sysfw.itb"
-IMAGE_BOOT_FILES_MULTI_CERT = "${SPL_BINARY} u-boot.${UBOOT_SUFFIX} tiboot3.bin"
-
-IMAGE_BOOT_FILES ?= "${IMAGE_BOOT_FILES_LEGACY}"
-
-WKS_FILE ?= "sdimage-2part.wks"
-do_image_wic[depends] += "virtual/bootloader:do_deploy"
-do_image_wic[mcdepends] += "mc::k3r5:virtual/bootloader:do_deploy mc::k3r5:ti-sci-fw:do_deploy"
-do_image_tar[mcdepends] += "mc::k3r5:virtual/bootloader:do_deploy mc::k3r5:ti-sci-fw:do_deploy"
+MACHINE_FEATURES = "kernel26 apm usbgadget usbhost vfat ext2 screen alsa ethernet pci sgx"
+# Not ready yet - dsp mmip
--- a/conf/machine/include/k3r5.inc
+++ b/conf/machine/include/k3r5.inc
@@ -1,24 +0,0 @@
-# TI K3 Armv7 profile for Cortex-R5F cores
-
-require conf/machine/include/ti-soc.inc
-SOC_FAMILY_append = ":k3r5"
-
-# The closest of existing tunes for Cortex-R5F
-DEFAULTTUNE = "armv7athf"
-require conf/machine/include/tune-cortexa8.inc
-
-# R5 runs early bootloader and loads SYSFW
-# https://git.ti.com/cgit/ti-u-boot/ti-u-boot/tree/board/ti/am65x/README
-# https://git.ti.com/cgit/ti-u-boot/ti-u-boot/tree/board/ti/j721e/README
-PREFERRED_PROVIDER_virtual/kernel = "linux-dummy"
-PREFERRED_PROVIDER_virtual/bootloader = "u-boot-ti-staging"
-PREFERRED_PROVIDER_u-boot = "u-boot-ti-staging"
-
-SPL_BINARY = ""
-UBOOT_SUFFIX = "bin"
-UBOOT_BINARY = "tiboot3.${UBOOT_SUFFIX}"
-UBOOT_IMAGE = "tiboot3-${MAINMACHINE}-${PV}-${PR}.${UBOOT_SUFFIX}"
-UBOOT_SYMLINK = "tiboot3-${MAINMACHINE}.${UBOOT_SUFFIX}"
-
-PACKAGECONFIG_pn-u-boot-ti-staging = ""
-PACKAGECONFIG_pn-u-boot-ti-mainline = ""
--- a/conf/machine/include/keystone.inc
+++ b/conf/machine/include/keystone.inc
@@ -4,7 +4,7 @@ SOC_FAMILY_append = ":keystone"
 DEFAULTTUNE ?= "armv7athf-neon"
 require conf/machine/include/tune-cortexa15.inc

-PREFERRED_PROVIDER_virtual/kernel ?= "linux-ti-staging"
+PREFERRED_PROVIDER_virtual/kernel = "linux-ti-staging"
 PREFERRED_PROVIDER_virtual/bootloader = "u-boot-ti-staging"
 PREFERRED_PROVIDER_u-boot = "u-boot-ti-staging"

--- a/conf/machine/include/omap-a15.inc
+++ b/conf/machine/include/omap-a15.inc
@@ -7,7 +7,7 @@ require conf/machine/include/tune-cortexa15.inc
 # Increase this everytime you change something in the kernel
 MACHINE_KERNEL_PR = "r7"

-PREFERRED_PROVIDER_virtual/kernel ?= "linux-ti-staging"
+PREFERRED_PROVIDER_virtual/kernel = "linux-ti-staging"
 PREFERRED_PROVIDER_virtual/bootloader = "u-boot-ti-staging"
 PREFERRED_PROVIDER_u-boot = "u-boot-ti-staging"

@@ -19,17 +19,6 @@ UBOOT_ARCH = "arm"
 UBOOT_ENTRYPOINT = "0x80008000"
 UBOOT_LOADADDRESS = "0x80008000"

-DEVICETREE_FILE = "${@d.getVar('KERNEL_DEVICETREE').replace("ti/","")}"
-
-# Generate an extlinux.conf file
-UBOOT_EXTLINUX = "1"
-UBOOT_EXTLINUX_ROOT = "root=PARTUUID=${uuid}"
-UBOOT_EXTLINUX_BOOT_FILES = " \
-    extlinux.conf;extlinux/extlinux.conf \
-    ${KERNEL_IMAGETYPE} \
-    ${DEVICETREE_FILE} \
-"
-
 SPL_BINARY = "MLO"
 UBOOT_SUFFIX = "img"

@@ -47,9 +36,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 gpu mmip dsp gc320"
-
-IMAGE_FSTYPES += "tar.xz wic.xz wic.bmap"
-WKS_FILE ?= "sdimage-2part.wks"
-IMAGE_BOOT_FILES ?= "${SPL_BINARY} u-boot.${UBOOT_SUFFIX} ${UBOOT_EXTLINUX_BOOT_FILES}"
-do_image_wic[depends] += "u-boot:do_deploy"
+MACHINE_FEATURES = "kernel26 apm usbgadget usbhost vfat ext2 screen alsa ethernet sgx mmip dsp"
--- a/conf/machine/include/omap3.inc
+++ b/conf/machine/include/omap3.inc
@@ -22,7 +22,7 @@ MACHINE_KERNEL_PR = "r127"
 KERNEL_IMAGETYPE = "zImage"

 # Default providers, may need to override for specific machines
-PREFERRED_PROVIDER_virtual/kernel ?= "linux-ti-staging"
+PREFERRED_PROVIDER_virtual/kernel = "linux-ti-staging"
 PREFERRED_PROVIDER_virtual/bootloader = "u-boot-ti-staging"
 PREFERRED_PROVIDER_u-boot = "u-boot-ti-staging"

@@ -39,4 +39,4 @@ UBOOT_LOADADDRESS = "0x80008000"
 EXTRA_IMAGEDEPENDS += "u-boot"

 # List common SoC features, may need to add touchscreen/ethernet for specific machines
-MACHINE_FEATURES = "kernel26 apm usbgadget usbhost vfat ext2 screen alsa gpu"
+MACHINE_FEATURES = "kernel26 apm usbgadget usbhost vfat ext2 screen alsa sgx"
--- a/conf/machine/include/omap4.inc
+++ b/conf/machine/include/omap4.inc
@@ -4,7 +4,7 @@ SOC_FAMILY_append = ":omap4"
 DEFAULTTUNE ?= "armv7athf-neon"
 require conf/machine/include/tune-cortexa9.inc

-PREFERRED_PROVIDER_virtual/kernel ?= "linux-ti-staging"
+PREFERRED_PROVIDER_virtual/kernel = "linux-ti-staging"
 PREFERRED_PROVIDER_virtual/bootloader = "u-boot-ti-staging"
 PREFERRED_PROVIDER_u-boot = "u-boot-ti-staging"

--- a/conf/machine/include/ti-soc.inc
+++ b/conf/machine/include/ti-soc.inc
@@ -1,5 +1,4 @@
 # This is a generic TI SOC family. It is a superset of all other SOCs
 # and platforms defined in meta-ti to allow BSP-level overrides.
 SOC_FAMILY = "ti-soc"
-KERNEL_DTB_OVERLAY_SUPPORT ?= "1"
 require conf/machine/include/soc-family.inc
--- a/conf/machine/include/ti33x.inc
+++ b/conf/machine/include/ti33x.inc
@@ -20,7 +20,7 @@ MACHINE_GUI_CLASS = "bigscreen"
 MACHINE_KERNEL_PR = "r22"

 # Default providers, may need to override for specific machines
-PREFERRED_PROVIDER_virtual/kernel ?= "linux-ti-staging"
+PREFERRED_PROVIDER_virtual/kernel = "linux-ti-staging"
 PREFERRED_PROVIDER_virtual/bootloader = "u-boot-ti-staging"
 PREFERRED_PROVIDER_u-boot = "u-boot-ti-staging"

@@ -28,11 +28,10 @@ KERNEL_IMAGETYPE = "zImage"

 KERNEL_DEVICETREE = " \
    am335x-evm.dtb am335x-evmsk.dtb \
-    am335x-icev2.dtb \
+    am335x-icev2.dtb am335x-icev2-prueth.dtb \
    am335x-pocketbeagle.dtb am335x-bone.dtb am335x-boneblue.dtb \
-    am335x-bonegreen.dtb am335x-bonegreen-wireless.dtb \
    am335x-boneblack.dtb am335x-boneblack-wireless.dtb \
-    am335x-sancloud-bbe.dtb \
+    am335x-bonegreen.dtb am335x-bonegreen-wireless.dtb \
 "

 KERNEL_DEVICETREE += "${@oe.utils.conditional('ENABLE_TI_UIO_DEVICES', '1', 'am335x-icev2-pru-excl-uio.dtb', '', d)}"
@@ -43,15 +42,6 @@ UBOOT_MACHINE = "am335x_evm_config"
 UBOOT_ENTRYPOINT = "0x80008000"
 UBOOT_LOADADDRESS = "0x80008000"

-# Generate an extlinux.conf file
-UBOOT_EXTLINUX = "1"
-UBOOT_EXTLINUX_ROOT = "root=PARTUUID=${uuid}"
-UBOOT_EXTLINUX_BOOT_FILES = " \
-    extlinux.conf;extlinux/extlinux.conf \
-    ${KERNEL_IMAGETYPE} \
-    ${KERNEL_DEVICETREE} \
-"
-
 SPL_BINARY = "MLO"
 UBOOT_SUFFIX = "img"

@@ -59,16 +49,11 @@ UBOOT_SUFFIX = "img"
 # and u-boot.
 UBI_VOLNAME = "rootfs"

-EXTRA_IMAGEDEPENDS += "virtual/bootloader"
+EXTRA_IMAGEDEPENDS += "u-boot"

 # List common SoC features, may need to add touchscreen for specific machines
-MACHINE_FEATURES = "kernel26 apm usbgadget usbhost vfat ext2 screen alsa ethernet gpu"
+MACHINE_FEATURES = "kernel26 apm usbgadget usbhost vfat ext2 screen alsa ethernet sgx"

 # Set the list of device targets for ti-pdk class recipes
 TI_PDK_LIMIT_SOCS = "am335x"
 TI_PDK_LIMIT_BOARDS = "evmAM335x icev2AM335x iceAMIC110 bbbAM335x skAM335x"
-
-IMAGE_FSTYPES += "tar.xz wic.xz wic.bmap"
-WKS_FILE ?= "sdimage-2part.wks"
-IMAGE_BOOT_FILES ?= "${SPL_BINARY} u-boot.${UBOOT_SUFFIX} ${UBOOT_EXTLINUX_BOOT_FILES}"
-do_image_wic[depends] += "virtual/bootloader:do_deploy"
--- a/conf/machine/include/ti43x.inc
+++ b/conf/machine/include/ti43x.inc
@@ -20,7 +20,7 @@ MACHINE_GUI_CLASS = "bigscreen"
 MACHINE_KERNEL_PR = "r3"

 # Default providers, may need to override for specific machines
-PREFERRED_PROVIDER_virtual/kernel ?= "linux-ti-staging"
+PREFERRED_PROVIDER_virtual/kernel = "linux-ti-staging"
 PREFERRED_PROVIDER_virtual/bootloader = "u-boot-ti-staging"
 PREFERRED_PROVIDER_u-boot = "u-boot-ti-staging"

@@ -40,15 +40,6 @@ UBOOT_MACHINE = "am43xx_evm_config"
 UBOOT_ENTRYPOINT = "0x80008000"
 UBOOT_LOADADDRESS = "0x80008000"

-# Generate an extlinux.conf file
-UBOOT_EXTLINUX = "1"
-UBOOT_EXTLINUX_ROOT = "root=PARTUUID=${uuid}"
-UBOOT_EXTLINUX_BOOT_FILES = " \
-    extlinux.conf;extlinux/extlinux.conf \
-    ${KERNEL_IMAGETYPE} \
-    ${KERNEL_DEVICETREE} \
-"
-
 SPL_BINARY = "MLO"
 UBOOT_SUFFIX = "img"

@@ -59,13 +50,8 @@ UBI_VOLNAME = "rootfs"
 EXTRA_IMAGEDEPENDS += "u-boot"

 # List common SoC features, may need to add touchscreen for specific machines
-MACHINE_FEATURES = "kernel26 apm usbgadget usbhost vfat ext2 screen alsa ethernet gpu"
+MACHINE_FEATURES = "kernel26 apm usbgadget usbhost vfat ext2 screen alsa ethernet sgx"

 # Set the list of device targets for ti-pdk class recipes
 TI_PDK_LIMIT_SOCS = "am437x"
 TI_PDK_LIMIT_BOARDS = "evmAM437x idkAM437x skAM437x"
-
-IMAGE_FSTYPES += "tar.xz wic.xz wic.bmap"
-WKS_FILE ?= "sdimage-2part.wks"
-IMAGE_BOOT_FILES ?= "${SPL_BINARY} u-boot.${UBOOT_SUFFIX} ${UBOOT_EXTLINUX_BOOT_FILES}"
-do_image_wic[depends] += "u-boot:do_deploy"
--- a/conf/machine/j7-evm-k3r5.conf
+++ b/conf/machine/j7-evm-k3r5.conf
@@ -1,11 +0,0 @@
-#@TYPE: Machine
-#@NAME: J7 EVM (R5F)
-#@DESCRIPTION: Machine configuration for the TI J7 EVM (R5F core)
-
-require conf/machine/include/k3r5.inc
-
-SYSFW_SOC = "j721e"
-SYSFW_CONFIG = "evm"
-SYSFW_SUFFIX = "gp"
-
-UBOOT_MACHINE = "j721e_evm_r5_defconfig"
--- a/conf/machine/j7-evm.conf
+++ b/conf/machine/j7-evm.conf
@@ -1,19 +0,0 @@
-#@TYPE: Machine
-#@NAME: J7 EVM
-#@DESCRIPTION: Machine configuration for the TI J7 EVM
-
-require conf/machine/include/j7.inc
-
-MACHINE_FEATURES += "gpu"
-
-SERIAL_CONSOLES = "115200;ttyS2 115200;ttyS3"
-SERIAL_CONSOLES_CHECK = "${SERIAL_CONSOLES}"
-
-KERNEL_DEVICETREE = " \
-    ti/k3-j721e-common-proc-board.dtb \
-    ti/k3-j721e-proc-board-tps65917.dtb \
-    ti/k3-j721e-common-proc-board-infotainment.dtbo \
-    ti/k3-j721e-sk.dtb \
-"
-
-UBOOT_MACHINE = "j721e_evm_a72_config"
--- a/conf/machine/j7-hs-evm-k3r5-sr1-1.conf
+++ b/conf/machine/j7-hs-evm-k3r5-sr1-1.conf
@@ -1,11 +0,0 @@
-#@TYPE: Machine
-#@NAME: J7 SR1.1 HS EVM (R5F)
-#@DESCRIPTION: Machine configuration for the TI J7 SR1.1 HS EVM (R5F core)
-
-# Booting SR1.1 requires different SYSFW, the rest is handled at runtime
-
-require conf/machine/j7-hs-evm-k3r5.conf
-SOC_FAMILY_append = ":k3r5-sr1-1"
-
-SYSFW_SOC = "j721e_sr1_1"
-SYSFW_SYMLINK = "sysfw.itb"
--- a/conf/machine/j7-hs-evm-k3r5.conf
+++ b/conf/machine/j7-hs-evm-k3r5.conf
@@ -1,13 +0,0 @@
-#@TYPE: Machine
-#@NAME: J7 HS EVM (R5F)
-#@DESCRIPTION: Machine configuration for the TI J7 HS EVM (R5F core)
-
-require conf/machine/include/k3r5.inc
-
-SYSFW_SOC = "j721e"
-SYSFW_CONFIG = "evm"
-SYSFW_SUFFIX = "hs"
-
-UBOOT_MACHINE = "j721e_hs_evm_r5_defconfig"
-
-TI_SECURE_DEV_PKG = "${TI_SECURE_DEV_PKG_K3}"
--- a/conf/machine/j7-hs-evm.conf
+++ b/conf/machine/j7-hs-evm.conf
@@ -1,30 +0,0 @@
-#@TYPE: Machine
-#@NAME: J7 HS EVM
-#@DESCRIPTION: Machine configuration for the TI J7 HS EVM
-
-require conf/machine/j7-evm.conf
-
-UBOOT_MACHINE = "j721e_hs_evm_a72_defconfig"
-
-UBOOT_ENTRYPOINT =       "0x80080000"
-UBOOT_LOADADDRESS =      "0x80080000"
-UBOOT_RD_LOADADDRESS =   "0x84000000"
-UBOOT_RD_ENTRYPOINT =    "0x84000000"
-UBOOT_DTB_LOADADDRESS =  "0x83000000"
-UBOOT_DTBO_LOADADDRESS = "0x83080000"
-UBOOT_DTBO_OFFSET =      "0x00010000"
-
-SPL_BINARY = "tispl.bin_HS"
-SPL_BINARYNAME = "tispl.bin"
-UBOOT_BINARY = "u-boot.img_HS"
-IMAGE_BOOT_FILES = "${UBOOT_BINARY}"
-
-BBMULTICONFIG += "k3r5-sr1-1"
-
-# Use default IMAGE_BOOT_FILES_LEGACY files
-# Since default sysfw.itb on J7 is for SR1.1, add a version for SR1.0
-IMAGE_BOOT_FILES += "sysfw-j721e-evm.itb"
-do_image_wic[mcdepends] += "mc::k3r5-sr1-1:ti-sci-fw:do_deploy"
-do_image_tar[mcdepends] += "mc::k3r5-sr1-1:ti-sci-fw:do_deploy"
-
-TI_SECURE_DEV_PKG = "${TI_SECURE_DEV_PKG_K3}"
--- a/conf/machine/j7200-evm-k3r5.conf
+++ b/conf/machine/j7200-evm-k3r5.conf
@@ -1,11 +0,0 @@
-#@TYPE: Machine
-#@NAME: J7200 EVM (R5F)
-#@DESCRIPTION: Machine configuration for the TI J7200 EVM (R5F core)
-
-require conf/machine/include/k3r5.inc
-
-SYSFW_SOC = "j7200"
-SYSFW_CONFIG = "evm"
-SYSFW_SUFFIX = "gp"
-
-UBOOT_MACHINE = "j7200_evm_r5_defconfig"
--- a/conf/machine/j7200-evm.conf
+++ b/conf/machine/j7200-evm.conf
@@ -1,20 +0,0 @@
-#@TYPE: Machine
-#@NAME: J7200 EVM
-#@DESCRIPTION: Machine configuration for the TI J7200 EVM
-
-require conf/machine/include/j7.inc
-
-SERIAL_CONSOLES = "115200;ttyS2 115200;ttyS3"
-SERIAL_CONSOLES_CHECK = "${SERIAL_CONSOLES}"
-
-KERNEL_DEVICETREE = " \
-    ti/k3-j7200-common-proc-board.dtb \
-"
-
-UBOOT_MACHINE = "j7200_evm_a72_config"
-
-# J7200 supports multi-certificate images, use the same
-IMAGE_BOOT_FILES = "${IMAGE_BOOT_FILES_MULTI_CERT}"
-
-do_image_wic[mcdepends] = "mc::k3r5:ti-sci-fw:do_deploy"
-do_image_tar[mcdepends] = "mc::k3r5:ti-sci-fw:do_deploy"
--- a/conf/machine/j7200-hs-evm-k3r5.conf
+++ b/conf/machine/j7200-hs-evm-k3r5.conf
@@ -1,13 +0,0 @@
-#@TYPE: Machine
-#@NAME: J7200 HS EVM (R5F)
-#@DESCRIPTION: Machine configuration for the TI J7200 HS EVM (R5F core)
-
-require conf/machine/include/k3r5.inc
-
-SYSFW_SOC = "j7200"
-SYSFW_CONFIG = "evm"
-SYSFW_SUFFIX = "hs"
-
-UBOOT_MACHINE = "j7200_hs_evm_r5_defconfig"
-
-TI_SECURE_DEV_PKG = "${TI_SECURE_DEV_PKG_K3}"
--- a/conf/machine/j7200-hs-evm.conf
+++ b/conf/machine/j7200-hs-evm.conf
@@ -1,22 +0,0 @@
-#@TYPE: Machine
-#@NAME: J7200 HS EVM
-#@DESCRIPTION: Machine configuration for the TI J7200 HS EVM
-
-require conf/machine/j7200-evm.conf
-
-UBOOT_MACHINE = "j7200_hs_evm_a72_defconfig"
-
-UBOOT_ENTRYPOINT =       "0x80080000"
-UBOOT_LOADADDRESS =      "0x80080000"
-UBOOT_RD_LOADADDRESS =   "0x84000000"
-UBOOT_RD_ENTRYPOINT =    "0x84000000"
-UBOOT_DTB_LOADADDRESS =  "0x83000000"
-UBOOT_DTBO_LOADADDRESS = "0x83080000"
-UBOOT_DTBO_OFFSET =      "0x00010000"
-
-SPL_BINARY = "tispl.bin_HS"
-SPL_BINARYNAME = "tispl.bin"
-UBOOT_BINARY = "u-boot.img_HS"
-IMAGE_BOOT_FILES = "${UBOOT_BINARY}"
-
-TI_SECURE_DEV_PKG = "${TI_SECURE_DEV_PKG_K3}"
--- a/conf/machine/j721s2-evm-k3r5.conf
+++ b/conf/machine/j721s2-evm-k3r5.conf
@@ -1,11 +0,0 @@
-#@TYPE: Machine
-#@NAME: J721S2 EVM (R5F)
-#@DESCRIPTION: Machine configuration for the TI J721S2 EVM (R5F core)
-
-require conf/machine/include/k3r5.inc
-
-SYSFW_SOC = "j721s2"
-SYSFW_CONFIG = "evm"
-SYSFW_SUFFIX = "gp"
-
-UBOOT_MACHINE = "j721s2_evm_r5_defconfig"
--- a/conf/machine/j721s2-evm.conf
+++ b/conf/machine/j721s2-evm.conf
@@ -1,24 +0,0 @@
-#@TYPE: Machine
-#@NAME: J721S2 EVM
-#@DESCRIPTION: Machine configuration for the TI J721S2 EVM
-
-require conf/machine/include/j7.inc
-
-MACHINE_FEATURES += "gpu"
-
-SERIAL_CONSOLES = "115200;ttyS10"
-SERIAL_CONSOLES_CHECK = "${SERIAL_CONSOLES}"
-TFA_K3_USART = "0x8"
-OPTEE_K3_USART = "0x8"
-
-KERNEL_DEVICETREE = " \
-    ti/k3-j721s2-common-proc-board.dtb \
-"
-
-UBOOT_MACHINE = "j721s2_evm_a72_defconfig"
-
-# J721S2 supports multi-certificate images, use the same
-IMAGE_BOOT_FILES = "${IMAGE_BOOT_FILES_MULTI_CERT}"
-
-do_image_wic[mcdepends] = "mc::k3r5:ti-sci-fw:do_deploy"
-do_image_tar[mcdepends] = "mc::k3r5:ti-sci-fw:do_deploy"
--- a/conf/machine/k2e-evm.conf
+++ b/conf/machine/k2e-evm.conf
@@ -22,7 +22,7 @@ SYSVINIT_ENABLED_GETTYS = ""
 # UBI: logical eraseblock size:    126976 bytes
 # from ubiattach stdout:
 # UBI device number 0, total 3856 LEBs
-MKUBIFS_ARGS = "-F -m 2048 -e 126976 -c 3856"
+MKUBIFS_ARGS = "-F -m 2048 -e 126976 -c 4000"

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

 MACHINE_FEATURES += "alsa"

-KERNEL_DEVICETREE = "keystone-k2g-evm.dtb keystone-k2g-ice.dtb \
+KERNEL_DEVICETREE = "keystone-k2g-evm.dtb keystone-k2g-evm-lcd.dtb keystone-k2g-ice.dtb \
                     ${@oe.utils.conditional('ENABLE_TI_UIO_DEVICES', '1', 'keystone-k2g-ice-pru-excl-uio.dtb', '', d)}"

 UBOOT_MACHINE = "k2g_evm_config"
@@ -25,7 +25,7 @@ SYSVINIT_ENABLED_GETTYS = ""
 # UBI: logical eraseblock size:    253952 bytes
 # from ubiattach stdout:
 # UBI device number 0, total 1926 LEBs
-MKUBIFS_ARGS = "-F -m 4096 -e 253952 -c 1926"
+MKUBIFS_ARGS = "-F -m 4096 -e 253952 -c 2000"

 # do ubiattach /dev/ubi_ctrl -m 4
 # from dmesg:
--- a/conf/machine/k2hk-evm.conf
+++ b/conf/machine/k2hk-evm.conf
@@ -22,7 +22,7 @@ SYSVINIT_ENABLED_GETTYS = ""
 # UBI: logical eraseblock size:    126976 bytes
 # from ubiattach stdout:
 # UBI device number 0, total 3856 LEBs
-MKUBIFS_ARGS = "-F -m 2048 -e 126976 -c 3856"
+MKUBIFS_ARGS = "-F -m 2048 -e 126976 -c 4000"

 # do ubiattach /dev/ubi_ctrl -m 4
 # from dmesg:
--- a/conf/machine/k2l-evm.conf
+++ b/conf/machine/k2l-evm.conf
@@ -22,7 +22,7 @@ SYSVINIT_ENABLED_GETTYS = ""
 # UBI: logical eraseblock size:    253952 bytes
 # from ubiattach stdout:
 # UBI device number 0, total 1926 LEBs
-MKUBIFS_ARGS = "-F -m 4096 -e 253952 -c 1926"
+MKUBIFS_ARGS = "-F -m 4096 -e 253952 -c 2000"

 # do ubiattach /dev/ubi_ctrl -m 4
 # from dmesg:
--- a/conf/machine/lego-ev3.conf
+++ b/conf/machine/lego-ev3.conf
@@ -17,6 +17,6 @@ KERNEL_DEVICETREE_BUNDLE = "1"
 SERIAL_CONSOLES = "115200;ttyS1"

 IMAGE_FSTYPES += " wic"
-WKS_FILE ?= "sdimage-bootpart.wks"
+WKS_FILE = "sdimage-bootpart.wks"
 WIC_CREATE_EXTRA_ARGS += " --no-fstab-update"
 IMAGE_BOOT_FILES = "${KERNEL_IMAGETYPES}"
--- a/conf/machine/omap3evm.conf
+++ b/conf/machine/omap3evm.conf
@@ -7,7 +7,7 @@ require conf/machine/include/omap3.inc
 MACHINE_GUI_CLASS = "smallscreen"
 MACHINE_FEATURES += "touchscreen ethernet"

-IMAGE_FSTYPES += "jffs2 tar.xz"
+IMAGE_FSTYPES += "jffs2 tar.gz"
 EXTRA_IMAGECMD_jffs2 = "-lnp -e 0x20000 -s 2048"

 SERIAL_CONSOLES = "115200;ttyS0"
--- a/conf/machine/omap5-evm.conf
+++ b/conf/machine/omap5-evm.conf
@@ -4,7 +4,7 @@

 require conf/machine/include/omap-a15.inc

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

 KERNEL_DEVICETREE = "omap5-uevm.dtb"

--- a/conf/machine/omapl137-evm.conf
+++ b/conf/machine/omapl137-evm.conf
@@ -6,7 +6,7 @@ require conf/machine/include/davinci.inc
 require conf/machine/include/omapl137.inc

 # HACK: The omapl137 family does not have linux kernel support.
-PREFERRED_PROVIDER_virtual/kernel ?= "linux-dummy"
+PREFERRED_PROVIDER_virtual/kernel = "linux-dummy"
 EXTRA_IMAGEDEPENDS = ""

 IMAGE_FSTYPES = "tar.xz"
--- a/conf/machine/pandaboard.conf
+++ b/conf/machine/pandaboard.conf
@@ -6,11 +6,11 @@ require conf/machine/include/omap4.inc

 MACHINE_GUI_CLASS = "bigscreen"

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

 KERNEL_DEVICETREE = "omap4-panda.dtb omap4-panda-a4.dtb omap4-panda-es.dtb"

 SERIAL_CONSOLES = "115200;ttyS2"

 MACHINE_EXTRA_RRECOMMENDS = " kernel-modules"
-MACHINE_FEATURES = "kernel26 wifi bluetooth alsa apm ext2 screen usbgadget usbhost vfat gpu"
+MACHINE_FEATURES = "kernel26 wifi bluetooth alsa apm ext2 screen usbgadget usbhost vfat sgx"
--- a/conf/multiconfig/k3r5-sr1-1.conf
+++ b/conf/multiconfig/k3r5-sr1-1.conf
@@ -1,3 +0,0 @@
-require k3r5.conf
-
-MACHINE_append = "-sr1-1"
--- a/conf/multiconfig/k3r5-sr2.conf
+++ b/conf/multiconfig/k3r5-sr2.conf
@@ -1,3 +0,0 @@
-require k3r5.conf
-
-MACHINE_append = "-sr2"
--- a/conf/multiconfig/k3r5.conf
+++ b/conf/multiconfig/k3r5.conf
@@ -1,5 +0,0 @@
-MAINMACHINE := "${MACHINE}"
-
-DEPLOY_DIR_IMAGE = "${DEPLOY_DIR}/images/${MAINMACHINE}"
-
-MACHINE_append = "-k3r5"
--- a/licenses/Hewlett-Packard
+++ b/licenses/Hewlett-Packard
@@ -1,13 +0,0 @@
-/*
- * Copyright (c) 1994
- * Hewlett-Packard Company
- *
- * Permission to use, copy, modify, distribute and sell this software
- * and its documentation for any purpose is hereby granted without fee,
- * provided that the above copyright notice appear in all copies and
- * that both that copyright notice and this permission notice appear
- * in supporting documentation.  Hewlett-Packard Company makes no
- * representations about the suitability of this software for any
- * purpose.  It is provided "as is" without express or implied warranty.
- *
- */
--- a/licenses/Patrick-Powell
+++ b/licenses/Patrick-Powell
@@ -1,4 +0,0 @@
-Copyright Patrick Powell 1995
-This code is based on code written by Patrick Powell (papowell@astart.com)
-It may be used for any purpose as long as this notice remains intact
-on all source code distributions
--- a/licenses/TI-IMG
+++ b/licenses/TI-IMG
@@ -1,63 +0,0 @@
-This license applies to the Imagination D5520 firmware image, pvdec_full_bin.fw.
-
-Copyright (C) 2019 Texas Instruments Incorporated
-
-All rights reserved not granted herein.
-
-Limited License.
-
-Texas Instruments Incorporated grants a world-wide, royalty-free, non-exclusive
-license under copyrights and patents it now or hereafter owns or controls to
-make, have made, use, import, offer to sell and sell ("Utilize") this software
-subject to the terms herein. With respect to the foregoing patent license, such
-license is granted solely to the extent that any such patent is necessary to
-Utilize the software alone. The patent license shall not apply to any
-combinations which include this software, other than combinations with devices
-manufactured by or for TI (“TI Devices”). No hardware patent is licensed
-hereunder.
-
-Redistributions must preserve existing copyright notices and reproduce this
-license (including the above copyright notice and the disclaimer and
-(if applicable) source code license limitations below) in the documentation
-and/or other materials provided with the distribution
-
-Redistribution and use in binary form, without modification, are permitted
-provided that the following conditions are met:
-
-	* No reverse engineering, decompilation, or disassembly of this
-	  software is permitted with respect to any software provided in binary
-	  form.
-
-	* any redistribution and use are licensed by TI for use only with TI
-	  Devices.
-
-	* Nothing shall obligate TI to provide you with source code for the
-	  software licensed and provided to you in object code.
-
-If software source code is provided to you, modification and redistribution of
-the source code are permitted provided that the following conditions are met:
-
-	* any redistribution and use of the source code, including any
-	  resulting derivative works, are licensed by TI for use only with TI
-	  Devices.
-
-	* any redistribution and use of any object code compiled from the
-	  source code and any resulting derivative works, are licensed by TI
-	  for use only with TI Devices.
-
-Neither the name of Texas Instruments Incorporated nor the names of its
-suppliers may be used to endorse or promote products derived from this
-software without specific prior written permission.
-
-DISCLAIMER.
-
-THIS SOFTWARE IS PROVIDED BY TI AND TI’S LICENSORS "AS IS" AND ANY EXPRESS OR
-IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
-EVENT SHALL TI AND TI’S LICENSORS BE LIABLE FOR ANY DIRECT, INDIRECT,
-INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
-PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
-LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
-OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
-ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
--- a/recipes-bsp/aif2-lld/aif2-lld.inc
+++ b/recipes-bsp/aif2-lld/aif2-lld.inc
@@ -2,13 +2,21 @@ LICENSE = "BSD-3-Clause"

 LIC_FILES_CHKSUM = "file://COPYING.txt;md5=5bdceac872dffdec915b819654ee23ea"

-inherit ti-pdk-fetch
+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"

-TI_PDK_COMP = "ti.drv.aif2"
+# The following commit correspond to DEV.AIF2LLD.01.02.00.02A
+AIF2_LLD_SRCREV = "3eecba9b3b07b0c8fc39daa79fe4e8204e5d0e0e"

-PE = "1"
+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.2A"
 INC_PR = "r0"

 COMPATIBLE_MACHINE = "k2hk"

+S = "${WORKDIR}/${AIF2_LLD_GIT_DESTSUFFIX}"
--- a/recipes-bsp/aif2-lld/aif2-lld_git.bb
+++ b/recipes-bsp/aif2-lld/aif2-lld_git.bb
@@ -14,7 +14,4 @@ do_compile () {

 do_install () {
    oe_runmake install INSTALL_INC_BASE_DIR=${D}/${includedir} INSTALL_LIB_BASE_DIR=${D}${libdir}
-    chown -R root:root ${D}
 }
-
-INHIBIT_PACKAGE_STRIP_FILES = "${PKGD}${libdir}/libaif2.a"
--- a/recipes-bsp/arm-trusted-firmware/arm-trusted-firmware_2.0.bb
+++ b/recipes-bsp/arm-trusted-firmware/arm-trusted-firmware_2.0.bb
@@ -0,0 +1,71 @@
+SUMMARY = "ARM Trusted Firmware"
+DESCRIPTION = "ARM Trusted Firmware provides a reference implementation of \
+Secure World software for ARMv8-A, including Exception Level 3 (EL3) software. \
+It provides implementations of various ARM interface standards such as the \
+Power State Coordination Interface (PSCI), Trusted Board Boot Requirements \
+(TBBR) and Secure monitor code."
+HOMEPAGE = "http://infocenter.arm.com/help/topic/com.arm.doc.dui0928e/CJHIDGJF.html"
+
+LICENSE = "BSD"
+LIC_FILES_CHKSUM = "file://license.rst;md5=c709b197e22b81ede21109dbffd5f363"
+
+inherit deploy
+
+DEPENDS += "dtc-native openssl-native"
+
+PACKAGE_ARCH = "${MACHINE_ARCH}"
+
+S = "${WORKDIR}/git"
+
+PV_append = "+git${SRCPV}"
+
+BRANCH = "ti-atf"
+SRC_URI = "git://git.ti.com/atf/arm-trusted-firmware.git;branch=${BRANCH}"
+
+SRCREV ?= "ee0d515f0577d96ca32278e7cccb6fd768d1b83d"
+
+# Make ATF "aware" of OPTEE, no build dependency
+PACKAGECONFIG[optee] = "SPD=opteed"
+
+COMPATIBLE_MACHINE = "k3"
+ATFPLATFORM_k3 = "k3"
+ATFBOARD_k3 = "generic"
+
+PACKAGECONFIG_k3 = "optee"
+
+CFLAGS[unexport] = "1"
+LDFLAGS[unexport] = "1"
+AS[unexport] = "1"
+LD[unexport] = "1"
+
+do_configure[noexec] = "1"
+
+EXTRA_OEMAKE = 'CROSS_COMPILE="${TARGET_PREFIX}" PLAT="${ATFPLATFORM}" TARGET_BOARD="${ATFBOARD}" ${PACKAGECONFIG_CONFARGS}'
+
+do_compile() {
+	oe_runmake all
+}
+
+do_compile_append_am65xx-hs-evm() {
+	export TI_SECURE_DEV_PKG=${TI_SECURE_DEV_PKG}
+	( cd ${S}/build/${ATFPLATFORM}/${ATFBOARD}/release/; \
+		mv bl31.bin bl31.bin.unsigned; \
+		${TI_SECURE_DEV_PKG}/scripts/secure-binary-image.sh bl31.bin.unsigned bl31.bin; \
+	)
+}
+
+do_install() {
+	install -d ${D}/boot
+	install -m 0644 ${S}/build/${ATFPLATFORM}/${ATFBOARD}/release/bl31.bin ${D}/boot/
+	install -m 0644 ${S}/build/${ATFPLATFORM}/${ATFBOARD}/release/bl31/bl31.elf ${D}/boot/
+}
+
+do_deploy() {
+	install -d ${DEPLOYDIR}
+	install -m 0644 ${S}/build/${ATFPLATFORM}/${ATFBOARD}/release/bl31.bin ${DEPLOYDIR}/
+	install -m 0644 ${S}/build/${ATFPLATFORM}/${ATFBOARD}/release/bl31/bl31.elf ${DEPLOYDIR}/
+}
+addtask deploy before do_build after do_compile
+
+FILES_${PN} = "/boot"
+SYSROOT_DIRS += "/boot"
--- a/recipes-bsp/bcp-lld/bcp-lld-rtos_git.bb
+++ b/recipes-bsp/bcp-lld/bcp-lld-rtos_git.bb
@@ -1,10 +1,6 @@
 SUMMARY = "TI Bit Coprocessor (BCP) low level driver"

-inherit ti-pdk ti-pdk-fetch
-
-TI_PDK_COMP = "ti.drv.bcp"
-
-PE = "1"
+inherit ti-pdk

 LICENSE = "BSD-3-Clause"
 LIC_FILES_CHKSUM = "file://bcp.h;beginline=1;endline=40;md5=4f6e6128dd075a89548c0287a39b8896"
@@ -12,8 +8,22 @@ LIC_FILES_CHKSUM = "file://bcp.h;beginline=1;endline=40;md5=4f6e6128dd075a89548c
 COMPATIBLE_MACHINE = "k2hk|k2l|c667x-evm"
 PACKAGE_ARCH = "${MACHINE_ARCH}"

+BCP_LLD_GIT_URI = "git://git.ti.com/keystone-rtos/bcp-lld.git"
+BCP_LLD_GIT_PROTOCOL = "git"
+BCP_LLD_GIT_BRANCH = "master"
+BCP_LLD_GIT_DESTSUFFIX = "git/ti/drv/bcp"
+
+# Below commit ID corresponds to "DEV.BCP_LLD.02.01.00.07A"
+BCP_LLD_SRCREV = "da66f02398ebef70f69a8703e6755985010eb422"
+
+BRANCH = "${BCP_LLD_GIT_BRANCH}"
+SRC_URI = "${BCP_LLD_GIT_URI};destsuffix=${BCP_LLD_GIT_DESTSUFFIX};protocol=${BCP_LLD_GIT_PROTOCOL};branch=${BRANCH}"
+
+SRCREV = "${BCP_LLD_SRCREV}"
+PV = "02.01.00.07A"
 PR = "r0"

+S = "${WORKDIR}/${BCP_LLD_GIT_DESTSUFFIX}"

 DEPENDS_append = " qmss-lld-rtos \
                   cppi-lld-rtos \
--- a/recipes-bsp/board-rtos/board-rtos_git.bb
+++ b/recipes-bsp/board-rtos/board-rtos_git.bb
@@ -1,10 +1,6 @@
 SUMMARY = "TI RTOS Board Library"

-inherit ti-pdk ti-pdk-fetch
-
-TI_PDK_COMP = "ti.board"
-
-PE = "1"
+inherit ti-pdk

 LICENSE = "BSD-3-Clause"
 LIC_FILES_CHKSUM = "file://board.h;beginline=1;endline=32;md5=9bed8e4ac2fb37fc627cefe49eb1c919"
@@ -12,8 +8,18 @@ LIC_FILES_CHKSUM = "file://board.h;beginline=1;endline=32;md5=9bed8e4ac2fb37fc62
 COMPATIBLE_MACHINE = "ti33x|ti43x|omap-a15|keystone|omapl1|c66x|k3"
 PACKAGE_ARCH = "${MACHINE_ARCH}"

+BOARD_GIT_URI = "git://git.ti.com/keystone-rtos/board.git"
+BOARD_GIT_PROTOCOL = "git"
+BOARD_GIT_BRANCH = "master"

+# Below commit ID corresponds to "DEV.BOARD.01.00.10.04C"
+BOARD_SRCREV = "e794b8d6a58dc800cb406b05f45b46652c9d4f4c"

+BRANCH ="${BOARD_GIT_BRANCH}"
+SRC_URI = "${BOARD_GIT_URI};protocol=${BOARD_GIT_PROTOCOL};branch=${BRANCH}"
+
+SRCREV = "${BOARD_SRCREV}"
+PV = "01.00.10.04C"
 PR = "r0"

 DEPENDS_append = " i2c-lld-rtos \
@@ -55,13 +61,11 @@ DEPENDS_append_dra7xx = " pm-lld-rtos \
                          mmcsd-lld-rtos \
 "

-DEPENDS_append_am65xx = " sciclient-rtos \
-"
-DEPENDS_append_j7 = " udma-lld-rtos \
-                          sciclient-rtos \
-                          mmcsd-lld-rtos \
+DEPENDS_append_k3 = " sciclient-rtos \
+                              pm-lld-rtos \
 "

+
 # Build with make instead of XDC
 TI_PDK_XDCMAKE = "0"

--- 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 = "d57d5c1d8f0b0b1487484d9ceb1595bd4507231a"
+SRCREV = "e1f885ab6dc544884728e333cc6e396f7eb08286"

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

--- a/recipes-bsp/cadence-mhdp-fw/cadence-mhdp-fw_git.bb
+++ b/recipes-bsp/cadence-mhdp-fw/cadence-mhdp-fw_git.bb
@@ -1,25 +0,0 @@
-SUMMARY = "Cadence MHDP DP bridge firmware"
-
-require recipes-bsp/ti-linux-fw/ti-linux-fw.inc
-
-LICENSE = "BSD-3-Clause | Apache-2.0"
-LIC_FILES_CHKSUM = "file://LICENCE.cadence;md5=009f46816f6956cfb75ede13d3e1cee0"
-
-PV = "${CADENCE_MHDP_FW_VERSION}"
-PR = "${INC_PR}.0"
-
-CLEANBROKEN = "1"
-
-COMPATIBLE_MACHINE = "j7"
-
-PACKAGE_ARCH = "${MACHINE_ARCH}"
-
-S = "${WORKDIR}/git"
-TARGET = "mhdp8546.bin"
-
-do_install() {
-	install -d ${D}${base_libdir}/firmware/cadence
-	install -m 0644 ${S}/cadence/${TARGET} ${D}${base_libdir}/firmware/cadence/${TARGET}
-}
-
-FILES_${PN} = "${base_libdir}/firmware"
--- a/recipes-bsp/cal-lld/cal-lld-rtos_git.bb
+++ b/recipes-bsp/cal-lld/cal-lld-rtos_git.bb
@@ -1,76 +0,0 @@
-SUMMARY = "TI RTOS low level driver for CAL"
-
-inherit ti-pdk ti-pdk-fetch
-
-TI_PDK_COMP = "ti.drv.cal"
-
-PE = "1"
-
-LICENSE = "BSD-3-Clause"
-LIC_FILES_CHKSUM = "file://cal.h;beginline=1;endline=31;md5=83d177cf3df55c16b27ae4102b6ade9a"
-
-COMPATIBLE_MACHINE = "k3"
-PACKAGE_ARCH = "${MACHINE_ARCH}"
-
-
-PR = "r0"
-
-DEPENDS_append = " osal-rtos \
-                   fvid2-rtos \
-"
-
-# Build with make instead of XDC
-TI_PDK_XDCMAKE = "0"
-
-CAL_PACKAGE_BASE   = "${WORKDIR}/cal_base"
-CAL_LLD_ROOTPATH = "${CAL_PACKAGE_BASE}/package/all/pdk_/packages/ti/drv/cal"
-
-export PDK_INSTALL_PATH = "${PDK_INSTALL_DIR}/packages"
-export PDK_CAL_ROOT_PATH = "${CAL_PACKAGE_BASE}/package/all/pdk_/packages"
-
-LIMSOCS = ""
-LIMSOCS_am65xx-evm = "am65xx"
-LIMSOCS_am65xx-hs-evm = "am65xx"
-
-LIMBOARDS = ""
-LIMBOARDS_am65xx-evm = "am65xx_evm"
-LIMBOARDS_am65xx-hs-evm = "am65xx_evm"
-
-BOARD_PACKAGE = ""
-BOARD_PACKAGE_am65xx-evm = "am65xx_evm"
-BOARD_PACKAGE_am65xx-hs-evm = "am65xx_evm"
-
-# HTML doc link params
-PDK_COMP_LINK_TEXT = "CAL"
-
-do_configure() {
-    rm -rf ${CAL_PACKAGE_BASE}
-    cd ${S}
-
-    # remove any previous package
-    rm -f ${CAL_PACKAGE_BASE}
-
-    # make the release package before building it
-    make package BOARD=${BOARD_PACKAGE} DEST_ROOT=${CAL_PACKAGE_BASE} PDK_CAL_COMP_PATH=${S}
-}
-
-do_compile() {
-    echo "cal lld root path is ${CAL_LLD_ROOTPATH}"
-    cd ${CAL_LLD_ROOTPATH}
-
-    # Build am65xx libraries
-    make clean lib xdc_meta doxygen LIMIT_SOCS="${LIMSOCS}" LIMIT_BOARDS="${LIMBOARDS}"
-
-    #archive
-    tar -cf cal_lld.tar --exclude='*.tar' ./*
-}
-
-do_install() {
-    cd ${CAL_LLD_ROOTPATH}
-    install -d ${D}${PDK_INSTALL_DIR_RECIPE}/packages/ti/drv/cal
-    find -name "*.tar" -exec tar xf {} --no-same-owner -C ${D}${PDK_INSTALL_DIR_RECIPE}/packages/ti/drv/cal \;
-}
-
-FILES_${PN} += "${PDK_INSTALL_DIR_RECIPE}/packages"
-
-INSANE_SKIP_${PN} = "arch ldflags"
--- a/recipes-bsp/cm3-pm-firmware/amx3-cm3_git.bb
+++ b/recipes-bsp/cm3-pm-firmware/amx3-cm3_git.bb
@@ -24,6 +24,5 @@ do_install() {
 }

 FILES_${PN} += "${base_libdir}/firmware"
-
-COMPATIBLE_MACHINE = "(ti-soc)"
-TOOLCHAIN = "gcc"
+COMPATIBLE_HOST ?= "null"
+COMPATIBLE_HOST_ti-soc = "(.*)"
--- a/recipes-bsp/cmb-addon/cmb-addon-rtos_git.bb
+++ b/recipes-bsp/cmb-addon/cmb-addon-rtos_git.bb
@@ -14,11 +14,11 @@ CMB_ADDON_GIT_PROTOCOL = "git"
 CMB_ADDON_GIT_BRANCH = "master"
 CMB_ADDON_GIT_DESTSUFFIX = "git/ti/addon"

-# Below commit ID corresponds to "DEV.CMB.01.01.00.03A"
-CMB_ADDON_SRCREV = "3655aad07f17d3a167ec7dcecb52450c1d2fe8be"
+# Below commit ID corresponds to "DEV.CMB.01.01.00.03"
+CMB_ADDON_SRCREV = "4b16dd77eb929708a5134714c3194fc5b5bc1808"

 SRCREV = "${CMB_ADDON_SRCREV}"
-PV = "01.01.00.03A"
+PV = "01.01.00.03"
 PR = "r0"

 BRANCH = "${CMB_ADDON_GIT_BRANCH}"
--- 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=26be509e4bb413905bda8309e338e2b1"

 BRANCH = "master"
-# This corresponds to version 4.20.00.01
-SRCREV = "86269258a48e0a9008dd9d5ebfae9da7ce843393"
+# This corresponds to version 4.16.00.00
+SRCREV = "4f970f053b42e8d2a6f1a8cd4b14786196468fd3"

-PV = "4.20.00.01+git${SRCPV}"
+PV = "4.16.00.00+git${SRCPV}"

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

--- a/recipes-bsp/cnm-wave-fw/cnm-wave-fw_git.bb
+++ b/recipes-bsp/cnm-wave-fw/cnm-wave-fw_git.bb
@@ -1,44 +0,0 @@
-SUMMARY = "Chips&Media codec firmware files"
-
-require recipes-bsp/ti-linux-fw/ti-linux-fw.inc
-
-inherit deploy
-inherit update-alternatives
-
-LICENSE = "BSD-3-Clause"
-LIC_FILES_CHKSUM = "file://LICENCE.cnm;md5=93b67e6bac7f8fec22b96b8ad0a1a9d0"
-
-PV = "${CNM_WAVE521_FW_VERSION}"
-PR = "${INC_PR}.1"
-
-CLEANBROKEN = "1"
-
-COMPATIBLE_MACHINE = "j721s2-evm"
-
-PACKAGE_ARCH = "${MACHINE_ARCH}"
-
-S = "${WORKDIR}/git"
-TARGET_WAVE521C = "wave521c_codec_fw.bin"
-
-SOURCE_WAVE521C = "wave521c_codec_fw.bin"
-SOURCE_WAVE521C_j721s2-evm = "wave521c_j721s2_codec_fw.bin"
-
-ALTERNATIVE_LINK_NAME[wave521c_codec_fw.bin] = "${base_libdir}/firmware/${TARGET_WAVE521C}"
-ALTERNATIVE_TARGET[wave521c_codec_fw.bin] = "${base_libdir}/firmware/cnm/${TARGET_WAVE521C}"
-ALTERNATIVE_PRIORITY = "10"
-
-# Set up names for the firmwares
-ALTERNATIVE_${PN}_j7 = "\
-                    wave521c_codec_fw.bin"
-
-do_install() {
-	install -d ${D}${base_libdir}/firmware/cnm
-	install -m 0644 ${S}/cnm/${SOURCE_WAVE521C} ${D}${base_libdir}/firmware/cnm/${TARGET_WAVE521C}
-}
-
-# make sure that lib/firmware, and all its contents are part of the package
-FILES_${PN} = "${base_libdir}/firmware"
-
-# we don't want to configure and build the source code
-do_compile[noexec] = "1"
-do_configure[noexec] = "1"
--- a/recipes-bsp/common-csl-ip/common-csl-ip-rtos_git.bb
+++ b/recipes-bsp/common-csl-ip/common-csl-ip-rtos_git.bb
@@ -7,7 +7,6 @@ COMPATIBLE_MACHINE_append = "|c66x|k3"
 inherit ti-pdk

 DEPENDS_remove = "${PN}"
-DEPENDS_remove = "ti-sysbios"

 # Build with make instead of XDC
 TI_PDK_XDCMAKE = "0"
@@ -20,4 +19,3 @@ PDK_COMP_LINK_TEXT = "CSL-Chip Support Library"

 # Workaround: dra7xx build requires am57xx CSL libraries for opencl-monitor
 TI_PDK_LIMIT_SOCS_append_dra7xx = " am571x am572x am574x"
-TI_PDK_LIMIT_BOARDS_append_dra7xx = " evmAM571x evmAM572x idkAM574x"
--- a/recipes-bsp/common-csl-ip/common-csl-ip.inc
+++ b/recipes-bsp/common-csl-ip/common-csl-ip.inc
@@ -4,17 +4,17 @@ LIC_FILES_CHKSUM = "file://COPYING.txt;md5=5857833e20836213677fac33f9aded21"

 COMPATIBLE_MACHINE = "keystone|dra7xx|ti33x|ti43x|omapl1"

-PV = "03.03.00.17B"
+PV = "03.03.00.14D"
 INC_PR = "r0"
-PE = "2"
+PE = "1"

 CSL_GIT_URI = "git://git.ti.com/keystone-rtos/common-csl-ip.git"
 CSL_GIT_PROTOCOL ="git"
 CSL_GIT_BRANCH = "release"
 CSL_GIT_DESTSUFFIX = "git"

-# Below commit ID corresponding to "DEV.CSL_PROCESSOR-SDK.03.03.00.17B"
-CSL_SRCREV = "027d26031709ad6a0e9f84625d11a3419e486467"
+# Below commit ID corresponding to "DEV.CSL_PROCESSOR-SDK.03.03.00.14D"
+CSL_SRCREV = "192be8698c81d31ba096892ca252a25089923823"

 BRANCH="${CSL_GIT_BRANCH}"
 SRC_URI = "${CSL_GIT_URI};protocol=${CSL_GIT_PROTOCOL};branch=${BRANCH};destsuffix=${CSL_GIT_DESTSUFFIX}"
--- a/recipes-bsp/common-csl-ip/csl-rti-dwwdtest-fw_git.bb
+++ b/recipes-bsp/common-csl-ip/csl-rti-dwwdtest-fw_git.bb
@@ -1,77 +0,0 @@
-SUMMARY = "MCU Watchdog test firmware"
-DESCRIPTION = "Firmware for the R5F core to test the detection of watchdog timeout events to trigger SOC reset though DMSC."
-
-require recipes-bsp/common-csl-ip/common-csl-ip.inc
-require recipes-ti/includes/ti-paths.inc
-
-LIC_FILES_CHKSUM = "file://../../../COPYING.txt;md5=5857833e20836213677fac33f9aded21"
-
-S = "${WORKDIR}/${CSL_GIT_DESTSUFFIX}/example/rti/rti_dwwdtest_app"
-
-COMPATIBLE_MACHINE = "am65xx"
-PACKAGE_ARCH = "${MACHINE_ARCH}"
-
-DEPENDS = "ti-cgt-arm-native \
-           ti-pdk-build-rtos \
-           uart-lld-rtos \
-           board-rtos \
-           sciclient-rtos \
-           udma-lld-rtos"
-
-export PDK_INSTALL_PATH = "${PDK_INSTALL_DIR}/packages"
-export TOOLCHAIN_PATH_R5 = "${M4_TOOLCHAIN_INSTALL_DIR}"
-
-EXTRA_OEMAKE = "WDT_RESET=enable DEST_ROOT=${S}"
-
-do_compile() {
-    for soc in ${TI_PDK_LIMIT_SOCS}
-    do
-        for board in ${TI_PDK_LIMIT_BOARDS}
-        do
-            oe_runmake SOC=$soc BOARD=$board
-        done
-    done
-}
-
-do_install() {
-    install -d ${D}${base_libdir}/firmware/rti_dwwdtest
-
-    for board in ${TI_PDK_LIMIT_BOARDS}
-    do
-        install -d ${D}${base_libdir}/firmware/rti_dwwdtest/$board
-        install -m 0644 csl_rti_dwwd_test_app/bin/$board/csl_rti_dwwd_test_app_mcu1_0_release.xer5f \
-                        ${D}${base_libdir}/firmware/rti_dwwdtest/$board
-    done
-}
-
-# Create separate package for each firmware so we can utilize
-# update-alternatives.
-PACKAGES =+ "${PN}-evm ${PN}-idk"
-RDEPENDS_${PN} = "${PN}-evm ${PN}-idk"
-ALLOW_EMPTY_${PN} = "1"
-
-FILES_${PN}-evm = "${base_libdir}/firmware/rti_dwwdtest/am65xx_evm"
-FILES_${PN}-idk = "${base_libdir}/firmware/rti_dwwdtest/am65xx_idk"
-
-# We are packaging R5 firmware
-INSANE_SKIP_${PN}-evm = "arch"
-INSANE_SKIP_${PN}-idk = "arch"
-
-# Configure update-alternatives as there may be other firmwares provided in an
-# image.
-inherit update-alternatives
-
-# It might be nice to dynamically declare the following based on
-# TI_PDK_LIMIT_BOARDS, but that is probably overkill.
-ALTERNATIVE_${PN}-evm = "am65x-mcu-r5f0_0-fw"
-ALTERNATIVE_${PN}-idk = "am65x-mcu-r5f0_0-fw"
-
-ALTERNATIVE_LINK_NAME[am65x-mcu-r5f0_0-fw] = "${base_libdir}/firmware/am65x-mcu-r5f0_0-fw"
-
-ALTERNATIVE_TARGET_${PN}-evm = "${base_libdir}/firmware/rti_dwwdtest/am65xx_evm/csl_rti_dwwd_test_app_mcu1_0_release.xer5f"
-ALTERNATIVE_TARGET_${PN}-idk = "${base_libdir}/firmware/rti_dwwdtest/am65xx_idk/csl_rti_dwwd_test_app_mcu1_0_release.xer5f"
-
-# Use a lesser priority than ipc example fw
-# See meta-ti/recipes-ti/ipc/ti-ipc-rtos_git.bb
-ALTERNATIVE_PRIORITY_${PN}-evm = "4"
-ALTERNATIVE_PRIORITY_${PN}-idk = "3"
--- a/recipes-bsp/cppi-lld/cppi-lld.inc
+++ b/recipes-bsp/cppi-lld/cppi-lld.inc
@@ -4,16 +4,24 @@ LIC_FILES_CHKSUM = "file://${WORKDIR}/git/ti/drv/cppi/COPYING.txt;md5=e8f6789acd
 COMPATIBLE_MACHINE = "keystone"
 PACKAGE_ARCH = "${MACHINE_ARCH}"

-inherit ti-pdk-fetch
+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"

-TI_PDK_COMP = "ti.drv.cppi"
+# Below Commit ID corresponds to "DEV.CPPI_LLD.02.01.00.14"
+CPPI_LLD_SRCREV = "10d3fbc0231073027991d797e9406a9585058691"

-PE = "1"
+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.14"
 INC_PR = "r0"

 DEVICELIST = "k2h k2k k2l k2e"
 DEVICELIST_k2hk = "k2h k2k"
 DEVICELIST_k2l  = "k2l"
 DEVICELIST_k2e  = "k2e"
-DEVICELIST_k2g  = "k2h"
+
+S = "${WORKDIR}/${CPPI_LLD_GIT_DESTSUFFIX}"
--- a/recipes-bsp/cppi-lld/cppi-lld_git.bb
+++ b/recipes-bsp/cppi-lld/cppi-lld_git.bb
@@ -30,9 +30,3 @@ do_install () {
    done
    ln -sf libcppi_device.so.1 libcppi_device.so
 }
-
-INHIBIT_PACKAGE_STRIP_FILES_k2hk = "${PKGD}${libdir}/libcppi_k2h.a ${PKGD}${libdir}/libcppi_k2k.a"
-INHIBIT_PACKAGE_STRIP_FILES_k2e = "${PKGD}${libdir}/libcppi_k2e.a"
-INHIBIT_PACKAGE_STRIP_FILES_k2l = "${PKGD}${libdir}/libcppi_k2l.a"
-INHIBIT_PACKAGE_STRIP_FILES_k2g = "${PKGD}${libdir}/libcppi_k2h.a"
-INHIBIT_PACKAGE_STRIP_FILES_append = " ${PKGD}${libdir}/libcppi.a"
--- a/recipes-bsp/cpsw9g-eth-fw/cpsw9g-eth-fw_git.bb
+++ b/recipes-bsp/cpsw9g-eth-fw/cpsw9g-eth-fw_git.bb
@@ -1,43 +0,0 @@
-SUMMARY = "R5 PSDK CPSW9G Ethernet Switch Firmware"
-
-LICENSE = "TI-TFL"
-LIC_FILES_CHKSUM = "file://LICENSE.ti;md5=04ad0a015d4bb63c2b9e7b112debf3db"
-
-PV = "6.2+git${SRCPV}"
-PACKAGE_ARCH = "${MACHINE_ARCH}"
-
-inherit deploy
-inherit update-alternatives
-
-PROTOCOL = "git"
-BRANCH = "master"
-SRCREV = "91f1628507bf7f8716f0bc7cafe88ad7f14c94f5"
-
-SRC_URI = "git://git.ti.com/glsdk/ti-eth-fw.git;protocol=${PROTOCOL};branch=${BRANCH}"
-
-S = "${WORKDIR}/git"
-
-CPSW9G_FW_DIR = "${S}/ethfw"
-CPSW9G_FW_FILENAME = "app_remoteswitchcfg_server_pdk_mem_map_strip.xer5f"
-
-# make sure that lib/firmware, and all its contents are part of the package
-FILES_${PN} += "${base_libdir}/firmware"
-
-do_install() {
-  install -d ${D}${base_libdir}/firmware
-# Ethernet firmware to be loaded on Main R5 core(needs read permission)
-  install -m 0644 ${CPSW9G_FW_DIR}/${CPSW9G_FW_FILENAME} ${D}${base_libdir}/firmware
-}
-
-TARGET_MAIN_R5FSS0_0 = "j7-main-r5f0_0-fw"
-ALTERNATIVE_${PN} = "j7-main-r5f0_0-fw"
-ALTERNATIVE_LINK_NAME[j7-main-r5f0_0-fw] = "${base_libdir}/firmware/${TARGET_MAIN_R5FSS0_0}"
-ALTERNATIVE_TARGET[j7-main-r5f0_0-fw] = "${base_libdir}/firmware/${CPSW9G_FW_FILENAME}"
-ALTERNATIVE_PRIORITY = "17"
-
-INHIBIT_PACKAGE_STRIP = "1"
-INHIBIT_PACKAGE_DEBUG_SPLIT = "1"
-INSANE_SKIP_${PN} += "arch"
-
-do_compile[noexec] = "1"
-do_configure[noexec] = "1"
--- a/recipes-bsp/cuia/cuia_1.0.0.13.bb
+++ b/recipes-bsp/cuia/cuia_1.0.0.13.bb
@@ -26,5 +26,3 @@ do_install() {

 COMPATIBLE_HOST ?= "null"
 COMPATIBLE_HOST_ti-soc = "(.*)"
-
-INSANE_SKIP_${PN} += "textrel"
--- a/recipes-bsp/dfe-lld/dfe-lld.inc
+++ b/recipes-bsp/dfe-lld/dfe-lld.inc
@@ -2,13 +2,21 @@ LICENSE = "BSD-3-Clause"

 LIC_FILES_CHKSUM = "file://COPYING.txt;md5=1f4217b705bf98762a302fd720649dcc"

-inherit ti-pdk-fetch
+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"

-TI_PDK_COMP = "ti.drv.dfe"
+# Below commit ID corresponds to "DEV.DFE_LLD.01.00.00.09"
+DFE_LLD_SRCREV = "da6a84069837b5c9b7a4bdb8824d8a4295866b14"

-PE = "1"
+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.9"
 INC_PR = "r0"

 COMPATIBLE_MACHINE = "k2l"

+S = "${WORKDIR}/${DFE_LLD_GIT_DESTSUFFIX}"
--- a/recipes-bsp/dfe-lld/dfe-lld_git.bb
+++ b/recipes-bsp/dfe-lld/dfe-lld_git.bb
@@ -16,5 +16,3 @@ do_install () {
 	oe_runmake install INSTALL_INC_BASE_DIR=${D}/${includedir} INSTALL_LIB_BASE_DIR=${D}${libdir}
 	chown -R root:root ${D}
 }
-
-INHIBIT_PACKAGE_STRIP_FILES = "${PKGD}${libdir}/libdfe.a"
--- a/recipes-bsp/dspdce-fw/dspdce-fw_git.bb
+++ b/recipes-bsp/dspdce-fw/dspdce-fw_git.bb
@@ -1,13 +1,9 @@
-SUMMARY = "Firmware for DSP for an example application called copycodectest"
+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"

-inherit features_check
-
-REQUIRED_MACHINE_FEATURES = "dsp"
-
 SRC_URI = "git://git.ti.com/glsdk/dspdce.git;protocol=git"

 SRCREV = "de6e599f067b25c46cc0c8f74a22cc3b8aafbae8"
--- a/recipes-bsp/dsptop/dsptop.inc
+++ b/recipes-bsp/dsptop/dsptop.inc
@@ -1,7 +1,7 @@
 # This corresponds to version 1.4.0
-SRCREV = "816485e68430bbec643eac9498bfa5303eb2c2e1"
+SRCREV = "25e823b04e62af224dce97b90359b7569ce3fbb5"
 PV = "1.4.0"
-INC_PR = "r2"
+INC_PR = "r1"

 SRC_URI = "git://git.ti.com/sdo-emu/dsptop.git;protocol=git;branch=${BRANCH}"

--- a/recipes-bsp/dsptop/libulm_git.bb
+++ b/recipes-bsp/dsptop/libulm_git.bb
@@ -1,11 +1,7 @@
-SUMMARY = "TI Usage & Load Monitor Implementation"
+DESCRIPTION = "TI dsptop utility."
 LICENSE = "BSD"
 LIC_FILES_CHKSUM = "file://../debian/copyright;md5=309825aa8f5edfcf2c44912ac094b979"

-inherit features_check
-
-REQUIRED_MACHINE_FEATURES = "dsp"
-
 DEPENDS = "ti-cgt6x-native"
 PR = "${INC_PR}.0"

--- a/recipes-bsp/edma3-lld/edma3-lld-rtos_git.bb
+++ b/recipes-bsp/edma3-lld/edma3-lld-rtos_git.bb
@@ -3,7 +3,7 @@ require recipes-ti/includes/ti-paths.inc

 PR = "${INC_PR}.1"

-DEPENDS = "ti-sysbios ti-xdctools-native gcc-arm-baremetal-native ti-cgt-arm-native ti-cgt6x-native"
+DEPENDS = "ti-sysbios ti-xdctools-native gcc-arm-none-eabi-native ti-cgt-arm-native ti-cgt6x-native"

 COMPATIBLE_MACHINE = "ti33x|ti43x|omap-a15|keystone|c66x|omapl1"
 PACKAGE_ARCH = "${MACHINE_ARCH}"
--- 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 version 2.12.05.30E
-EDMA3_LLD_SRCREV = "ce5ced2ac5eb1e0f1515288d279f5690813b5413"
+# Below commit ID corresponds to version 2.12.05.30D
+EDMA3_LLD_SRCREV = "20750e17302116f3760aba68f8323ae110d1cbd0"

 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.05.30E"
-INC_PR = "r1"
+PV = "2.12.05.30D"
+INC_PR = "r0"
--- a/recipes-bsp/emac-lld/emac-lld-rtos_git.bb
+++ b/recipes-bsp/emac-lld/emac-lld-rtos_git.bb
@@ -2,23 +2,33 @@ SUMMARY = "TI RTOS low level driver for Ethernet MAC (EMAC) peripheral"

 inherit ti-pdk

-require emac-lld.inc
-
-PR = "r0"
-
 LICENSE = "BSD-3-Clause"
 LIC_FILES_CHKSUM = "file://emacver.h;beginline=1;endline=47;md5=f66bb3695972ca2a85d990a390f45d88"

 COMPATIBLE_MACHINE = "ti33x|ti43x|omap-a15|k2g|omapl1|c665x-evm|k3"
 PACKAGE_ARCH = "${MACHINE_ARCH}"

+EMAC_LLD_GIT_URI = "git://git.ti.com/keystone-rtos/emac-lld.git"
+EMAC_LLD_GIT_PROTOCOL = "git"
+EMAC_LLD_GIT_BRANCH = "master"
+
+# Below commit ID corresponds to "DEV.EMAC_LLD.01.00.03.14B"
+EMAC_LLD_SRCREV = "9ad95cde88aae23aaedf95d2146cab4a388e70d3"
+
+BRANCH ="${EMAC_LLD_GIT_BRANCH}"
+SRC_URI = "${EMAC_LLD_GIT_URI};protocol=${EMAC_LLD_GIT_PROTOCOL};branch=${BRANCH}"
+
+SRCREV = "${EMAC_LLD_SRCREV}"
+PV = "01.00.03.14B"
+PR = "r0"
+
 DEPENDS_append = " board-rtos osal-rtos"
 DEPENDS_append_ti33x = " starterware-rtos"
 DEPENDS_append_ti43x = " starterware-rtos"
 DEPENDS_append_k2g  = " cppi-lld-rtos qmss-lld-rtos"

 DEPENDS_remove_k3 = "board-rtos "
-DEPENDS_append_k3 = " udma-lld-rtos trace-rtos"
+DEPENDS_append_k3 = " udma-lld-rtos "

 # Build with make instead of XDC
 TI_PDK_XDCMAKE = "0"
--- a/recipes-bsp/emac-lld/emac-lld.inc
+++ b/recipes-bsp/emac-lld/emac-lld.inc
@@ -1,7 +0,0 @@
-inherit ti-pdk-fetch
-
-TI_PDK_COMP = "ti.drv.emac"
-
-PE = "1"
-
-# The LLD version
--- a/recipes-bsp/fatfs-rtos/fatfs-rtos_git.bb
+++ b/recipes-bsp/fatfs-rtos/fatfs-rtos_git.bb
@@ -1,10 +1,6 @@
 SUMMARY = "TI RTOS driver for FAT filesystem"

-inherit ti-pdk ti-pdk-fetch
-
-TI_PDK_COMP = "ti.fs.fatfs"
-
-PE = "1"
+inherit ti-pdk

 LICENSE = "BSD-3-Clause"
 LIC_FILES_CHKSUM = "file://FATFS.h;beginline=1;endline=32;md5=6619832755598d1cc2b01f2e6a1801d6"
@@ -12,6 +8,18 @@ LIC_FILES_CHKSUM = "file://FATFS.h;beginline=1;endline=32;md5=6619832755598d1cc2
 COMPATIBLE_MACHINE = "ti33x|ti43x|omap-a15|k2g|omapl1|k3"
 PACKAGE_ARCH = "${MACHINE_ARCH}"

+FATFS_GIT_URI = "git://git.ti.com/keystone-rtos/fatfs.git"
+FATFS_GIT_PROTOCOL = "git"
+FATFS_GIT_BRANCH = "master"
+
+# Below commit ID corresponds to "DEV.FATFS_LLD.01.00.00.13"
+FATFS_SRCREV = "33735fe2575b433bbe6495839f3a69ccef66ce2f"
+
+BRANCH = "${FATFS_GIT_BRANCH}"
+SRC_URI = "${FATFS_GIT_URI};protocol=${FATFS_GIT_PROTOCOL};branch=${BRANCH}"
+
+SRCREV = "${FATFS_SRCREV}"
+PV = "01.00.00.13"
 PR = "r0"

 DEPENDS_append = " mmcsd-lld-rtos \
--- a/recipes-bsp/faultmanagement/faultmanagement-rtos_git.bb
+++ b/recipes-bsp/faultmanagement/faultmanagement-rtos_git.bb
@@ -13,14 +13,14 @@ FAULT_MANAGEMENT_GIT_PROTOCOL = "git"
 FAULT_MANAGEMENT_GIT_BRANCH = "master"
 FAULT_MANAGEMENT_GIT_DESTSUFFIX = "git/ti/instrumentation/fault_mgmt"

-# Below commit ID corresponds to "DEV.FAULT_MGMT.01.00.01.04A"
-FAULT_MANAGEMENT_SRCREV = "67becdff0e3d181ab7b8fada226f5737517c1c52"
+# Below commit ID corresponds to "DEV.FAULT_MGMT.01.00.01.04"
+FAULT_MANAGEMENT_SRCREV = "f96fd9d9de8a6c658f444a0d5cabbdbbf43b34f0"

 BRANCH = "${FAULT_MANAGEMENT_GIT_BRANCH}"
 SRC_URI = "${FAULT_MANAGEMENT_GIT_URI};destsuffix=${FAULT_MANAGEMENT_GIT_DESTSUFFIX};protocol=${FAULT_MANAGEMENT_GIT_PROTOCOL};branch=${BRANCH}"

 SRCREV = "${FAULT_MANAGEMENT_SRCREV}"
-PV = "01.00.01.04A"
+PV = "01.00.01.04"
 PR = "r0"

 S = "${WORKDIR}/${FAULT_MANAGEMENT_GIT_DESTSUFFIX}"
--- a/recipes-bsp/fftc-lld/fftc-lld-rtos_git.bb
+++ b/recipes-bsp/fftc-lld/fftc-lld-rtos_git.bb
@@ -1,10 +1,6 @@
 SUMMARY = "TI FFT Coprocessor (FFTC) low level driver "

-inherit ti-pdk ti-pdk-fetch
-
-TI_PDK_COMP = "ti.drv.fftc"
-
-PE = "1"
+inherit ti-pdk

 LICENSE = "BSD-3-Clause"
 LIC_FILES_CHKSUM = "file://fftc.h;beginline=1;endline=39;md5=2f1010c47d364414644caf6d30a2b7df"
@@ -12,8 +8,24 @@ LIC_FILES_CHKSUM = "file://fftc.h;beginline=1;endline=39;md5=2f1010c47d364414644
 COMPATIBLE_MACHINE = "k2hk|k2l"
 PACKAGE_ARCH = "${MACHINE_ARCH}"

+FFTC_LLD_GIT_URI = "git://git.ti.com/keystone-rtos/fftc-lld.git"
+FFTC_LLD_GIT_PROTOCOL = "git"
+FFTC_LLD_GIT_BRANCH = "master"
+FFTC_LLD_GIT_DESTSUFFIX = "git/ti/drv/fftc"
+
+# Below commit ID corresponds to "DEV.FFTC_LLD.02.02.00.07A"
+FFTC_LLD_SRCREV = "7d3b64f42d190260f873b0e6d16489c65ef820b1"
+
+BRANCH = "${FFTC_LLD_GIT_BRANCH}"
+SRC_URI = "${FFTC_LLD_GIT_URI};destsuffix=${FFTC_LLD_GIT_DESTSUFFIX};protocol=${FFTC_LLD_GIT_PROTOCOL};branch=${BRANCH}"
+
+SRCREV = "${FFTC_LLD_SRCREV}"
+PV = "02.02.00.07A"
 PR = "r0"

+S = "${WORKDIR}/${FFTC_LLD_GIT_DESTSUFFIX}"
+
+
 DEPENDS_append= " qmss-lld-rtos \
                  cppi-lld-rtos \
 "
--- a/Show More
+++ b/Show More