Revert "wic: create SD card with 3 partitions for testing"

This reverts commit 6bca11098b.
README: update branch for zeus
2026-01-12 01:20:20 +00:00 · 2020-05-09 01:56:05 +00:00 · 2020-04-29 20:24:08 +00:00 · 2020-04-16 21:48:33 +00:00 · 2020-04-16 21:48:16 +00:00 · 2020-04-16 19:40:40 +00:00
265 changed files with 1483 additions and 3175 deletions
--- a/14
+++ b/14
@@ -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: zeus


 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

-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,12 +1,11 @@
-TI_PDK_GIT_URI ?= "git://git.ti.com/git/processor-sdk/pdk.git"
+TI_PDK_GIT_URI ?= "git://git.ti.com/processor-sdk/pdk.git"
 TI_PDK_GIT_BRANCH ?= "master"
-TI_PDK_GIT_PROTOCOL ?= "https"
-TI_PDK_SRCREV ?= "a1ace885998e9adbcbbd0abf8b9ded6ba9ec54ff"
+TI_PDK_GIT_PROTOCOL ?= "git"
+TI_PDK_SRCREV ?= "9c04a8f4ac2ed95100ee50163b3189d28b9680f1"

-TI_PDK_VERSION ?= "2020.5.6"
+TI_PDK_VERSION ?= "2020.4.16"

 PV = "${TI_PDK_VERSION}"
-PE = "2"

 TI_PDK_COMP ?= ""
 TI_PDK_COMP_PATH = "${@'${TI_PDK_COMP}'.replace('.','/')}"
@@ -15,7 +14,7 @@ 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('/')}"
+S = "${WORKDIR}/git/${TI_PDK_COMP_PATH}"

 # Hard-link only required sources from PDK
 python do_unpack_append() {
--- a/classes/ti-pdk.bbclass
+++ b/classes/ti-pdk.bbclass
@@ -3,16 +3,16 @@ 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_remove_am65xx = "gcc-arm-none-eabi-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_j7-evm = "gcc-arm-none-eabi-native"
+DEPENDS_append_j7-evm = " ti-cgt-arm-native gcc-linaro-baremetal-aarch64-native ti-cgt7x-native"

 S = "${WORKDIR}/git"
 B = "${WORKDIR}/build"
--- 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,14 +8,11 @@ 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 warrior zeus"

 LICENSE_PATH += "${LAYERDIR}/licenses"

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

 SIGGEN_EXCLUDERECIPES_ABISAFE += " \
    ti-sgx-ddk-km \
--- 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
@@ -13,19 +13,18 @@ KERNEL_DEVICETREE = " \
    am57xx-beagle-x15-revb1.dtb \
    am57xx-beagle-x15-revc.dtb \
    am5729-beagleboneai.dtb \
-    ${@oe.utils.conditional('ARAGO_BRAND', 'mainline', '', 'am57xx-evm.dtb', d)} \
-    ti/am57xx-evm-common.dtbo \
-    ${@oe.utils.conditional('ARAGO_BRAND', 'mainline', '', 'am57xx-evm-reva3.dtb', d)} \
-    ti/am57xx-evm-reva3.dtbo \
+    am57xx-evm.dtb \
+    am57xx-evm-cam-ov10635.dtb \
+    am57xx-evm-reva3.dtb \
+    am57xx-evm-reva3-cam-ov10635.dtb \
    am571x-idk.dtb \
-    ti/am571x-idk-touchscreen.dtbo \
+    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 \
-    ti/am57xx-idk-osd-lcd-common.dtbo \
-    ti/am572x-idk-touchscreen.dtbo \
-    ti/lcd-osd101t2587.dtbo \
-    ti/lcd-osd101t2045.dtbo \
-    ${@oe.utils.conditional('ARAGO_BRAND', 'mainline', '', 'ti/ov10635.dtbo', d)} \
+    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,16 +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 \
-    ti/k3-am625-skeleton.dtb \
-    ti/k3-am625-sk-lpmdemo.dtb \
-    ti/k3-am625-sk-csi2-ov5640.dtbo \
-"
-
-UBOOT_MACHINE = "am62x_evm_a53_defconfig"
--- a/conf/machine/am62xx-lp-evm-k3r5.conf
+++ b/conf/machine/am62xx-lp-evm-k3r5.conf
@@ -1,11 +0,0 @@
-#@TYPE: Machine
-#@NAME: AM62XX LP EVM (R5F)
-#@DESCRIPTION: Machine configuration for the TI AM62xx LP EVM (R5F core)
-
-require conf/machine/include/k3r5.inc
-
-SYSFW_SOC = "am62x"
-SYSFW_CONFIG = "evm"
-SYSFW_SUFFIX = "gp"
-
-UBOOT_MACHINE = "am62x_lpsk_r5_defconfig"
--- a/conf/machine/am62xx-lp-evm.conf
+++ b/conf/machine/am62xx-lp-evm.conf
@@ -1,16 +0,0 @@
-#@TYPE: Machine
-#@NAME: AM62XX LP EVM
-#@DESCRIPTION: Machine configuration for the TI AM62XX LP EVM
-
-require conf/machine/include/am62xx.inc
-
-MACHINE_FEATURES += "gpu"
-
-KERNEL_DEVICETREE = " \
-    ti/k3-am62x-lp-sk.dtb \
-    ti/k3-am625-skeleton.dtb \
-    ti/k3-am625-sk-lpmdemo.dtb \
-    ti/k3-am625-sk-csi2-ov5640.dtbo \
-"
-
-UBOOT_MACHINE = "am62x_lpsk_a53_defconfig"
--- a/conf/machine/am64xx-evm-k3r5-gp.conf
+++ b/conf/machine/am64xx-evm-k3r5-gp.conf
@@ -1,20 +0,0 @@
-#@TYPE: Machine
-#@NAME: AM64xx GP EVM (R5F)
-#@DESCRIPTION: Machine configuration for the TI AM64xx GP EVM (R5F core)
-
-# Booting GP requires different SYSFW, the rest is handled at runtime
-
-require conf/machine/include/k3r5.inc
-SOC_FAMILY_append = ":k3r5-gp"
-
-SYSFW_SOC = "am64x"
-SYSFW_CONFIG = "evm"
-SYSFW_SUFFIX = "gp"
-SYSFW_TIBOOT3_SYMLINK = ""
-
-UBOOT_MACHINE = "am64x_evm_r5_defconfig"
-
-SPL_BINARY = ""
-UBOOT_BINARY = "u-boot-spl.${UBOOT_SUFFIX}"
-UBOOT_IMAGE = "u-boot-r5spl-gp-${MAINMACHINE}-${PV}-${PR}.${UBOOT_SUFFIX}"
-UBOOT_SYMLINK = "u-boot-r5spl-gp.${UBOOT_SUFFIX}"
--- a/conf/machine/am64xx-evm-k3r5-sr2-hs-fs.conf
+++ b/conf/machine/am64xx-evm-k3r5-sr2-hs-fs.conf
@@ -1,14 +0,0 @@
-#@TYPE: Machine
-#@NAME: AM64xx SR2.0 HS-FS EVM (R5F)
-#@DESCRIPTION: Machine configuration for the TI AM64xx SR2.0 HS-FS EVM (R5F core)
-
-# Booting SR2.0 HS-FS requires different SYSFW, the rest is handled at runtime
-
-require conf/machine/include/k3r5.inc
-SOC_FAMILY_append = ":k3r5-sr2-hs-fs"
-
-SYSFW_SOC = "am64x_sr2"
-SYSFW_CONFIG = "evm"
-SYSFW_SUFFIX = "hs-fs"
-
-UBOOT_MACHINE = "am64x_evm_r5_defconfig"
--- a/conf/machine/am64xx-evm-k3r5-sr2-hs-se.conf
+++ b/conf/machine/am64xx-evm-k3r5-sr2-hs-se.conf
@@ -1,20 +0,0 @@
-#@TYPE: Machine
-#@NAME: AM64xx SR2.0 HS-SE EVM (R5F)
-#@DESCRIPTION: Machine configuration for the TI AM64xx SR2.0 HS-SE EVM (R5F core)
-
-# Booting SR2.0 HS-SE requires different SYSFW, the rest is handled at runtime
-
-require conf/machine/include/k3r5.inc
-SOC_FAMILY_append = ":k3r5-sr2-hs-se"
-
-SYSFW_SOC = "am64x_sr2"
-SYSFW_CONFIG = "evm"
-SYSFW_SUFFIX = "hs"
-SYSFW_TIBOOT3_SYMLINK = ""
-
-UBOOT_MACHINE = "am64x_evm_r5_defconfig"
-
-SPL_BINARY = ""
-UBOOT_BINARY = "u-boot-spl.${UBOOT_SUFFIX}"
-UBOOT_IMAGE = "u-boot-r5spl-sr2-hs-se-${MAINMACHINE}-${PV}-${PR}.${UBOOT_SUFFIX}"
-UBOOT_SYMLINK = "u-boot-r5spl-sr2-hs-se.${UBOOT_SUFFIX}"
--- 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/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,18 +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 = ""
-
-SPL_BINARY = "spl/u-boot-spl.${UBOOT_SUFFIX}"
-SPL_SYMLINK = "u-boot-r5spl.${UBOOT_SUFFIX}"
-UBOOT_BINARY = "tiboot3.${UBOOT_SUFFIX}"
-UBOOT_IMAGE = "tiboot3-${MAINMACHINE}-${PV}-${PR}.${UBOOT_SUFFIX}"
-UBOOT_SYMLINK = "tiboot3-${MAINMACHINE}.${UBOOT_SUFFIX}"
-
-UBOOT_MACHINE = "am65x_evm_r5_defconfig"
--- a/conf/machine/am65xx-evm.conf
+++ b/conf/machine/am65xx-evm.conf
@@ -4,4 +4,22 @@

 require conf/machine/include/am65xx.inc

+MACHINE_FEATURES += "touchscreen"
+
+SERIAL_CONSOLES = "115200;ttyS2 115200;ttyS1"
+SERIAL_CONSOLES_CHECK = "${SERIAL_CONSOLES}"
+
+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-oldi-lcd1evm.dtbo ti/k3-am654-evm-tc358876.dtbo \
+    ti/k3-am654-pcie-usb2.dtbo ti/k3-am654-pcie-usb3.dtbo \
+    ti/k3-am654-base-board-jailhouse.dtbo \
+    ti/k3-am654-evm-prupwm.dtbo \
+"
+
 UBOOT_MACHINE = "am65x_evm_a53_defconfig"
+
+OPTEEMACHINE = "k3"
+OPTEEFLAVOR = "am65x"
+OPTEEOUTPUTMACHINE = "k3"
--- 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,18 +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 = ""
-
-SPL_BINARY = "spl/u-boot-spl.${UBOOT_SUFFIX}"
-SPL_SYMLINK = "u-boot-r5spl.${UBOOT_SUFFIX}"
-UBOOT_BINARY = "tiboot3.${UBOOT_SUFFIX}"
-UBOOT_IMAGE = "tiboot3-${MAINMACHINE}-${PV}-${PR}.${UBOOT_SUFFIX}"
-UBOOT_SYMLINK = "tiboot3-${MAINMACHINE}.${UBOOT_SUFFIX}"
-
-UBOOT_MACHINE = "am65x_hs_evm_r5_defconfig"
--- a/conf/machine/am65xx-hs-evm.conf
+++ b/conf/machine/am65xx-hs-evm.conf
@@ -2,7 +2,7 @@
 #@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"

@@ -15,5 +15,12 @@ UBOOT_DTBO_LOADADDRESS = "0x83080000"
 UBOOT_DTBO_OFFSET =      "0x00010000"

 SPL_BINARY = "tispl.bin_HS"
+SPL_BINARYNAME = "tispl.bin"
 UBOOT_BINARY = "u-boot.img_HS"
-UBOOT_SYMLINK = "u-boot.img"
+IMAGE_BOOT_FILES = "${UBOOT_BINARY}"
+
+TI_SECURE_DEV_PKG = "${TI_SECURE_DEV_PKG_K3}"
+
+OPTEEMACHINE = "k3"
+OPTEEFLAVOR = "am65x"
+OPTEEOUTPUTMACHINE = "k3"
--- a/conf/machine/dra7xx-evm.conf
+++ b/conf/machine/dra7xx-evm.conf
@@ -10,18 +10,19 @@ SERIAL_CONSOLES = "115200;ttyS0"

 KERNEL_DEVICETREE = " \
    dra7-evm.dtb \
-    ti/dra7x-evm-osd-lcd-common.dtbo \
+    dra7-evm-lcd-osd101t2045.dtb \
+    dra7-evm-lcd-osd101t2587.dtb \
    dra71-evm.dtb \
-    ${@oe.utils.conditional('ARAGO_BRAND', 'mainline', '', 'dra71-evm-nand.dtb', d)} \
-    ti/dra71-evm-lcd-auo-g101evn01.0.dtbo \
+    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 \
-    ti/dra72-evm-touchscreen.dtbo \
-    ti/dra74-evm-touchscreen.dtbo \
+    dra72-evm-revc-lcd-osd101t2045.dtb \
+    dra72-evm-revc-lcd-osd101t2587.dtb \
    dra76-evm.dtb \
-    ti/dra76-evm-tfp410.dtbo \
-    ti/lcd-osd101t2045.dtbo \
-    ti/lcd-osd101t2587.dtbo \
+    dra76-evm-tfp410.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,16 +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}"
-
-TFA_K3_SYSTEM_SUSPEND = "1"
-
-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-am62x"
-OPTEEOUTPUTMACHINE = "k3"
--- a/conf/machine/include/am64xx.inc
+++ b/conf/machine/include/am64xx.inc
@@ -1,41 +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-icssg1-dualemac-mii.dtbo \
-    ti/k3-am642-evm-nand.dtbo \
-"
-
-# Default tiboot3.bin on AM64x is for SR2.0 HS-FS
-BBMULTICONFIG = "k3r5-sr2-hs-fs"
-do_image_wic[mcdepends] = "mc::k3r5-sr2-hs-fs:ti-sci-fw:do_deploy"
-do_image_tar[mcdepends] = "mc::k3r5-sr2-hs-fs:ti-sci-fw:do_deploy"
-
-# Since default tiboot3.bin on AM64x is for SR2.0 HS-FS, add a version for GP
-BBMULTICONFIG += "k3r5-gp"
-IMAGE_BOOT_FILES += " tiboot3-am64x-gp-evm.bin"
-do_image_wic[mcdepends] += "mc::k3r5-gp:ti-sci-fw:do_deploy"
-do_image_tar[mcdepends] += "mc::k3r5-gp:ti-sci-fw:do_deploy"
-
-# Since default tiboot3.bin on AM64x is for SR2.0 HS-FS, add a version for SR2.0 HS-SE
-BBMULTICONFIG += "k3r5-sr2-hs-se"
-IMAGE_BOOT_FILES += " tiboot3-am64x_sr2-hs-evm.bin"
-do_image_wic[mcdepends] += "mc::k3r5-sr2-hs-se:ti-sci-fw:do_deploy"
-do_image_tar[mcdepends] += "mc::k3r5-sr2-hs-se:ti-sci-fw:do_deploy"
-
-TFA_BOARD = "lite"
-OPTEEMACHINE = "k3-am64x"
-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,39 +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"
-
-# Since J721e does not support multi-cert tiboot3.bin add standalone sysfw.itb
-IMAGE_BOOT_FILES += "sysfw.itb"
-
-# 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,10 +0,0 @@
-require conf/machine/include/k3.inc
-SOC_FAMILY_append = ":j7"
-
-OPTEEMACHINE = "k3-j721e"
-OPTEEOUTPUTMACHINE = "k3"
-
-# 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,35 +1,27 @@
-# 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"

 KERNEL_IMAGETYPE = "Image"
-KERNEL_IMAGETYPES = "Image vmlinux.gz fitImage"
+KERNEL_IMAGETYPES = "Image vmlinux.gz"

 UBOOT_ARCH = "arm"
 UBOOT_ENTRYPOINT = "0x80008000"
 UBOOT_LOADADDRESS = "0x80008000"

 SPL_BINARY = "tispl.bin"
-SPL_BINARYNAME = "tispl.bin"
 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
@@ -37,15 +29,14 @@ 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"
+MACHINE_FEATURES = "kernel26 apm usbgadget usbhost vfat ext2 screen alsa ethernet pci gpu"
+# Not ready yet - dsp mmip

-IMAGE_FSTYPES += "tar.xz wic.xz wic.bmap"
+IMAGE_FSTYPES += "tar.xz wic.xz"

-IMAGE_BOOT_FILES ?= "${SPL_BINARYNAME} u-boot.${UBOOT_SUFFIX} tiboot3.bin"
-
-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"
-
-TI_SECURE_DEV_PKG = "${TI_SECURE_DEV_PKG_K3}"
+# Please note that booting K3 platform also requires
+# tiboot3.bin and sysfw.itb, which are provided by meta-arago
+# u-boot-k3-r5 and ti-sci-fw recipes
+IMAGE_BOOT_FILES ?= "${SPL_BINARY} u-boot.${UBOOT_SUFFIX}"
+WKS_FILE ?= "sdimage-bootpart.wks"
+do_image_wic[depends] += "u-boot:do_deploy"
--- a/conf/machine/include/k3r5.inc
+++ b/conf/machine/include/k3r5.inc
@@ -1,26 +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 = "u-boot-spl.${UBOOT_SUFFIX}"
-UBOOT_IMAGE = "u-boot-r5spl-${MAINMACHINE}-${PV}-${PR}.${UBOOT_SUFFIX}"
-UBOOT_SYMLINK = "u-boot-r5spl.${UBOOT_SUFFIX}"
-
-PACKAGECONFIG_pn-u-boot-ti-staging = ""
-PACKAGECONFIG_pn-u-boot-ti-mainline = ""
-
-TI_SECURE_DEV_PKG = "${TI_SECURE_DEV_PKG_K3}"
--- 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"

@@ -49,7 +38,7 @@ 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}"
+IMAGE_FSTYPES += "tar.xz wic.xz"
+WKS_FILE ?= "sdimage-bootpart.wks"
+IMAGE_BOOT_FILES ?= "${SPL_BINARY} u-boot.${UBOOT_SUFFIX}"
 do_image_wic[depends] += "u-boot:do_deploy"
--- 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"

--- 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"

@@ -29,6 +29,7 @@ KERNEL_IMAGETYPE = "zImage"
 KERNEL_DEVICETREE = " \
    am335x-evm.dtb am335x-evmsk.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 \
@@ -43,15 +44,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,7 +51,7 @@ 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"
@@ -68,7 +60,7 @@ MACHINE_FEATURES = "kernel26 apm usbgadget usbhost vfat ext2 screen alsa etherne
 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"
+IMAGE_FSTYPES += "tar.xz wic.xz"
+WKS_FILE ?= "sdimage-bootpart.wks"
+IMAGE_BOOT_FILES ?= "${SPL_BINARY} u-boot.${UBOOT_SUFFIX}"
+do_image_wic[depends] += "u-boot:do_deploy"
--- a/conf/machine/include/ti43x.inc
+++ b/conf/machine/include/ti43x.inc
@@ -20,18 +20,16 @@ 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"

 KERNEL_IMAGETYPE = "zImage"

 KERNEL_DEVICETREE = " \
-    am437x-gp-evm.dtb \
-    ${@oe.utils.conditional('ARAGO_BRAND', 'mainline', '', 'am437x-gp-evm-hdmi.dtb', d)} \
+    am437x-gp-evm.dtb am437x-gp-evm-hdmi.dtb \
    am437x-sk-evm.dtb am437x-idk-evm.dtb \
-    am43x-epos-evm.dtb \
-    ${@oe.utils.conditional('ARAGO_BRAND', 'mainline', '', 'am43x-epos-evm-hdmi.dtb', d)} \
+    am43x-epos-evm.dtb am43x-epos-evm-hdmi.dtb \
 "

 KERNEL_DEVICETREE += "${@oe.utils.conditional('ENABLE_TI_UIO_DEVICES', '1', 'am437x-idk-pru-excl-uio.dtb', '', d)}"
@@ -42,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"

@@ -67,7 +56,7 @@ MACHINE_FEATURES = "kernel26 apm usbgadget usbhost vfat ext2 screen alsa etherne
 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}"
+IMAGE_FSTYPES += "tar.xz wic.xz"
+WKS_FILE ?= "sdimage-bootpart.wks"
+IMAGE_BOOT_FILES ?= "${SPL_BINARY} u-boot.${UBOOT_SUFFIX}"
 do_image_wic[depends] += "u-boot:do_deploy"
--- a/conf/machine/j7-evm-k3r5.conf
+++ b/conf/machine/j7-evm-k3r5.conf
@@ -1,17 +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"
-
-SPL_BINARY = "spl/u-boot-spl.${UBOOT_SUFFIX}"
-SPL_SYMLINK = "u-boot-r5spl.${UBOOT_SUFFIX}"
-UBOOT_BINARY = "tiboot3.${UBOOT_SUFFIX}"
-UBOOT_IMAGE = "tiboot3-${MAINMACHINE}-${PV}-${PR}.${UBOOT_SUFFIX}"
-UBOOT_SYMLINK = "tiboot3-${MAINMACHINE}.${UBOOT_SUFFIX}"
-
-UBOOT_MACHINE = "j721e_evm_r5_defconfig"
--- a/conf/machine/j7-evm.conf
+++ b/conf/machine/j7-evm.conf
@@ -2,21 +2,26 @@
 #@NAME: J7 EVM
 #@DESCRIPTION: Machine configuration for the TI J7 EVM

-require conf/machine/include/j7.inc
-
-MACHINE_FEATURES += "gpu"
+require conf/machine/include/k3.inc

 SERIAL_CONSOLES = "115200;ttyS2 115200;ttyS3"
 SERIAL_CONSOLES_CHECK = "${SERIAL_CONSOLES}"

-# Since J721e does not support multi-cert tiboot3.bin add standalone sysfw.itb
-IMAGE_BOOT_FILES += "sysfw.itb"
-
 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 \
+    ti/k3-j721e-pcie-backplane.dtbo \
+    ti/k3-j721e-common-proc-board-jailhouse.dtbo \
 "

 UBOOT_MACHINE = "j721e_evm_a72_config"
+
+OPTEEMACHINE = "k3"
+OPTEEFLAVOR = "j7"
+OPTEEOUTPUTMACHINE = "k3"
+
+# 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/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,18 +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"
-SYSFW_SYMLINK = ""
-
-SPL_BINARY = "spl/u-boot-spl.${UBOOT_SUFFIX}"
-SPL_SYMLINK = "u-boot-r5spl.${UBOOT_SUFFIX}"
-UBOOT_BINARY = "tiboot3.${UBOOT_SUFFIX}"
-UBOOT_IMAGE = "tiboot3-${MAINMACHINE}-${PV}-${PR}.${UBOOT_SUFFIX}"
-UBOOT_SYMLINK = "tiboot3-${MAINMACHINE}.${UBOOT_SUFFIX}"
-
-UBOOT_MACHINE = "j721e_hs_evm_r5_defconfig"
--- a/conf/machine/j7-hs-evm.conf
+++ b/conf/machine/j7-hs-evm.conf
@@ -1,27 +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"
-UBOOT_BINARY = "u-boot.img_HS"
-UBOOT_SYMLINK = "u-boot.img"
-SYSFW_SYMLINK = ""
-
-BBMULTICONFIG += "k3r5-sr1-1"
-
-# 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"
--- 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,17 +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"
-
-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,11 +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_sr2"
-SYSFW_CONFIG = "evm"
-SYSFW_SUFFIX = "hs"
-
-UBOOT_MACHINE = "j7200_hs_evm_r5_defconfig"
--- a/conf/machine/j7200-hs-evm.conf
+++ b/conf/machine/j7200-hs-evm.conf
@@ -1,19 +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"
-UBOOT_BINARY = "u-boot.img_HS"
-UBOOT_SYMLINK = "u-boot.img"
--- 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,23 +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;ttyS2"
-SERIAL_CONSOLES_CHECK = "${SERIAL_CONSOLES}"
-TFA_K3_USART = "0x8"
-OPTEEMACHINE = "k3-j784s4"
-OPTEE_K3_USART = "0x8"
-
-KERNEL_DEVICETREE = " \
-    ti/k3-j721s2-common-proc-board.dtb \
-    ti/k3-j721s2-gesi-exp-board.dtbo \
-"
-
-UBOOT_MACHINE = "j721s2_evm_a72_defconfig"
-
-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/j721s2-hs-evm-k3r5.conf
+++ b/conf/machine/j721s2-hs-evm-k3r5.conf
@@ -1,11 +0,0 @@
-#@TYPE: Machine
-#@NAME: J721S2 HS EVM (R5F)
-#@DESCRIPTION: Machine configuration for the TI J721S2 HS EVM (R5F core)
-
-require conf/machine/include/k3r5.inc
-
-SYSFW_SOC = "j721s2"
-SYSFW_CONFIG = "evm"
-SYSFW_SUFFIX = "hs"
-
-UBOOT_MACHINE = "j721s2_hs_evm_r5_defconfig"
--- a/conf/machine/j721s2-hs-evm.conf
+++ b/conf/machine/j721s2-hs-evm.conf
@@ -1,19 +0,0 @@
-#@TYPE: Machine
-#@NAME: J721S2 HS EVM
-#@DESCRIPTION: Machine configuration for the TI J721S2 HS EVM
-
-require conf/machine/j721s2-evm.conf
-
-UBOOT_MACHINE = "j721s2_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"
-UBOOT_BINARY = "u-boot.img_HS"
-UBOOT_SYMLINK = "u-boot.img"
--- a/conf/machine/j784s4-evm-k3r5.conf
+++ b/conf/machine/j784s4-evm-k3r5.conf
@@ -1,11 +0,0 @@
-#@TYPE: Machine
-#@NAME: J784S4 EVM (R5F)
-#@DESCRIPTION: Machine configuration for the TI J784S4 EVM (R5F core)
-
-require conf/machine/include/k3r5.inc
-
-SYSFW_SOC = "j784s4"
-SYSFW_CONFIG = "evm"
-SYSFW_SUFFIX = "gp"
-
-UBOOT_MACHINE = "j784s4_evm_r5_defconfig"
--- a/conf/machine/j784s4-evm.conf
+++ b/conf/machine/j784s4-evm.conf
@@ -1,25 +0,0 @@
-#@TYPE: Machine
-#@NAME: J784S4 EVM
-#@DESCRIPTION: Machine configuration for the TI J784S4 EVM
-
-require conf/machine/include/j7.inc
-
-MACHINE_FEATURES += "gpu"
-
-SERIAL_CONSOLES = "115200;ttyS2"
-SERIAL_CONSOLES_CHECK = "${SERIAL_CONSOLES}"
-TFA_K3_USART = "0x8"
-OPTEEMACHINE = "k3-j784s4"
-OPTEE_K3_USART = "0x8"
-
-KERNEL_DEVICETREE = " \
-    ti/k3-j784s4-evm.dtb \
-"
-
-UBOOT_MACHINE = "j784s4_evm_a72_defconfig"
-
-do_image_wic[mcdepends] = "mc::k3r5:ti-sci-fw:do_deploy"
-do_image_tar[mcdepends] = "mc::k3r5:ti-sci-fw:do_deploy"
-
-TFA_BOARD = "j784s4"
-
--- 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"
--- 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/multiconfig/k3r5-gp.conf
+++ b/conf/multiconfig/k3r5-gp.conf
@@ -1,3 +0,0 @@
-require k3r5.conf
-
-MACHINE_append = "-gp"
--- 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-hs-fs.conf
+++ b/conf/multiconfig/k3r5-sr2-hs-fs.conf
@@ -1,3 +0,0 @@
-require k3r5-sr2.conf
-
-MACHINE_append = "-hs-fs"
--- a/conf/multiconfig/k3r5-sr2-hs-se.conf
+++ b/conf/multiconfig/k3r5-sr2-hs-se.conf
@@ -1,3 +0,0 @@
-require k3r5-sr2.conf
-
-MACHINE_append = "-hs-se"
--- 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/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/abefw/abefw_1.0.14.bb
+++ b/recipes-bsp/abefw/abefw_1.0.14.bb
@@ -7,7 +7,7 @@ PACKAGE_ARCH = "${MACHINE_ARCH}"

 COMPATIBLE_MACHINE = "pandaboard|omap5-evm"

-SRC_URI = "git://git.ti.com/git/glsdk/abefw-omap4plus.git;protocol=https"
+SRC_URI = "git://git.ti.com/glsdk/abefw-omap4plus.git;protocol=git"

 S = "${WORKDIR}/git"

--- a/recipes-bsp/aif2-lld/aif2-lld_git.bb
+++ b/recipes-bsp/aif2-lld/aif2-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}/libaif2.a"
--- a/recipes-bsp/arm-trusted-firmware/arm-trusted-firmware_2.2.bb
+++ b/recipes-bsp/arm-trusted-firmware/arm-trusted-firmware_2.2.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://docs/license.rst;md5=189505435dbcdcc8caa63c46fe93fa89"
+
+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 ?= "e516a389ac12fbe1597f61fea80ed3f230b9c5fd"
+
+# 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/audk2g-addon/audk2g-addon-rtos_git.bb
+++ b/recipes-bsp/audk2g-addon/audk2g-addon-rtos_git.bb
@@ -8,8 +8,8 @@ LIC_FILES_CHKSUM = "file://audk2gaddonver.h;beginline=8;endline=47;md5=7a3996aaf
 COMPATIBLE_MACHINE = "k2g"
 PACKAGE_ARCH = "${MACHINE_ARCH}"

-AUDK2G_ADDON_GIT_URI = "git://git.ti.com/git/processor-sdk/audk2g-addon.git"
-AUDK2G_ADDON_GIT_PROTOCOL = "https"
+AUDK2G_ADDON_GIT_URI = "git://git.ti.com/processor-sdk/audk2g-addon.git"
+AUDK2G_ADDON_GIT_PROTOCOL = "git"
 AUDK2G_ADDON_GIT_BRANCH = "master"
 AUDK2G_ADDON_GIT_DESTSUFFIX = "git/ti/addon/audk2g"

--- a/recipes-bsp/board-rtos/board-rtos_git.bb
+++ b/recipes-bsp/board-rtos/board-rtos_git.bb
@@ -57,7 +57,7 @@ DEPENDS_append_dra7xx = " pm-lld-rtos \

 DEPENDS_append_am65xx = " sciclient-rtos \
 "
-DEPENDS_append_j7 = " udma-lld-rtos \
+DEPENDS_append_j7-evm = " udma-lld-rtos \
                          sciclient-rtos \
                          mmcsd-lld-rtos \
 "
--- a/recipes-bsp/boot-monitor/boot-monitor_git.bb
+++ b/recipes-bsp/boot-monitor/boot-monitor_git.bb
@@ -7,7 +7,7 @@ PACKAGE_ARCH = "${MACHINE_ARCH}"

 DEPENDS = "u-boot-mkimage-native"

-SRC_URI = "git://git.ti.com/git/processor-firmware/ks2-boot-monitor.git;protocol=https;branch=${BRANCH}"
+SRC_URI = "git://git.ti.com/processor-firmware/ks2-boot-monitor.git;protocol=git;branch=${BRANCH}"

 PV = "4.0+git${SRCPV}"

@@ -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/bt-fw/bt-fw_git.bb
+++ b/recipes-bsp/bt-fw/bt-fw_git.bb
@@ -8,7 +8,7 @@ CLEANBROKEN = "1"

 SRCREV = "0ee619b598d023fffc77679f099bc2a4815510e4"
 BRANCH = "master"
-SRC_URI = "git://git.ti.com/git/ti-bt/service-packs.git;protocol=https;branch=${BRANCH}"
+SRC_URI = "git://git.ti.com/ti-bt/service-packs.git;branch=${BRANCH}"

 S = "${WORKDIR}/git"

--- a/recipes-bsp/cadence-mhdp-fw/cadence-mhdp-fw_git.bb
+++ b/recipes-bsp/cadence-mhdp-fw/cadence-mhdp-fw_git.bb
@@ -1,19 +1,22 @@
 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"
+PV = "1.2.17"
+PR = "r0"

 CLEANBROKEN = "1"

-COMPATIBLE_MACHINE = "j7-evm|j7-hs-evm|j721s2-evm|j721s2-hs-evm|j784s4-evm"
+COMPATIBLE_MACHINE = "j7-evm"

 PACKAGE_ARCH = "${MACHINE_ARCH}"

+SRCREV = "7bad9a69a343e01056ece5ce6da4d4060c42f6bc"
+BRANCH ?= "ti-linux-firmware"
+
+SRC_URI = "git://git.ti.com/processor-firmware/ti-linux-firmware.git;protocol=git;branch=${BRANCH}"
+
 S = "${WORKDIR}/git"
 TARGET = "mhdp8546.bin"

--- a/recipes-bsp/cm3-pm-firmware/amx3-cm3_git.bb
+++ b/recipes-bsp/cm3-pm-firmware/amx3-cm3_git.bb
@@ -9,7 +9,7 @@ PR = "r0"
 SRCREV = "fb484c5e54f2e31cf0a338d2927a06a2870bcc2c"
 BRANCH ?= "ti-v4.1.y"

-SRC_URI = "git://git.ti.com/git/processor-firmware/ti-amx3-cm3-pm-firmware.git;protocol=https;branch=${BRANCH}"
+SRC_URI = "git://git.ti.com/processor-firmware/ti-amx3-cm3-pm-firmware.git;protocol=git;branch=${BRANCH}"

 S = "${WORKDIR}/git"

--- a/recipes-bsp/cmb-addon/cmb-addon-rtos_git.bb
+++ b/recipes-bsp/cmb-addon/cmb-addon-rtos_git.bb
@@ -9,8 +9,8 @@ COMPATIBLE_MACHINE = "k2g|omapl137-evm"

 PACKAGE_ARCH = "${MACHINE_ARCH}"

-CMB_ADDON_GIT_URI = "git://git.ti.com/git/processor-sdk/circmicarray-addon.git"
-CMB_ADDON_GIT_PROTOCOL = "https"
+CMB_ADDON_GIT_URI = "git://git.ti.com/processor-sdk/circmicarray-addon.git"
+CMB_ADDON_GIT_PROTOCOL = "git"
 CMB_ADDON_GIT_BRANCH = "master"
 CMB_ADDON_GIT_DESTSUFFIX = "git/ti/addon"

--- a/recipes-bsp/cmem/cmem.inc
+++ b/recipes-bsp/cmem/cmem.inc
@@ -4,12 +4,12 @@ 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/git/ipc/ludev.git;protocol=https;branch=${BRANCH}"
+SRC_URI = "git://git.ti.com/ipc/ludev.git;protocol=git;branch=${BRANCH}"

 S = "${WORKDIR}/git"
 COMPATIBLE_HOST ?= "null"
--- a/recipes-bsp/cnm-wave-fw/cnm-wave-fw_git.bb
+++ b/recipes-bsp/cnm-wave-fw/cnm-wave-fw_git.bb
@@ -1,46 +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|j721s2-hs-evm|j784s4-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"
-SOURCE_WAVE521C_j721s2-hs-evm = "wave521c_j721s2_codec_fw.bin"
-SOURCE_WAVE521C_j784s4-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"
--- a/recipes-bsp/common-csl-ip/common-csl-ip.inc
+++ b/recipes-bsp/common-csl-ip/common-csl-ip.inc
@@ -6,15 +6,15 @@ COMPATIBLE_MACHINE = "keystone|dra7xx|ti33x|ti43x|omapl1"

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

-CSL_GIT_URI = "git://git.ti.com/git/keystone-rtos/common-csl-ip.git"
-CSL_GIT_PROTOCOL ="https"
+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"
+CSL_SRCREV = "a5a9200fe11575a4eff965d87cb968c5f3377e9f"

 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.inc
+++ b/recipes-bsp/cppi-lld/cppi-lld.inc
@@ -16,4 +16,4 @@ DEVICELIST = "k2h k2k k2l k2e"
 DEVICELIST_k2hk = "k2h k2k"
 DEVICELIST_k2l  = "k2l"
 DEVICELIST_k2e  = "k2e"
-DEVICELIST_k2g  = "k2h"
+
--- 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
@@ -9,11 +9,11 @@ PACKAGE_ARCH = "${MACHINE_ARCH}"
 inherit deploy
 inherit update-alternatives

-PROTOCOL = "https"
+PROTOCOL = "git"
 BRANCH = "master"
-SRCREV = "91f1628507bf7f8716f0bc7cafe88ad7f14c94f5"
+SRCREV = "4da71504488450f34d65459c1de949da1f984471"

-SRC_URI = "git://git.ti.com/git/glsdk/ti-eth-fw.git;protocol=${PROTOCOL};branch=${BRANCH}"
+SRC_URI = "git://git.ti.com/glsdk/ti-eth-fw.git;protocol=${PROTOCOL};branch=${BRANCH}"

 S = "${WORKDIR}/git"

--- 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,14 +1,10 @@
-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/git/glsdk/dspdce.git;protocol=https"
+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,8 +1,8 @@
 # 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/git/sdo-emu/dsptop.git;protocol=https;branch=${BRANCH}"
+SRC_URI = "git://git.ti.com/sdo-emu/dsptop.git;protocol=git;branch=${BRANCH}"

 BRANCH = "master"
--- 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
@@ -2,8 +2,8 @@ DESCRIPTION = "TI EDMA3 low level driver and test code"
 LICENSE = "BSD-3-Clause"
 LIC_FILES_CHKSUM = "file://COPYING.txt;md5=5bdceac872dffdec915b819654ee23ea"

-EDMA3_LLD_GIT_URI = "git://git.ti.com/git/keystone-rtos/edma3_lld.git"
-EDMA3_LLD_GIT_PROTOCOL = "https"
+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
--- a/recipes-bsp/faultmanagement/faultmanagement-rtos_git.bb
+++ b/recipes-bsp/faultmanagement/faultmanagement-rtos_git.bb
@@ -8,8 +8,8 @@ LIC_FILES_CHKSUM = "file://fault_mgmt.h;beginline=1;endline=41;md5=4be5df2b9c314
 COMPATIBLE_MACHINE = "k2hk|k2e|k2l"
 PACKAGE_ARCH = "${MACHINE_ARCH}"

-FAULT_MANAGEMENT_GIT_URI = "git://git.ti.com/git/keystone-rtos/fault_mgmt.git"
-FAULT_MANAGEMENT_GIT_PROTOCOL = "https"
+FAULT_MANAGEMENT_GIT_URI = "git://git.ti.com/keystone-rtos/fault_mgmt.git"
+FAULT_MANAGEMENT_GIT_PROTOCOL = "git"
 FAULT_MANAGEMENT_GIT_BRANCH = "master"
 FAULT_MANAGEMENT_GIT_DESTSUFFIX = "git/ti/instrumentation/fault_mgmt"

--- a/recipes-bsp/fvid2/fvid2-rtos_git.bb
+++ b/recipes-bsp/fvid2/fvid2-rtos_git.bb
@@ -28,8 +28,9 @@ export PDK_FVID2_ROOT_PATH = "${FVID2_PACKAGE_BASE}/package/all/pdk_/packages"


 BOARD_PACKAGE = ""
-BOARD_PACKAGE_am65xx = "am65xx_evm"
-BOARD_PACKAGE_j7 = "j721e_evm"
+BOARD_PACKAGE_am65xx-evm = "am65xx_evm"
+BOARD_PACKAGE_am65xx-hs-evm = "am65xx_evm"
+BOARD_PACKAGE_j7-evm = "j721e_evm"

 # HTML doc link params
 PDK_COMP_LINK_TEXT = "FVID2"
--- 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
@@ -3,19 +3,17 @@ HOMEPAGE = "https://git.ti.com/graphics/ti-gc320-driver"
 LICENSE = "MIT | GPLv2"
 LIC_FILES_CHKSUM = "file://../LICENSE;md5=78d9818a51b9a8e9bb89dea418bac297"

-inherit module features_check
+inherit module

-REQUIRED_MACHINE_FEATURES = "gc320"
-
-MACHINE_KERNEL_PR_append = "i"
+MACHINE_KERNEL_PR_append = "h"
 PR = "${MACHINE_KERNEL_PR}"

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

-SRCREV = "e2a10f31e255a65ec30a6e10b890e77d7e9cb107"
+SRCREV = "2a4fbe8353fa56011a613aeeaf69e274cd07a825"

-SRC_URI = "git://git.ti.com/git/graphics/ti-gc320-driver.git;protocol=https;branch=${BRANCH}"
+SRC_URI = "git://git.ti.com/graphics/ti-gc320-driver.git;protocol=git;branch=${BRANCH}"

 S = "${WORKDIR}/git/src"

--- a/recipes-bsp/goodix-fw/goodix-fw_git.bb
+++ b/recipes-bsp/goodix-fw/goodix-fw_git.bb
@@ -1,12 +1,10 @@
 DESCRIPTION = "Goodix GT9271 config firmware"

-require recipes-bsp/ti-linux-fw/ti-linux-fw.inc
-
 LICENSE = "BSD-3-Clause"
 LIC_FILES_CHKSUM = "file://LICENCE.Spectrum-GT9271;md5=2a6de6be7af1fe46370c684daf27c852"

-PV = "${GOODIX_FW_VERSION}"
-PR = "${INC_PR}.0"
+PV = "1.0.0.0"
+PR = "r0"

 CLEANBROKEN = "1"

@@ -14,6 +12,11 @@ COMPATIBLE_MACHINE = "dra7xx"

 PACKAGE_ARCH = "${MACHINE_ARCH}"

+SRCREV = "f1a8d1d0131f83bd1a775cde7075eb67c070892c"
+BRANCH ?= "ti-linux-firmware"
+
+SRC_URI = "git://git.ti.com/processor-firmware/ti-linux-firmware.git;protocol=git;branch=${BRANCH}"
+
 S = "${WORKDIR}/git"
 ORIGIN = "DRA71x-RevA-GT9271_SpecDig_Config.bin"
 TARGET = "goodix_9271_cfg.bin"
--- a/recipes-bsp/hplib/hplib.inc
+++ b/recipes-bsp/hplib/hplib.inc
@@ -5,8 +5,8 @@ DEVICELIST_k2hk = "k2h k2k"
 DEVICELIST_k2l  = "k2l"
 DEVICELIST_k2e  = "k2e"

-HPLIB_GIT_URI = "git://git.ti.com/git/keystone-rtos/hplib.git"
-HPLIB_GIT_PROTOCOL = "https"
+HPLIB_GIT_URI = "git://git.ti.com/keystone-rtos/hplib.git"
+HPLIB_GIT_PROTOCOL = "git"
 HPLIB_GIT_BRANCH = "master"

 # Below Commit ID corresponds to "DEV.HPLIB.01.01.00.08"
--- a/recipes-bsp/hyplnk-lld/hyplnk-lld_git.bb
+++ b/recipes-bsp/hyplnk-lld/hyplnk-lld_git.bb
@@ -31,6 +31,3 @@ do_install () {
 	done
 	ln -sf libhyplnk_device.so.1 libhyplnk_device.so
 }
-
-INHIBIT_PACKAGE_STRIP_FILES_k2hk = "${PKGD}${libdir}/libhyplnk_k2h.a ${PKGD}${libdir}/libhyplnk_k2k.a"
-INHIBIT_PACKAGE_STRIP_FILES_k2e = "${PKGD}${libdir}/libhyplnk_k2e.a"
--- a/recipes-bsp/i2c-lld/i2c-lld-rtos_git.bb
+++ b/recipes-bsp/i2c-lld/i2c-lld-rtos_git.bb
@@ -29,7 +29,7 @@ DEPENDS_append_am57xx-evm = " pruss-lld-rtos \
 DEPENDS_append_k2g = " pruss-lld-rtos \
 "

-DEPENDS_append_j7 = " sciclient-rtos \
+DEPENDS_append_j7-evm = " sciclient-rtos \
 "

 # Build with make instead of XDC
--- a/recipes-bsp/ibl-boot/ibl-boot-rtos_git.bb
+++ b/recipes-bsp/ibl-boot/ibl-boot-rtos_git.bb
@@ -19,8 +19,8 @@ COMPATIBLE_MACHINE = "c66x"

 CLEANBROKEN = "1"

-IBL_BOOT_GIT_URI = "git://git.ti.com/git/keystone-rtos/ibl.git"
-IBL_BOOT_GIT_PROTOCOL = "https"
+IBL_BOOT_GIT_URI = "git://git.ti.com/keystone-rtos/ibl.git"
+IBL_BOOT_GIT_PROTOCOL = "git"
 IBL_BOOT_GIT_BRANCH = "master"
 IBL_BOOT_SRCREV = "ed3f0989d8cdc813b7ca1ed899c4d84b63de3a75"

--- a/recipes-bsp/icss-emac-lld/icss-emac-lld.inc
+++ b/recipes-bsp/icss-emac-lld/icss-emac-lld.inc
@@ -12,4 +12,3 @@ PE = "1"

 INC_PR = "r1"

-INHIBIT_PACKAGE_STRIP_FILES = "${PKGD}${libdir}/libicss_emac.a"
--- a/recipes-bsp/ipc-lld/ipc-lld-examples-rtos_git.bb
+++ b/recipes-bsp/ipc-lld/ipc-lld-examples-rtos_git.bb
@@ -16,7 +16,7 @@ LINUX_2_CORES_BAREMETAL_BIN_DIR = "${REMOTE_FW_DIR}/ex04_linux_baremetal_2core_e

 DST_BIN_PATH = "${base_libdir}/firmware/pdk-ipc"

-TI_PDK_LIMIT_BOARDS_j7 = "j721e_evm"
+TI_PDK_LIMIT_BOARDS_j7-evm = "j721e_evm"

 do_configure[noexec] = "1"

@@ -62,7 +62,7 @@ do_install() {
    done
 }

-do_install_append_j7() {
+do_install_append_j7-evm() {
    #copy ipc_echo_testb binaries for J721
    install -m 0644 ${REMOTE_FWB_BIN_DIR}/$board/ipc_echo_testb_mcu1_0_release.xer5f ${D}${DST_BIN_PATH}
    install -m 0644 ${REMOTE_FWB_BIN_DIR}/$board/ipc_echo_testb_mcu1_1_release.xer5f ${D}${DST_BIN_PATH}
@@ -79,7 +79,7 @@ do_install_append_j7() {
    install -m 0644 ${REMOTE_FWB_BIN_DIR}/$board/ipc_echo_testb_mcu3_1_release_strip.xer5f ${D}${DST_BIN_PATH}
 }

-do_install_append_am65xx() {
+do_install_append_am65xx-evm() {
    cp ${CP_ARGS} ${REMOTE_FW_DIR}/ex04_linux_baremetal_2core_echo_test/bin -d ${D}/ex04_linux_baremetal_2core_echo_test
 }

@@ -88,7 +88,7 @@ ALTERNATIVE_${PN}_am65xx = "\
                    am65x-mcu-r5f0_0-fw \
                    am65x-mcu-r5f0_1-fw \
                    "
-ALTERNATIVE_${PN}_j7 = "\
+ALTERNATIVE_${PN}_j7-evm = "\
                    j7-mcu-r5f0_0-fw \
                    j7-mcu-r5f0_1-fw \
                    j7-main-r5f0_0-fw \
@@ -105,15 +105,15 @@ ALTERNATIVE_${PN}_j7 = "\
 TARGET_MCU_R5FSS0_0_am65xx = "am65x-mcu-r5f0_0-fw"
 TARGET_MCU_R5FSS0_1_am65xx = "am65x-mcu-r5f0_1-fw"

-TARGET_MCU_R5FSS0_0_j7 = "j7-mcu-r5f0_0-fw"
-TARGET_MCU_R5FSS0_1_j7 = "j7-mcu-r5f0_1-fw"
-TARGET_MAIN_R5FSS0_0_j7 = "j7-main-r5f0_0-fw"
-TARGET_MAIN_R5FSS0_1_j7 = "j7-main-r5f0_1-fw"
-TARGET_MAIN_R5FSS1_0_j7 = "j7-main-r5f1_0-fw"
-TARGET_MAIN_R5FSS1_1_j7 = "j7-main-r5f1_1-fw"
-TARGET_C66_0_j7 = "j7-c66_0-fw"
-TARGET_C66_1_j7 = "j7-c66_1-fw"
-TARGET_C7X_0_j7 = "j7-c71_0-fw"
+TARGET_MCU_R5FSS0_0_j7-evm = "j7-mcu-r5f0_0-fw"
+TARGET_MCU_R5FSS0_1_j7-evm = "j7-mcu-r5f0_1-fw"
+TARGET_MAIN_R5FSS0_0_j7-evm = "j7-main-r5f0_0-fw"
+TARGET_MAIN_R5FSS0_1_j7-evm = "j7-main-r5f0_1-fw"
+TARGET_MAIN_R5FSS1_0_j7-evm = "j7-main-r5f1_0-fw"
+TARGET_MAIN_R5FSS1_1_j7-evm = "j7-main-r5f1_1-fw"
+TARGET_C66_0_j7-evm = "j7-c66_0-fw"
+TARGET_C66_1_j7-evm = "j7-c66_1-fw"
+TARGET_C7X_j7-evm = "j7-c71_0-fw"

 ALTERNATIVE_LINK_NAME[am65x-mcu-r5f0_0-fw] = "${base_libdir}/firmware/${TARGET_MCU_R5FSS0_0}"
 ALTERNATIVE_LINK_NAME[am65x-mcu-r5f0_1-fw] = "${base_libdir}/firmware/${TARGET_MCU_R5FSS0_1}"
@@ -126,7 +126,7 @@ ALTERNATIVE_LINK_NAME[j7-main-r5f1_0-fw] = "${base_libdir}/firmware/${TARGET_MAI
 ALTERNATIVE_LINK_NAME[j7-main-r5f1_1-fw] = "${base_libdir}/firmware/${TARGET_MAIN_R5FSS1_1}"
 ALTERNATIVE_LINK_NAME[j7-c66_0-fw] = "${base_libdir}/firmware/${TARGET_C66_0}"
 ALTERNATIVE_LINK_NAME[j7-c66_1-fw] = "${base_libdir}/firmware/${TARGET_C66_1}"
-ALTERNATIVE_LINK_NAME[j7-c71_0-fw] = "${base_libdir}/firmware/${TARGET_C7X_0}"
+ALTERNATIVE_LINK_NAME[j7-c71_0-fw] = "${base_libdir}/firmware/${TARGET_C7X}"

 # Create the firmware alternatives

--- a/recipes-bsp/ipc-lld/ipc-lld-fw_git.bb
+++ b/recipes-bsp/ipc-lld/ipc-lld-fw_git.bb
@@ -11,11 +11,11 @@ COMPATIBLE_MACHINE = "k3"
 PV = "1.0-git${SRCPV}"
 PACKAGE_ARCH = "${MACHINE_ARCH}"

-PROTOCOL = "https"
+PROTOCOL = "git"
 BRANCH = "master"
 SRCREV = "c9f7cfe61b67998a053fe145344ce0c9b5bb22aa"

-SRC_URI = "git://git.ti.com/git/keystone-rtos/ipc-lld.git;protocol=${PROTOCOL};branch=${BRANCH}"
+SRC_URI = "git://git.ti.com/keystone-rtos/ipc-lld.git;protocol=${PROTOCOL};branch=${BRANCH}"

 S = "${WORKDIR}/git"

@@ -23,7 +23,7 @@ AM65X_R5_FW_DIR = "${S}/examples/echo_test/binaries/am65xx"
 J721E_R5_DSP_FW_DIR = "${S}/examples/echo_test/binaries/j721e"

 PLATFORM_am65xx = "am65xx"
-PLATFORM_j7 = "j7-evm"
+PLATFORM_j7-evm = "j7-evm"

 # make sure that lib/firmware, and all its contents are part of the package
 FILES_${PN} += "${base_libdir}/firmware"
@@ -40,7 +40,7 @@ do_install_append_am65xx() {
    install -m 0644 ${AM65X_R5_FW_DIR}/ipc_echo_test_mcu1_1_release.strip.xer5f ${D}${base_libdir}/firmware/pdk-ipc/
 }

-do_install_append_j7() {
+do_install_append_j7-evm() {
    install -m 0644 ${J721E_R5_DSP_FW_DIR}/ipc_echo_test_mcu1_0_release.xer5f ${D}${base_libdir}/firmware/pdk-ipc/
    install -m 0644 ${J721E_R5_DSP_FW_DIR}/ipc_echo_test_mcu1_0_release.strip.xer5f ${D}${base_libdir}/firmware/pdk-ipc/
    install -m 0644 ${J721E_R5_DSP_FW_DIR}/ipc_echo_testb_mcu1_0_release.xer5f ${D}${base_libdir}/firmware/pdk-ipc/
@@ -78,7 +78,7 @@ ALTERNATIVE_${PN}_am65xx = "\
                    am65x-mcu-r5f0_0-fw \
                    am65x-mcu-r5f0_1-fw \
                    "
-ALTERNATIVE_${PN}_j7 = "\
+ALTERNATIVE_${PN}_j7-evm = "\
                    j7-mcu-r5f0_0-fw \
                    j7-mcu-r5f0_1-fw \
                    j7-main-r5f0_0-fw \
@@ -95,15 +95,15 @@ ALTERNATIVE_${PN}_j7 = "\
 TARGET_MCU_R5FSS0_0_am65xx = "am65x-mcu-r5f0_0-fw"
 TARGET_MCU_R5FSS0_1_am65xx = "am65x-mcu-r5f0_1-fw"

-TARGET_MCU_R5FSS0_0_j7 = "j7-mcu-r5f0_0-fw"
-TARGET_MCU_R5FSS0_1_j7 = "j7-mcu-r5f0_1-fw"
-TARGET_MAIN_R5FSS0_0_j7 = "j7-main-r5f0_0-fw"
-TARGET_MAIN_R5FSS0_1_j7 = "j7-main-r5f0_1-fw"
-TARGET_MAIN_R5FSS1_0_j7 = "j7-main-r5f1_0-fw"
-TARGET_MAIN_R5FSS1_1_j7 = "j7-main-r5f1_1-fw"
-TARGET_C66_0_j7 = "j7-c66_0-fw"
-TARGET_C66_1_j7 = "j7-c66_1-fw"
-TARGET_C7X_0_j7 = "j7-c71_0-fw"
+TARGET_MCU_R5FSS0_0_j7-evm = "j7-mcu-r5f0_0-fw"
+TARGET_MCU_R5FSS0_1_j7-evm = "j7-mcu-r5f0_1-fw"
+TARGET_MAIN_R5FSS0_0_j7-evm = "j7-main-r5f0_0-fw"
+TARGET_MAIN_R5FSS0_1_j7-evm = "j7-main-r5f0_1-fw"
+TARGET_MAIN_R5FSS1_0_j7-evm = "j7-main-r5f1_0-fw"
+TARGET_MAIN_R5FSS1_1_j7-evm = "j7-main-r5f1_1-fw"
+TARGET_C66_0_j7-evm = "j7-c66_0-fw"
+TARGET_C66_1_j7-evm = "j7-c66_1-fw"
+TARGET_C7X_j7-evm = "j7-c71_0-fw"

 ALTERNATIVE_LINK_NAME[am65x-mcu-r5f0_0-fw] = "${base_libdir}/firmware/${TARGET_MCU_R5FSS0_0}"
 ALTERNATIVE_LINK_NAME[am65x-mcu-r5f0_1-fw] = "${base_libdir}/firmware/${TARGET_MCU_R5FSS0_1}"
@@ -116,7 +116,7 @@ ALTERNATIVE_LINK_NAME[j7-main-r5f1_0-fw] = "${base_libdir}/firmware/${TARGET_MAI
 ALTERNATIVE_LINK_NAME[j7-main-r5f1_1-fw] = "${base_libdir}/firmware/${TARGET_MAIN_R5FSS1_1}"
 ALTERNATIVE_LINK_NAME[j7-c66_0-fw] = "${base_libdir}/firmware/${TARGET_C66_0}"
 ALTERNATIVE_LINK_NAME[j7-c66_1-fw] = "${base_libdir}/firmware/${TARGET_C66_1}"
-ALTERNATIVE_LINK_NAME[j7-c71_0-fw] = "${base_libdir}/firmware/${TARGET_C7X_0}"
+ALTERNATIVE_LINK_NAME[j7-c71_0-fw] = "${base_libdir}/firmware/${TARGET_C7X}"

 # Create the firmware alternatives

@@ -148,7 +148,7 @@ do_deploy_am65xx() {
    install ${AM65X_R5_FW_DIR}/ipc_echo_test_mcu1_1_release.strip.xer5f ${DEPLOYDIR}/
 }

-do_deploy_j7() {
+do_deploy_j7-evm() {
    install ${J721E_R5_DSP_FW_DIR}/ipc_echo_test_mcu1_0_release.xer5f ${DEPLOYDIR}/
    install ${J721E_R5_DSP_FW_DIR}/ipc_echo_test_mcu1_0_release.strip.xer5f ${DEPLOYDIR}/
    install ${J721E_R5_DSP_FW_DIR}/ipc_echo_testb_mcu1_0_release.xer5f ${DEPLOYDIR}/
--- a/recipes-bsp/ipumm-fw/ipumm-fw_git.bb
+++ b/recipes-bsp/ipumm-fw/ipumm-fw_git.bb
@@ -1,24 +1,28 @@
-SUMMARY = "Firmware for IPU to suppor Accelerated MM decode and encode"
+python __anonymous() {
+    features = d.getVar("MACHINE_FEATURES")
+    if not features:
+        return
+    if "mmip" not in features:
+        raise bb.parse.SkipPackage('ipumm-fw does not apply to systems without the "mmip" flag in MACHINE_FEATURES')
+}
+
+DESCRIPTION = "Firmware for IPU for supporting Accelerated MM decode and encode"
 LICENSE = "TI-TSPA"

 LIC_FILES_CHKSUM = "file://Texas_Instruments_ipumm_Manifest.pdf;md5=5cc572579f07af266ab57fc17d762c7f"

 COMPATIBLE_MACHINE = "dra7xx"

-inherit features_check
+RDEPENDS_${PN} = " libdce"

-REQUIRED_MACHINE_FEATURES = "mmip"
-
-RDEPENDS_${PN} = "libdce"
-
-SRC_URI = "git://git.ti.com/git/ivimm/ipumm.git;protocol=https"
+SRC_URI = "git://git.ti.com/ivimm/ipumm.git;protocol=git"

 SRCREV = "df4c50aecc9aad7ab3eb1ca9ebacfe473fcad7c5"

 S = "${WORKDIR}/git"

 PV = "3.00.15.00"
-PR = "r7"
+PR = "r5"

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

--- a/recipes-bsp/iqn2-lld/iqn2-lld_git.bb
+++ b/recipes-bsp/iqn2-lld/iqn2-lld_git.bb
@@ -21,5 +21,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}/libiqn2.a"
--- a/recipes-bsp/ivshmem-uio/ivshmem-uio-driver_git.bb
+++ b/recipes-bsp/ivshmem-uio/ivshmem-uio-driver_git.bb
@@ -0,0 +1,29 @@
+SUMMARY =  "Kernel driver for IVSHMEM based UIO driver"
+DESCRIPTION = "Kernel module which registers a UIO (userspace io) device for inter VM shared memory"
+HOMEPAGE = "https://github.com/henning-schild-work/ivshmem-guest-code"
+LICENSE = "GPLv2"
+LIC_FILES_CHKSUM = "file://COPYING;md5=0546a27aad86c83b75ad4ee6133e9d5e"
+
+inherit module
+
+RDEPENDS_${PN} = "jailhouse"
+
+PROTOCOL = "git"
+BRANCH = "jailhouse"
+SRCREV = "f3ad79881bebb6c6068966ee3d265d8034c20492"
+SRC_URI = "git://github.com/henning-schild-work/ivshmem-guest-code.git;protocol=${PROTOCOL};branch=${BRANCH}"
+
+S = "${WORKDIR}/git"
+
+EXTRA_OEMAKE += 'KDIR="${STAGING_KERNEL_DIR}"'
+
+COMPATIBLE_MACHINE = "(ti-soc)"
+
+do_compile_prepend() {
+    cd ${S}/kernel_module/uio
+}
+
+do_install() {
+    install -d ${D}/${base_libdir}/modules/${KERNEL_VERSION}/extra
+    install -m 644 ${S}/kernel_module/uio/uio_ivshmem.ko ${D}/${base_libdir}/modules/${KERNEL_VERSION}/extra
+}
--- a/recipes-bsp/ivshmem-uio/ivshmem-uio-tests_git.bb
+++ b/recipes-bsp/ivshmem-uio/ivshmem-uio-tests_git.bb
@@ -0,0 +1,23 @@
+SUMMARY =  "UIO tests for IVSHMEM based UIO driver"
+DESCRIPTION = "Test programs which use UIO (userspace io) device for inter VM communication"
+HOMEPAGE = "https://github.com/henning-schild-work/ivshmem-guest-code"
+LICENSE = "GPLv2"
+LIC_FILES_CHKSUM = "file://${WORKDIR}/git/COPYING;md5=0546a27aad86c83b75ad4ee6133e9d5e"
+
+inherit cmake
+
+PROTOCOL = "git"
+BRANCH = "jailhouse"
+SRCREV = "f3ad79881bebb6c6068966ee3d265d8034c20492"
+SRC_URI = "git://github.com/henning-schild-work/ivshmem-guest-code.git;protocol=${PROTOCOL};branch=${BRANCH}"
+
+S = "${WORKDIR}/git/uio/tests/Interrupts/VM"
+
+COMPATIBLE_MACHINE = "(ti-soc)"
+OECMAKE_TARGET_COMPILE = "uio_send uio_read"
+
+do_install() {
+    install -d ${D}/${bindir}
+    install -m 755 ${B}/uio_send ${D}/${bindir}/
+    install -m 755 ${B}/uio_read ${D}/${bindir}/
+}
--- a/recipes-bsp/mad-utils/mad-utils-rtos_git.bb
+++ b/recipes-bsp/mad-utils/mad-utils-rtos_git.bb
@@ -16,7 +16,7 @@ PACKAGE_ARCH = "${MACHINE_ARCH}"
 COMPATIBLE_MACHINE = "c66x"

 BRANCH = "master"
-SRC_URI = "git://git.ti.com/git/keystone-rtos/mad-utils.git;protocol=https;branch=${BRANCH}"
+SRC_URI = "git://git.ti.com/keystone-rtos/mad-utils.git;protocol=git;branch=${BRANCH}"
 SRCREV = "2458510f76eddfa837c2b83448965e233156944b"
 PR = "r0"

--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Denys Dmytriyenko	f6e024415b	Revert "wic: create SD card with 3 partitions for testing" This reverts commit `6bca11098b`.	2020-05-09 01:56:05 +00:00
Denys Dmytriyenko	1dd455890e	README: update branch for zeus Signed-off-by: Denys Dmytriyenko <denys@ti.com>	2020-04-29 20:24:08 +00:00
Mahesh Radhakrishnan	f5e88fe6f7	sa-lld: SRCREV update to 04.00.00.03D Signed-off-by: Denys Dmytriyenko <denys@ti.com>	2020-04-16 21:48:33 +00:00
Mahesh Radhakrishnan	0679930ac7	ti-pdk: SRCREV update Signed-off-by: Denys Dmytriyenko <denys@ti.com>	2020-04-16 21:48:16 +00:00
Mahesh Radhakrishnan	201ff65a04	common-csl-ip: SRCREV update to 03.03.00.17B Signed-off-by: Mahesh Radhakrishnan <m-radhakrishnan2@ti.com> Signed-off-by: Denys Dmytriyenko <denys@ti.com>	2020-04-16 19:40:40 +00:00
Mahesh Radhakrishnan	c52aa006ef	cmb-addon-rtos: SRCREV update to 01.01.00.03A Signed-off-by: Mahesh Radhakrishnan <m-radhakrishnan2@ti.com> Signed-off-by: Denys Dmytriyenko <denys@ti.com>	2020-04-16 19:40:35 +00:00
Mahesh Radhakrishnan	e593c48964	ti-pdk:SRCREV update to 2020.4.16 Signed-off-by: Mahesh Radhakrishnan <m-radhakrishnan2@ti.com> Signed-off-by: Denys Dmytriyenko <denys@ti.com>	2020-04-16 19:40:24 +00:00
Mahesh Radhakrishnan	010a8018f8	ti-pdk: SRCREV update to 2020.4.13 Signed-off-by: Mahesh Radhakrishnan <m-radhakrishnan2@ti.com> Signed-off-by: Denys Dmytriyenko <denys@ti.com>	2020-04-15 18:35:14 +00:00
Angela Stegmaier	9852e85866	ipc-lld: Update examples to build only select examples Full build of all examples is not needed. Update the recipe to build only selected examples. Signed-off-by: Angela Stegmaier <angelabaker@ti.com> Signed-off-by: Denys Dmytriyenko <denys@ti.com>	2020-04-15 18:22:07 +00:00
Mahesh Radhakrishnan	783139bb9c	starterware-inc: SRCREV update to 02.01.01.12A Signed-off-by: Mahesh Radhakrishnan <m-radhakrishnan2@ti.com> Signed-off-by: Denys Dmytriyenko <denys@ti.com>	2020-04-09 00:30:07 +00:00
Mahesh Radhakrishnan	849a5f9a1f	sa-lld:SRCREV update to 04.00.00.03C Signed-off-by: Mahesh Radhakrishnan <m-radhakrishnan2@ti.com> Signed-off-by: Denys Dmytriyenko <denys@ti.com>	2020-04-09 00:30:07 +00:00
Mahesh Radhakrishnan	30cb2ded13	pm-lld-rtos:SRCREV update to 01.08.00.23A Signed-off-by: Mahesh Radhakrishnan <m-radhakrishnan2@ti.com> Signed-off-by: Denys Dmytriyenko <denys@ti.com>	2020-04-09 00:30:05 +00:00
Mahesh Radhakrishnan	008ce88547	common-csl-ip:SRCREV update to 03.03.00.17A Signed-off-by: Mahesh Radhakrishnan <m-radhakrishnan2@ti.com> Signed-off-by: Denys Dmytriyenko <denys@ti.com>	2020-04-08 17:34:56 +00:00
Mahesh Radhakrishnan	1233c4f31a	ti-pdk:SRCREV update to 2020.4.5 Signed-off-by: Mahesh Radhakrishnan <m-radhakrishnan2@ti.com> Signed-off-by: Denys Dmytriyenko <denys@ti.com>	2020-04-08 17:33:18 +00:00
Denys Dmytriyenko	ea8787961e	linux-ti-staging: update to 5.4.28 Signed-off-by: Denys Dmytriyenko <denys@ti.com>	2020-04-04 01:10:39 +00:00
Denys Dmytriyenko	5f4ccac677	u-boot-ti-stgaging: update to the latest Signed-off-by: Denys Dmytriyenko <denys@ti.com>	2020-04-04 01:10:26 +00:00
Mahesh Radhakrishnan	fff95b597b	sciclient-rtos: Specifying HS_BUILD=yes for am65xx-hs-evm targets Signed-off-by: Mahesh Radhakrishnan <m-radhakrishnan2@ti.com> Signed-off-by: Denys Dmytriyenko <denys@ti.com>	2020-03-31 00:14:02 +00:00
Denys Dmytriyenko	6bca11098b	wic: create SD card with 3 partitions for testing Signed-off-by: Denys Dmytriyenko <denys@ti.com>	2020-03-19 21:48:45 +00:00
Denys Dmytriyenko	26265d5957	am57xx-evm, dra7xx-evm: re-add flattened DTBs for cam and lcd modules Signed-off-by: Denys Dmytriyenko <denys@ti.com>	2020-03-17 17:13:31 +00:00
Dan Murphy	26b37c6d37	linux-ti-staging: update to the ti2020.00-rc4 tag Signed-off-by: Dan Murphy <dmurphy@ti.com> Signed-off-by: Denys Dmytriyenko <denys@ti.com>	2020-03-17 15:55:00 +00:00
Dan Murphy	be8d05942c	uboot-ti-staging: update to ti2020.00-rc4 tag Signed-off-by: Dan Murphy <dmurphy@ti.com> Signed-off-by: Denys Dmytriyenko <denys@ti.com>	2020-03-17 15:54:52 +00:00
Nikhil Devshatwar	d111336a72	recipes-kernel: jailhouse: Update SRCREV to latest Signed-off-by: Nikhil Devshatwar <nikhil.nd@ti.com> Signed-off-by: Denys Dmytriyenko <denys@ti.com>	2020-03-17 15:53:22 +00:00
Angela Stegmaier	78b5c3bed3	ti-ipc: Update to new version 3.51.00.00A Signed-off-by: Angela Stegmaier <angelabaker@ti.com> Signed-off-by: Denys Dmytriyenko <denys@ti.com>	2020-03-16 19:10:32 +00:00
Gowtham Tammana	e876faa42b	ti-gc320-driver: Update srcrev to pick dma api fixes Update srcrev to pick the fixes for dma api crashes. Signed-off-by: Gowtham Tammana <g-tammana@ti.com> Signed-off-by: Denys Dmytriyenko <denys@ti.com>	2020-03-12 16:20:03 +00:00
Mahesh Radhakrishnan	96202061bd	sciclient-rtos: SRCREV update, adding steps to generate sysfw.bin Signed-off-by: Denys Dmytriyenko <denys@ti.com>	2020-03-10 21:04:06 +00:00
Nikhil Devshatwar	f4ea535d27	recipes-bsp: ivshmem-uio-tests: New recipe for ivshmem test apps uio_send and uio_read are the applications used for communication between different Virtual Machines using the ivshmem protocol. Signed-off-by: Nikhil Devshatwar <nikhil.nd@ti.com> Signed-off-by: Denys Dmytriyenko <denys@ti.com>	2020-03-06 18:30:54 +00:00
Tinku Mannan	5a62f194ca	nimu-icss: Adding k3 to COMPATIBLE_MACHINE list Signed-off-by: Denys Dmytriyenko <denys@ti.com>	2020-03-06 18:28:24 +00:00
Tinku Mannan	839bcddc1a	icss-emac-lld: Adding k3 to COMPATIBLE_MACHINE list Signed-off-by: Denys Dmytriyenko <denys@ti.com>	2020-03-06 18:27:55 +00:00
Nikhil Devshatwar	eeb453a3c2	conf: j7-evm: Update the secondary console for jailhouse Latest upstream jailhouse uses ttyS3 as console. Update the conf file so that this reflects correctly in the tiny rootfs. Signed-off-by: Nikhil Devshatwar <nikhil.nd@ti.com> Signed-off-by: Denys Dmytriyenko <denys@ti.com>	2020-03-05 04:59:44 +00:00
Nikhil Devshatwar	d9069bc3da	recipes-bsp: jailhouse: Update tty for j7-evm jailhouse Latest upstream jailhouse uses ttyS3 as the console for inmate cell. Update the recipe to pass the correct cmdline. Override only for j7-evm Signed-off-by: Nikhil Devshatwar <nikhil.nd@ti.com> Signed-off-by: Denys Dmytriyenko <denys@ti.com>	2020-03-05 04:59:44 +00:00
Dan Murphy	c1280a8ca2	linux-ti-staging: update to the ti2020.00-rc3 tag Signed-off-by: Dan Murphy <dmurphy@ti.com> Signed-off-by: Denys Dmytriyenko <denys@ti.com>	2020-03-05 04:59:41 +00:00
Dan Murphy	56799c57b8	uboot-ti-staging: update to ti2020.00-rc3 tag Signed-off-by: Dan Murphy <dmurphy@ti.com> Signed-off-by: Denys Dmytriyenko <denys@ti.com>	2020-03-05 04:59:31 +00:00
Mahesh Radhakrishnan	df00fe268b	ti-cgt-arm: Update to 18.12.5 The License checksum has changed due to version number change, but the license itself has not changed Signed-off-by: Mahesh Radhakrishnan <m-radhakrishnan2@ti.com> Signed-off-by: Denys Dmytriyenko <denys@ti.com>	2020-03-02 18:23:07 +00:00
Denys Dmytriyenko	e9ef9f510b	licenses: add Hewlett-Packard and Patrick-Powell licenses used by Code Gen tools Also correct ti-cgt-arm to not reference Hewlett-Packard, only Patrick-Powell, according to included SPDX document. Signed-off-by: Denys Dmytriyenko <denys@ti.com>	2020-02-27 21:09:50 +00:00
Denys Dmytriyenko	9d191db7b0	ti-cgt6x: remove deprecated versions Signed-off-by: Denys Dmytriyenko <denys@ti.com>	2020-02-27 21:09:38 +00:00
Denys Dmytriyenko	08123a9fb0	am65xx-evm: re-add k3-am654-evm-prupwm.dtbo Signed-off-by: Denys Dmytriyenko <denys@ti.com>	2020-02-25 22:33:19 +00:00
Nikhil Devshatwar	eea0072732	conf: j7-evm: Add jailhouse dtbo Signed-off-by: Nikhil Devshatwar <nikhil.nd@ti.com> Signed-off-by: Denys Dmytriyenko <denys@ti.com>	2020-02-25 22:14:06 +00:00
Dan Murphy	e274ba4a67	uboot-ti-staging: update to ti2020.00-rc2 tag Signed-off-by: Dan Murphy <dmurphy@ti.com> Signed-off-by: Denys Dmytriyenko <denys@ti.com>	2020-02-25 22:14:03 +00:00
Dan Murphy	84fe8a290d	linux-ti-staging: update to the ti2020.00-rc2 tag Signed-off-by: Dan Murphy <dmurphy@ti.com> Signed-off-by: Denys Dmytriyenko <denys@ti.com>	2020-02-25 22:13:51 +00:00
Nikhil Devshatwar	55fcbdfb96	recipes-kernel: jailhose: Update to 0.12 version Jailhouse 0.12 does not need to define custom config flags. Remove the steps to copy the config from do_configure task Signed-off-by: Nikhil Devshatwar <nikhil.nd@ti.com> Signed-off-by: Denys Dmytriyenko <denys@ti.com>	2020-02-25 04:38:39 +00:00
Angela Stegmaier	d35867f72e	board-rtos: Update dependencies for am65xx-evm Signed-off-by: Angela Stegmaier <angelabaker@ti.com> Signed-off-by: Denys Dmytriyenko <denys@ti.com>	2020-02-21 22:14:31 +00:00
Angela Stegmaier	382454a73c	common-csl-ip: bump SRCREV to align with PDK Signed-off-by: Angela Stegmaier <angelabaker@ti.com> Signed-off-by: Denys Dmytriyenko <denys@ti.com>	2020-02-21 22:14:21 +00:00
Angela Stegmaier	d3716d4607	ti-pdk-fetch: SRCREV udpate to 2020.2.20 Signed-off-by: Angela Stegmaier <angelabaker@ti.com> Signed-off-by: Denys Dmytriyenko <denys@ti.com>	2020-02-21 22:13:44 +00:00
Jacob Stiffler	b3cffb41cc	ti-cgt-arm: skip file-rdeps as this package is precompiled Signed-off-by: Jacob Stiffler <j-stiffler@ti.com> Signed-off-by: Denys Dmytriyenko <denys@ti.com>	2020-02-21 22:13:02 +00:00
Denys Dmytriyenko	161120dc1f	layer.conf: drop ti-ipc from SIGGEN_EXCLUDERECIPES_ABISAFE for now Signed-off-by: Denys Dmytriyenko <denys@ti.com>	2020-02-20 22:29:05 +00:00
Denys Dmytriyenko	541d62443c	vis: mark as compatible with dra7xx family Signed-off-by: Denys Dmytriyenko <denys@ti.com>	2020-02-20 22:29:01 +00:00
Denys Dmytriyenko	0944b5e1ce	omap-a15: add gc320 machine feature Signed-off-by: Denys Dmytriyenko <denys@ti.com>	2020-02-20 22:28:57 +00:00
Denys Dmytriyenko	186a97c3f1	sgx-um, rogue-umlibs, gc320-libs: RRECOMMENDS on corresponding drivers Signed-off-by: Denys Dmytriyenko <denys@ti.com>	2020-02-20 22:28:49 +00:00
Denys Dmytriyenko	7238e370bc	ion-tests: move back to meta-arago-extras As it happens, ion-tests requires gtest from by meta-oe, but meta-ti has no dependency on meta-oe. Unfortunately this was overlooked when all ion recipes were migrated to meta-ti. Fix this by moving just ion-tests back. Cc: Andrew F. Davis <afd@ti.com> Signed-off-by: Denys Dmytriyenko <denys@ti.com>	2020-02-20 16:20:30 +00:00
Angela Stegmaier	836f987926	ipc-lld: Update examples build target Update the build target from examples to apps. Signed-off-by: Angela Stegmaier <angelabaker@ti.com> Signed-off-by: Denys Dmytriyenko <denys@ti.com>	2020-02-20 02:49:59 +00:00
Mahesh Radhakrishnan	daaf30e62f	sciclient-rtos: Updating License checksum, along with the file it is calculated The license as such has not changed, but moved to a License file which is not expected to change frequently Signed-off-by: Denys Dmytriyenko <denys@ti.com>	2020-02-20 02:45:47 +00:00
Mahesh Radhakrishnan	f1112d5644	ti-pdk-fetch: SRCREV udpate to 2020.2.17 Signed-off-by: Denys Dmytriyenko <denys@ti.com>	2020-02-20 02:45:06 +00:00
Denys Dmytriyenko	19a73c96bd	k3conf: add diagnostic tool for K3 platforms Signed-off-by: Denys Dmytriyenko <denys@ti.com>	2020-02-17 21:05:03 +00:00
Denys Dmytriyenko	1e9dde5af9	multiprocmgr: update to latest, drop upstreamed patches Signed-off-by: Denys Dmytriyenko <denys@ti.com>	2020-02-17 18:25:44 +00:00
Denys Dmytriyenko	ff8621e0fa	j7-evm: add k3-j721e-pcie-backplane.dtbo Signed-off-by: Denys Dmytriyenko <denys@ti.com>	2020-02-17 18:25:40 +00:00
Denys Dmytriyenko	9cf16044d2	am57xx-evm: re-add am5729-beagleboneai.dtb Signed-off-by: Denys Dmytriyenko <denys@ti.com>	2020-02-17 18:25:36 +00:00
Dan Murphy via Lists.Yoctoproject.Org	a0e0028023	u-boot-ti-staging: Update for ti2020.01-rc tag Signed-off-by: Dan Murphy <dmurphy@ti.com> Signed-off-by: Denys Dmytriyenko <denys@ti.com>	2020-02-17 17:15:57 +00:00
Denys Dmytriyenko	35fb18a35f	gdbc6x: suppress gcc9 -Wstringop-truncation warning It's an old bfd/coff code, will need to be updated in the future. Signed-off-by: Denys Dmytriyenko <denys@ti.com>	2020-02-17 17:15:51 +00:00
Denys Dmytriyenko	a139fa4d47	linux-ti-staging: update to the latest Signed-off-by: Denys Dmytriyenko <denys@ti.com>	2020-02-15 04:05:41 +00:00
Gowtham Tammana	623b3bc87c	ti-sgx-ddk-km: Update srcrev to pick use preemption Update srcrev to pick the use preemption changes. Signed-off-by: Gowtham Tammana <g-tammana@ti.com> Signed-off-by: Denys Dmytriyenko <denys@ti.com>	2020-02-15 04:02:41 +00:00
Ramprasad N	77c0db27d9	ipumm: Update SRCREV with the vring fix for k5.1+ The following is the main change done: Use FW_RSC_ADDR_ANY for places where memory needs to be allocated dynamically like RSC_CARVEOUT and vdev resource entries Signed-off-by: Ramprasad N <x0038811@ti.com> Signed-off-by: Denys Dmytriyenko <denys@ti.com>	2020-02-15 04:02:03 +00:00
Gowtham Tammana	10655ece44	ti-sgx-ddk-km: Update srcrev for rtlinux build Update srcrev to pickup fix for rt linux build error. Signed-off-by: Gowtham Tammana <g-tammana@ti.com> Signed-off-by: Denys Dmytriyenko <denys@ti.com>	2020-02-13 21:55:49 +00:00
Gowtham Tammana	15306e387f	ti-gc320-driver: Update srcrev to pick rtlinux build fix Update srcrev to pick the fix for rt linux build issue. Signed-off-by: Gowtham Tammana <g-tammana@ti.com> Signed-off-by: Denys Dmytriyenko <denys@ti.com>	2020-02-13 19:22:58 +00:00
Andrew F. Davis	3ed79f3864	ti-sgx-ddk-km: Enable SGX driver for Beagleboard and Pandaboard These boards have SGX GPUs but do not build as this recipe is not compatible with them, add compatibles for these machines. Signed-off-by: Andrew F. Davis <afd@ti.com> Signed-off-by: Denys Dmytriyenko <denys@ti.com>	2020-02-13 18:32:58 +00:00
Andrew F. Davis	4d5aa867b9	ti-sgx-ddk-um: bump SRCREV for zeus support This also allows us to do two extra tasks so lets do them here: - Add support back for Beagleboard and Pandaboard - Remove plugins workaround as SO names are handled correctly now Signed-off-by: Andrew F. Davis <afd@ti.com> Signed-off-by: Denys Dmytriyenko <denys@ti.com>	2020-02-13 18:32:50 +00:00
Denys Dmytriyenko	0080cf2bac	conf/machine: add dependency for wic to package deployed SPL Signed-off-by: Denys Dmytriyenko <denys@ti.com>	2020-02-13 18:32:25 +00:00
Denys Dmytriyenko	8accc5bd44	multiprocmgr: swap SUMMARY and DESCRIPTION fields Signed-off-by: Denys Dmytriyenko <denys@ti.com>	2020-02-12 02:16:08 +00:00
Denys Dmytriyenko	e1303e71f9	multiprocmgr-test: also do not access kernel headers directly Signed-off-by: Denys Dmytriyenko <denys@ti.com>	2020-02-12 02:16:04 +00:00
Denys Dmytriyenko	cc5437d810	multiprocmgr: do not mix kernel and user-space headers, fully depend on uapi As multiprocmgr is a user-space app and should only use uapi headers, drop extra -I for the kernel headers. Patch out any assumptions of direct access to the kernel headers. Cc: Suman Anna <s-anna@ti.com> Cc: Sam Nelson <sam.nelson@ti.com> Signed-off-by: Denys Dmytriyenko <denys@ti.com>	2020-02-11 22:17:04 +00:00
Andrew F. Davis via Lists.Yoctoproject.Org	489d825af6	ti-sgx-ddk-km: Update branch for k5.4 sources Update the BRANCH and SRCREV to pick the sources for k5.4. Signed-off-by: Andrew F. Davis <afd@ti.com> Signed-off-by: Denys Dmytriyenko <denys@ti.com>	2020-02-11 17:15:14 +00:00
Denys Dmytriyenko	0498b5a5be	linux-ti-staging: update to the latest Signed-off-by: Denys Dmytriyenko <denys@ti.com>	2020-02-11 03:53:01 +00:00
Denys Dmytriyenko	cc33d4a57b	u-boot-ti-staging: update to the latest Signed-off-by: Denys Dmytriyenko <denys@ti.com>	2020-02-11 03:52:57 +00:00
Denys Dmytriyenko	340930513d	u-boot-ti: switch to Python3 Signed-off-by: Denys Dmytriyenko <denys@ti.com>	2020-02-11 01:15:22 +00:00
Khem Raj	53c5fef6d9	ti-cgt6x: Limit it to TI SOCs Helps meta-ti live in a multi-BSP distributions Signed-off-by: Khem Raj <raj.khem@gmail.com> Signed-off-by: Denys Dmytriyenko <denys@ti.com>	2020-02-11 01:14:08 +00:00
Denys Dmytriyenko	d6535f8385	conf/machine: generalize wic usage by moving settings to SOC files Signed-off-by: Denys Dmytriyenko <denys@ti.com>	2020-02-11 01:14:02 +00:00
Gowtham Tammana via Lists.Yoctoproject.Org	eac4b257d6	ti-gc320-driver: Update branch for k5.4 Update branch and srcrev for k5.4 support. Signed-off-by: Gowtham Tammana <g-tammana@ti.com> Signed-off-by: Denys Dmytriyenko <denys@ti.com>	2020-02-11 01:13:55 +00:00
Denys Dmytriyenko	0880c81d41	u-boot-ti-staging: update to the latest Signed-off-by: Denys Dmytriyenko <denys@ti.com>	2020-02-08 00:09:01 +00:00
Denys Dmytriyenko	bef7878fff	linux-ti-staging: update to 5.4.17 Signed-off-by: Denys Dmytriyenko <denys@ti.com>	2020-02-08 00:08:56 +00:00
Gowtham Tammana	4098d12b99	ti-img-rogue-umlibs: Update branch for zeus Update branch for zeus release. There is no change to srcrev. Signed-off-by: Gowtham Tammana <g-tammana@ti.com> Signed-off-by: Denys Dmytriyenko <denys@ti.com>	2020-02-08 00:08:42 +00:00
Gowtham Tammana	8c7ba576af	ti-img-rogue-driver: Update branch to pick k5.4 sources Update the branch id to pick the sources relevant to k5.4. Signed-off-by: Gowtham Tammana <g-tammana@ti.com> Signed-off-by: Denys Dmytriyenko <denys@ti.com>	2020-02-08 00:08:24 +00:00
Sam Nelson via Lists.Yoctoproject.Org	7c947a48a8	ti-ipc: Update to new version 3.51.00.00 Signed-off-by: Sam Nelson <sam.nelson@ti.com> Signed-off-by: Denys Dmytriyenko <denys@ti.com>	2020-02-07 21:19:00 +00:00
Angela Stegmaier via Lists.Yoctoproject.Org	631f2a14e0	ipc-lld: limit BOARDS list when building for j7-evm For now only j721e_evm is supported when building for j7-evm MACHINE target. Limit the BOARDS list in this case to what is supported. Signed-off-by: Angela Stegmaier <angelabaker@ti.com> Signed-off-by: Denys Dmytriyenko <denys@ti.com>	2020-02-07 21:19:00 +00:00