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

This reverts commit 6bca11098b.
README: update branch for zeus
2026-01-12 09:30:21 +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
115 changed files with 647 additions and 835 deletions
--- a/6
+++ b/6
@@ -8,7 +8,7 @@ This layer depends on:

 URI: git://git.openembedded.org/openembedded-core
 layers: meta
-branch: master
+branch: zeus


 The base BSP part of meta-ti should work with different OpenEmbedded/Yocto
@@ -18,9 +18,7 @@ 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

--- a/classes/ti-pdk-fetch.bbclass
+++ b/classes/ti-pdk-fetch.bbclass
@@ -1,12 +1,11 @@
 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 ?= "0d2591302b03ddae9a25300818e03345658b9083"
+TI_PDK_SRCREV ?= "9c04a8f4ac2ed95100ee50163b3189d28b9680f1"

-TI_PDK_VERSION ?= "07.00.00.34"
+TI_PDK_VERSION ?= "2020.4.16"

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

 TI_PDK_COMP ?= ""
 TI_PDK_COMP_PATH = "${@'${TI_PDK_COMP}'.replace('.','/')}"
--- a/classes/ti-pdk.bbclass
+++ b/classes/ti-pdk.bbclass
@@ -10,9 +10,9 @@ DEPENDS_remove_ti33x = "ti-cgt6x-native"
 DEPENDS_remove_ti43x = "ti-cgt6x-native"
 DEPENDS_append_omapl1 = " ti-cgt-arm-native"
 DEPENDS_remove_am65xx = "gcc-arm-none-eabi-native ti-cgt6x-native"
-DEPENDS_append_am65xx = " ti-cgt-arm-native gcc-aarch64-none-elf-native"
-DEPENDS_remove_j7 = "gcc-arm-none-eabi-native"
-DEPENDS_append_j7 = " ti-cgt-arm-native gcc-aarch64-none-elf-native ti-cgt7x-native"
+DEPENDS_append_am65xx = " ti-cgt-arm-native gcc-linaro-baremetal-aarch64-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
@@ -8,14 +8,11 @@ BBFILE_COLLECTIONS += "meta-ti"
 BBFILE_PATTERN_meta-ti := "^${LAYERDIR}/"
 BBFILE_PRIORITY_meta-ti = "6"

-LAYERSERIES_COMPAT_meta-ti = "sumo thud warrior zeus 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/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,10 +4,22 @@

 require conf/machine/include/am65xx.inc

-BBMULTICONFIG += "k3r5-sr2"
+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"

-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"
+OPTEEFLAVOR = "am65x"
+OPTEEOUTPUTMACHINE = "k3"
--- a/conf/machine/am65xx-hs-evm-k3r5.conf
+++ b/conf/machine/am65xx-hs-evm-k3r5.conf
@@ -1,13 +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"
-
-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,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"

@@ -20,3 +20,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/include/am65xx.inc
+++ b/conf/machine/include/am65xx.inc
@@ -1,30 +1,6 @@
 require conf/machine/include/k3.inc
 SOC_FAMILY_append = ":am65xx"

-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-base-board-sr1.dtb \
-    ti/k3-am654-gp.dtbo \
-    ti/k3-am654-idk.dtbo \
-    ti/k3-am654-idk-sr1.dtbo \
-    ti/k3-am654-evm-hdmi.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 \
-"
-
-OPTEEMACHINE = "k3"
-OPTEEFLAVOR = "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,11 +0,0 @@
-require conf/machine/include/k3.inc
-SOC_FAMILY_append = ":j7"
-
-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/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
@@ -41,8 +34,9 @@ MACHINE_FEATURES = "kernel26 apm usbgadget usbhost vfat ext2 screen alsa etherne

 IMAGE_FSTYPES += "tar.xz wic.xz"

-IMAGE_BOOT_FILES ?= "${SPL_BINARY} u-boot.${UBOOT_SUFFIX} tiboot3.bin sysfw.itb"
-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"
+# 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,23 +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 = ""
--- 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"

@@ -39,6 +39,6 @@ UBI_VOLNAME = "rootfs"
 MACHINE_FEATURES = "kernel26 apm usbgadget usbhost vfat ext2 screen alsa ethernet gpu mmip dsp gc320"

 IMAGE_FSTYPES += "tar.xz wic.xz"
-WKS_FILE ?= "sdimage-2part.wks"
+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/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"

@@ -61,6 +61,6 @@ TI_PDK_LIMIT_SOCS = "am335x"
 TI_PDK_LIMIT_BOARDS = "evmAM335x icev2AM335x iceAMIC110 bbbAM335x skAM335x"

 IMAGE_FSTYPES += "tar.xz wic.xz"
-WKS_FILE ?= "sdimage-2part.wks"
+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,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"

@@ -57,6 +57,6 @@ TI_PDK_LIMIT_SOCS = "am437x"
 TI_PDK_LIMIT_BOARDS = "evmAM437x idkAM437x skAM437x"

 IMAGE_FSTYPES += "tar.xz wic.xz"
-WKS_FILE ?= "sdimage-2part.wks"
+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,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
@@ -2,7 +2,7 @@
 #@NAME: J7 EVM
 #@DESCRIPTION: Machine configuration for the TI J7 EVM

-require conf/machine/include/j7.inc
+require conf/machine/include/k3.inc

 SERIAL_CONSOLES = "115200;ttyS2 115200;ttyS3"
 SERIAL_CONSOLES_CHECK = "${SERIAL_CONSOLES}"
@@ -16,3 +16,12 @@ KERNEL_DEVICETREE = " \
 "

 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.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,22 +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}"
-
-TI_SECURE_DEV_PKG = "${TI_SECURE_DEV_PKG_K3}"
--- 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-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/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/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/cadence-mhdp-fw/cadence-mhdp-fw_git.bb
+++ b/recipes-bsp/cadence-mhdp-fw/cadence-mhdp-fw_git.bb
@@ -8,7 +8,7 @@ PR = "r0"

 CLEANBROKEN = "1"

-COMPATIBLE_MACHINE = "j7"
+COMPATIBLE_MACHINE = "j7-evm"

 PACKAGE_ARCH = "${MACHINE_ARCH}"

--- a/recipes-bsp/common-csl-ip/common-csl-ip.inc
+++ b/recipes-bsp/common-csl-ip/common-csl-ip.inc
@@ -4,7 +4,7 @@ LIC_FILES_CHKSUM = "file://COPYING.txt;md5=5857833e20836213677fac33f9aded21"

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

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

@@ -13,8 +13,8 @@ CSL_GIT_PROTOCOL ="git"
 CSL_GIT_BRANCH = "release"
 CSL_GIT_DESTSUFFIX = "git"

-# Below commit ID corresponding to "REL.CORESDK.07.00.00.34"
-CSL_SRCREV = "8d59814723070ce9bbc4137912b0aac80482ca8a"
+# Below commit ID corresponding to "DEV.CSL_PROCESSOR-SDK.03.03.00.17B"
+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
@@ -11,7 +11,7 @@ inherit update-alternatives

 PROTOCOL = "git"
 BRANCH = "master"
-SRCREV = "afe62ada2e91e2665f597ca16eb3888b752016de"
+SRCREV = "4da71504488450f34d65459c1de949da1f984471"

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

--- 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/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.inc
+++ b/recipes-bsp/edma3-lld/edma3-lld.inc
@@ -6,7 +6,8 @@ EDMA3_LLD_GIT_URI = "git://git.ti.com/keystone-rtos/edma3_lld.git"
 EDMA3_LLD_GIT_PROTOCOL = "git"
 EDMA3_LLD_GIT_BRANCH = "master"

-EDMA3_LLD_SRCREV = "1ac9a3ff6632d5f04403d8789c3f95e0b585f7ae"
+# Below commit ID corresponds to version 2.12.05.30E
+EDMA3_LLD_SRCREV = "ce5ced2ac5eb1e0f1515288d279f5690813b5413"

 BRANCH = "${EDMA3_LLD_GIT_BRANCH}"
 SRC_URI = "${EDMA3_LLD_GIT_URI};protocol=${EDMA3_LLD_GIT_PROTOCOL};branch=${BRANCH}"
--- 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,9 +3,7 @@ HOMEPAGE = "https://git.ti.com/graphics/ti-gc320-driver"
 LICENSE = "MIT | GPLv2"
 LIC_FILES_CHKSUM = "file://../LICENSE;md5=78d9818a51b9a8e9bb89dea418bac297"

-inherit module features_check
-
-REQUIRED_MACHINE_FEATURES = "gc320"
+inherit module

 MACHINE_KERNEL_PR_append = "h"
 PR = "${MACHINE_KERNEL_PR}"
--- 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/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_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}"
--- a/recipes-bsp/ipc-lld/ipc-lld-fw_git.bb
+++ b/recipes-bsp/ipc-lld/ipc-lld-fw_git.bb
@@ -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_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}"
@@ -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/files/0001-HACK-ipumm-Workaround-for-linker-error.patch
+++ b/recipes-bsp/ipumm-fw/files/0001-HACK-ipumm-Workaround-for-linker-error.patch
@@ -1,48 +0,0 @@
-From 7226700841c62e6a42690eaa8b3e31b2c329b341 Mon Sep 17 00:00:00 2001
-From: Ramprasad N <x0038811@ti.com>
-Date: Thu, 28 May 2020 09:53:59 +0530
-Subject: [PATCH] HACK: ipumm: Workaround for linker error
-
-* HACK: ti_sdo_ce_utils_syscbuf_SysCBuf_Module_startup__E is no longer
-* defined with latest XDC tools. To temporarily get around the issue
-* until the real fix can be made, dummy defination of the missing function
-* is added in ipu_main.c
-
-*IPUMM dependent tool chain components are upgraded to latest version
-* BIOS : 6_82_01_17_eng
-* XDC  : 3_61_00_16_core
-* This issue is seen only with xdc tools upgrade.
-
-Signed-off-by: Angela Stegmaier <angelabaker@ti.com>
-Signed-off-by: Ramprasad N <x0038811@ti.com>
---
- platform/ti/dce/baselib/ipumm_main.c | 13 +++++++++++++
- 1 file changed, 13 insertions(+)
-
-diff --git a/platform/ti/dce/baselib/ipumm_main.c b/platform/ti/dce/baselib/ipumm_main.c
-index 76ccd34..f4ca6e5 100644
--- a/platform/ti/dce/baselib/ipumm_main.c
-+++ b/platform/ti/dce/baselib/ipumm_main.c
-@@ -50,6 +50,19 @@
- #include <string.h>
- #include <stdlib.h>
- 
-+/*
-+ * HACK: ti_sdo_ce_utils_syscbuf_SysCBuf_Module_startup__E is no longer
-+ * defined with latest XDC tools. To temporarily get around the issue
-+ * until the real fix can be made, define the missing function
-+ * here.
-+ */
-+extern ti_sdo_ce_utils_syscbuf_SysCBuf_Module_startup__F(xdc_Int state);
-+
-+/* Module_startup */
-+xdc_Int ti_sdo_ce_utils_syscbuf_SysCBuf_Module_startup__E( xdc_Int state )
-+{
-+    return ti_sdo_ce_utils_syscbuf_SysCBuf_Module_startup__F(state);
-+}
- 
- /* Legacy function to allow Linux side rpmsg sample tests to work: */
- extern void start_ping_tasks();
-- 
-1.9.1
-
--- a/recipes-bsp/ipumm-fw/ipumm-fw_git.bb
+++ b/recipes-bsp/ipumm-fw/ipumm-fw_git.bb
@@ -1,28 +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
-
-REQUIRED_MACHINE_FEATURES = "mmip"
-
-RDEPENDS_${PN} = "libdce"
+RDEPENDS_${PN} = " libdce"

 SRC_URI = "git://git.ti.com/ivimm/ipumm.git;protocol=git"

 SRCREV = "df4c50aecc9aad7ab3eb1ca9ebacfe473fcad7c5"

-SRC_URI += " \
-	           file://0001-HACK-ipumm-Workaround-for-linker-error.patch \
-	     "
-
 S = "${WORKDIR}/git"

 PV = "3.00.15.00"
-PR = "r6"
+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/osal/osal.inc
+++ b/recipes-bsp/osal/osal.inc
@@ -12,4 +12,3 @@ PE = "1"

 INC_PR = "r0"

-INHIBIT_PACKAGE_STRIP_FILES = "${PKGD}${libdir}/libosal.a"
--- a/recipes-bsp/pa-lld/pa-lld.inc
+++ b/recipes-bsp/pa-lld/pa-lld.inc
@@ -1,7 +1,7 @@
 LICENSE = "BSD-3-Clause & TI-TFL"
 LIC_FILES_CHKSUM = "file://${WORKDIR}/git/ti/drv/pa/COPYING.txt;md5=cd04fb087063a2a82c4ce61983836871"

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

 inherit ti-pdk-fetch
--- a/recipes-bsp/pa-lld/pa-lld_git.bb
+++ b/recipes-bsp/pa-lld/pa-lld_git.bb
@@ -22,6 +22,3 @@ do_install () {
    ln -sf ${LIBPA}.so.1.0.0 ${D}${libdir}/libpa_device.so.1
    ln -sf libpa_device.so.1 ${D}${libdir}/libpa_device.so
 }
-
-INHIBIT_PACKAGE_STRIP_FILES = "${PKGD}${libdir}/libpa2.a"
-INHIBIT_PACKAGE_STRIP_FILES_k2hk = "${PKGD}${libdir}/libpa.a"
--- a/recipes-bsp/powervr-drivers/ti-img-rogue-driver_1.10.5371573.bb
+++ b/recipes-bsp/powervr-drivers/ti-img-rogue-driver_1.10.5371573.bb
@@ -3,15 +3,13 @@ HOMEPAGE = "http://git.ti.com/graphics/ti-img-rogue-driver"
 LICENSE = "MIT | GPLv2"
 LIC_FILES_CHKSUM = "file://README;beginline=15;endline=20;md5=0403c7dea01a2b8232261e805325fac2"

-inherit module features_check
-
-REQUIRED_MACHINE_FEATURES = "gpu"
+inherit module

 MACHINE_KERNEL_PR_append = "f"
 PR = "${MACHINE_KERNEL_PR}"

 PACKAGE_ARCH = "${MACHINE_ARCH}"
-COMPATIBLE_MACHINE = "j7"
+COMPATIBLE_MACHINE = "j7-evm"

 DEPENDS = "virtual/kernel"

--- a/recipes-bsp/powervr-drivers/ti-sgx-ddk-km_1.17.4948957.bb
+++ b/recipes-bsp/powervr-drivers/ti-sgx-ddk-km_1.17.4948957.bb
@@ -3,9 +3,7 @@ HOMEPAGE = "https://git.ti.com/graphics/omap5-sgx-ddk-linux"
 LICENSE = "MIT | GPLv2"
 LIC_FILES_CHKSUM = "file://eurasia_km/README;beginline=13;endline=22;md5=74506d9b8e5edbce66c2747c50fcef12"

-inherit module features_check
-
-REQUIRED_MACHINE_FEATURES = "gpu"
+inherit module

 COMPATIBLE_MACHINE = "pandaboard|beagleboard|ti33x|ti43x|omap-a15|k3"

--- a/recipes-bsp/pru/pru-icss_git.bb
+++ b/recipes-bsp/pru/pru-icss_git.bb
@@ -1,17 +1,17 @@
 DESCRIPTION = "Programmable Real-time Unit Software Package"
 HOMEPAGE = "http://processors.wiki.ti.com/index.php/PRU-ICSS"
-LICENSE = "BSD-3-Clause & PD"
+LICENSE = "BSD-3-Clause & GPL-2.0 & PD"

-LIC_FILES_CHKSUM = "file://PRU-Package-v6.1-Manifest.html;md5=1e37797ebe9254922f4278bb6047211c"
+LIC_FILES_CHKSUM = "file://PRU-Package-v6.0-Manifest.html;md5=ea854230556f47609efdaedca174b44c"

 inherit update-alternatives

 BRANCH = "master"
 SRC_URI = "git://git.ti.com/pru-software-support-package/pru-software-support-package.git;protocol=git;branch=${BRANCH}"
-SRCREV = "a9bff6f43001cf66dc1ed3ef7e9dfb688b67f7bb"
+SRCREV = "ff252a5e174f1b6aa42931744939f20d25d8e070"

-PV = "5.7.0"
-PR = "r0"
+PV = "5.6.0"
+PR = "r1"

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

@@ -42,7 +42,7 @@ PLATFORM_ti43x = "am437x"
 PLATFORM_omap-a15 = "am572x"
 PLATFORM_k2g = "k2g"
 PLATFORM_am65xx = "am65x"
-PLATFORM_j7 = "j721e"
+PLATFORM_j7-evm = "j721e"

 do_compile() {
    for dir in ${SUBDIRS}
@@ -119,8 +119,6 @@ do_install_append_am65xx() {
                   ${D}/lib/firmware/pru
        install -m 644 ${S}/examples/${PLATFORM}/RTU_Halt/gen/RTU${i}/RTU_Halt_${i}.out \
                   ${D}/lib/firmware/pru
-        install -m 644 ${S}/examples/${PLATFORM}/TX_PRU_Halt/gen/TX_PRU${i}/TX_PRU_Halt_${i}.out \
-                   ${D}/lib/firmware/pru
    done
    for i in 0 1 2
    do
@@ -135,7 +133,7 @@ do_install_append_am65xx() {
    done
 }

-do_install_append_j7() {
+do_install_append_j7-evm() {
    for i in 0 1
    do
        install -m 644 ${S}/examples/${PLATFORM}/PRU_Halt/gen/PRU${i}/PRU_Halt_${i}.out \
@@ -168,7 +166,7 @@ PRU_ICSS_ALTERNATIVES_ti43x    = "am437x-pru0_0-fw am437x-pru0_1-fw am437x-pru1_
 PRU_ICSS_ALTERNATIVES_omap-a15 = "am57xx-pru1_0-fw am57xx-pru1_1-fw am57xx-pru2_0-fw am57xx-pru2_1-fw"
 PRU_ICSS_ALTERNATIVES_k2g      = "k2g-pru0_0-fw k2g-pru0_1-fw k2g-pru1_0-fw k2g-pru1_1-fw"
 PRU_ICSS_ALTERNATIVES_am65xx   = "am65x-pru0_0-fw am65x-pru0_1-fw am65x-pru1_0-fw am65x-pru1_1-fw am65x-pru2_0-fw am65x-pru2_1-fw am65x-rtu0_0-fw am65x-rtu0_1-fw am65x-rtu1_0-fw am65x-rtu1_1-fw am65x-rtu2_0-fw am65x-rtu2_1-fw"
-PRU_ICSS_ALTERNATIVES_j7       = "j7-pru0_0-fw j7-pru0_1-fw j7-pru1_0-fw j7-pru1_1-fw j7-rtu0_0-fw j7-rtu0_1-fw j7-rtu1_0-fw j7-rtu1_1-fw"
+PRU_ICSS_ALTERNATIVES_j7-evm   = "j7-pru0_0-fw j7-pru0_1-fw j7-pru1_0-fw j7-pru1_1-fw j7-rtu0_0-fw j7-rtu0_1-fw j7-rtu1_0-fw j7-rtu1_1-fw"

 # Set up link names for the firmwares
 ALTERNATIVE_LINK_NAME[am335x-pru0-fw] = "/lib/firmware/am335x-pru0-fw"
@@ -201,12 +199,6 @@ ALTERNATIVE_LINK_NAME[am65x-rtu1_0-fw] = "/lib/firmware/am65x-rtu1_0-fw"
 ALTERNATIVE_LINK_NAME[am65x-rtu1_1-fw] = "/lib/firmware/am65x-rtu1_1-fw"
 ALTERNATIVE_LINK_NAME[am65x-rtu2_0-fw] = "/lib/firmware/am65x-rtu2_0-fw"
 ALTERNATIVE_LINK_NAME[am65x-rtu2_1-fw] = "/lib/firmware/am65x-rtu2_1-fw"
-ALTERNATIVE_LINK_NAME[am65x-txpru0_0-fw] = "/lib/firmware/am65x-txpru0_0-fw"
-ALTERNATIVE_LINK_NAME[am65x-txpru0_1-fw] = "/lib/firmware/am65x-txpru0_1-fw"
-ALTERNATIVE_LINK_NAME[am65x-txpru1_0-fw] = "/lib/firmware/am65x-txpru1_0-fw"
-ALTERNATIVE_LINK_NAME[am65x-txpru1_1-fw] = "/lib/firmware/am65x-txpru1_1-fw"
-ALTERNATIVE_LINK_NAME[am65x-txpru2_0-fw] = "/lib/firmware/am65x-txpru2_0-fw"
-ALTERNATIVE_LINK_NAME[am65x-txpru2_1-fw] = "/lib/firmware/am65x-txpru2_1-fw"

 ALTERNATIVE_LINK_NAME[j7-pru0_0-fw] = "/lib/firmware/j7-pru0_0-fw"
 ALTERNATIVE_LINK_NAME[j7-pru0_1-fw] = "/lib/firmware/j7-pru0_1-fw"
@@ -225,8 +217,7 @@ ALTERNATIVE_LINK_NAME[j7-txpru1_1-fw] = "/lib/firmware/j7-txpru1_1-fw"
 ALTERNATIVE_pru-icss-halt = "${PRU_ICSS_ALTERNATIVES}"

 # Only Halt firmware images are supported for the Tx_PRU cores
-ALTERNATIVE_pru-icss-halt_append_am65xx = " am65x-txpru0_0-fw am65x-txpru0_1-fw am65x-txpru1_0-fw am65x-txpru1_1-fw am65x-txpru2_0-fw am65x-txpru2_1-fw"
-ALTERNATIVE_pru-icss-halt_append_j7 = " j7-txpru0_0-fw j7-txpru0_1-fw j7-txpru1_0-fw j7-txpru1_1-fw"
+ALTERNATIVE_pru-icss-halt_append_j7-evm = " j7-txpru0_0-fw j7-txpru0_1-fw j7-txpru1_0-fw j7-txpru1_1-fw"

 ALTERNATIVE_TARGET_pru-icss-halt[am335x-pru0-fw] = "/lib/firmware/pru/PRU_Halt.out"
 ALTERNATIVE_TARGET_pru-icss-halt[am335x-pru1-fw] = "/lib/firmware/pru/PRU_Halt.out"
@@ -258,12 +249,6 @@ ALTERNATIVE_TARGET_pru-icss-halt[am65x-rtu1_0-fw] = "/lib/firmware/pru/RTU_Halt_
 ALTERNATIVE_TARGET_pru-icss-halt[am65x-rtu1_1-fw] = "/lib/firmware/pru/RTU_Halt_1.out"
 ALTERNATIVE_TARGET_pru-icss-halt[am65x-rtu2_0-fw] = "/lib/firmware/pru/RTU_Halt_0.out"
 ALTERNATIVE_TARGET_pru-icss-halt[am65x-rtu2_1-fw] = "/lib/firmware/pru/RTU_Halt_1.out"
-ALTERNATIVE_TARGET_pru-icss-halt[am65x-txpru0_0-fw] = "/lib/firmware/pru/TX_PRU_Halt_0.out"
-ALTERNATIVE_TARGET_pru-icss-halt[am65x-txpru0_1-fw] = "/lib/firmware/pru/TX_PRU_Halt_1.out"
-ALTERNATIVE_TARGET_pru-icss-halt[am65x-txpru1_0-fw] = "/lib/firmware/pru/TX_PRU_Halt_0.out"
-ALTERNATIVE_TARGET_pru-icss-halt[am65x-txpru1_1-fw] = "/lib/firmware/pru/TX_PRU_Halt_1.out"
-ALTERNATIVE_TARGET_pru-icss-halt[am65x-txpru2_0-fw] = "/lib/firmware/pru/TX_PRU_Halt_0.out"
-ALTERNATIVE_TARGET_pru-icss-halt[am65x-txpru2_1-fw] = "/lib/firmware/pru/TX_PRU_Halt_1.out"

 ALTERNATIVE_TARGET_pru-icss-halt[j7-pru0_0-fw] = "/lib/firmware/pru/PRU_Halt_0.out"
 ALTERNATIVE_TARGET_pru-icss-halt[j7-pru0_1-fw] = "/lib/firmware/pru/PRU_Halt_1.out"
--- a/recipes-bsp/prueth-fw/prueth-fw-am65x-sr2_git.bb
+++ b/recipes-bsp/prueth-fw/prueth-fw-am65x-sr2_git.bb
@@ -1,39 +0,0 @@
-SUMMARY = "PRU Ethernet firmware for AM65xx SR2.0"
-
-LICENSE = "TI-TFL"
-LIC_FILES_CHKSUM = "file://LICENSE.ti;md5=b5aebf0668bdf95621259288c4a46d76"
-
-PV = "2.2.0.1+2.2.0.2-rc1"
-
-CLEANBROKEN = "1"
-
-COMPATIBLE_MACHINE = "am65xx-evm"
-
-PACKAGE_ARCH = "${MACHINE_ARCH}"
-
-SRCREV = "ea4bf53ba0a4a30bb7e0e8b6138fdb22fe50372a"
-BRANCH ?= "ti-linux-firmware"
-
-SRC_URI = "git://git.ti.com/processor-firmware/ti-linux-firmware.git;protocol=git;branch=${BRANCH}"
-
-S = "${WORKDIR}/git"
-
-TARGET = " \
-    am65x-sr2-pru0-prueth-fw.elf \
-    am65x-sr2-pru1-prueth-fw.elf \
-    am65x-sr2-rtu0-prueth-fw.elf \
-    am65x-sr2-rtu1-prueth-fw.elf \
-    am65x-sr2-txpru0-prueth-fw.elf \
-    am65x-sr2-txpru1-prueth-fw.elf \
-"
-
-do_install() {
-	install -d ${D}${base_libdir}/firmware/ti-pruss
-	for f in ${TARGET}; do
-		install -m 0644 ${S}/ti-pruss/$f ${D}${base_libdir}/firmware/ti-pruss/$f
-	done
-}
-
-FILES_${PN} = "${base_libdir}/firmware"
-
-INSANE_SKIP_${PN} = "arch"
--- a/recipes-bsp/pruss-lld/pruss-lld.inc
+++ b/recipes-bsp/pruss-lld/pruss-lld.inc
@@ -12,4 +12,3 @@ PE = "1"

 INC_PR = "r0"

-INHIBIT_PACKAGE_STRIP_FILES = "${PKGD}${libdir}/libpruss.a"
--- a/recipes-bsp/qmss-lld/qmss-lld.inc
+++ b/recipes-bsp/qmss-lld/qmss-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/qmss-lld/qmss-lld_git.bb
+++ b/recipes-bsp/qmss-lld/qmss-lld_git.bb
@@ -30,9 +30,3 @@ do_install () {
    done
    ln -sf libqmss_device.so.1 libqmss_device.so
 }
-
-INHIBIT_PACKAGE_STRIP_FILES_k2hk = "${PKGD}${libdir}/libqmss_k2h.a ${PKGD}${libdir}/libqmss_k2k.a"
-INHIBIT_PACKAGE_STRIP_FILES_k2e = "${PKGD}${libdir}/libqmss_k2e.a"
-INHIBIT_PACKAGE_STRIP_FILES_k2l = "${PKGD}${libdir}/libqmss_k2l.a"
-INHIBIT_PACKAGE_STRIP_FILES_k2g = "${PKGD}${libdir}/libqmss_k2h.a"
-INHIBIT_PACKAGE_STRIP_FILES_append = " ${PKGD}${libdir}/libqmss.a"
--- a/recipes-bsp/rm-lld/rm-lld_git.bb
+++ b/recipes-bsp/rm-lld/rm-lld_git.bb
@@ -29,5 +29,3 @@ do_install () {
    make -f makefile_armv7 install installbin installbin_test INSTALL_INC_BASE_DIR=${D}${includedir} INSTALL_LIB_BASE_DIR=${D}${libdir} INSTALL_BIN_BASE_DIR=${D}${bindir}
    chown -R root:root ${D}
 }
-
-INHIBIT_PACKAGE_STRIP_FILES = "${PKGD}${libdir}/librm.a"
--- a/recipes-bsp/sa-lld/sa-lld.inc
+++ b/recipes-bsp/sa-lld/sa-lld.inc
@@ -1,5 +1,5 @@
 LICENSE = "BSD-3-Clause & TI-TFL"
-COMPATIBLE_MACHINE = "k2hk|k2e|k2l"
+COMPATIBLE_MACHINE = "keystone"

 LIC_FILES_CHKSUM = "file://${WORKDIR}/git/ti/drv/sa/COPYING.txt;md5=cd04fb087063a2a82c4ce61983836871"

--- a/recipes-bsp/sa-lld/sa-lld_git.bb
+++ b/recipes-bsp/sa-lld/sa-lld_git.bb
@@ -22,5 +22,3 @@ do_install () {
 	ln -sf libsa.so.1.0.0 ${D}${libdir}/libsa_device.so.1
 	ln -sf libsa_device.so.1 ${D}${libdir}/libsa_device.so
 }
-
-INHIBIT_PACKAGE_STRIP_FILES = "${PKGD}${libdir}/libsa.a"
--- a/recipes-bsp/sciclient/sciclient-rtos_git.bb
+++ b/recipes-bsp/sciclient/sciclient-rtos_git.bb
@@ -27,7 +27,6 @@ export PDK_SCICLIENT_ROOT_PATH = "${SCICLIENT_PACKAGE_BASE}/package/all/pdk_/pac

 BUILD_HS = ""
 BUILD_HS_am65xx-hs-evm = "yes"
-BUILD_HS_j7-hs-evm = "yes"
 export BUILD_HS

 # Sciclient for am65x supports mcu1_1 in addition to the default cores in TI_PDK_LIMIT_CORES
@@ -100,14 +99,6 @@ do_compile_prepend_j7-evm() {
    cd -
 }

-do_compile_prepend_j7-hs-evm() {
-
-    cd ${SCICLIENT_ROOTPATH}/tools
-    # Create the .bin file for HS
-    ${SCICLIENT_ROOTPATH}/tools/firmwareHeaderGen.sh j721e-hs ${PDK_INSTALL_DIR}/packages
-    cd -
-}
-
 do_install() {
    cd ${SCICLIENT_ROOTPATH}
    install -d ${D}${PDK_INSTALL_DIR_RECIPE}/packages/ti/drv/sciclient
--- a/recipes-bsp/ti-img-encode-decode/ti-img-encode-decode_1.0.0.bb
+++ b/recipes-bsp/ti-img-encode-decode/ti-img-encode-decode_1.0.0.bb
@@ -0,0 +1,31 @@
+SUMMARY = "Kernel drivers for the IMG VXE384 MP2 and D5520 encoder/decoder found in TI SoCs"
+LICENSE = "GPLv2"
+LIC_FILES_CHKSUM = "file://driver/common/dq.c;beginline=1;endline=16;md5=e015e28ff5e88576dab9fdf641e3dbfe"
+
+inherit module
+
+MACHINE_KERNEL_PR_append = "g"
+PR = "${MACHINE_KERNEL_PR}"
+
+COMPATIBLE_MACHINE = "j7-evm"
+
+SRCREV = "0eba3678300f649e49f03d92d1b624cf0e008008"
+
+EXTRA_OEMAKE = "KPATH=${STAGING_KERNEL_DIR} KCONF=${STAGING_KERNEL_BUILDDIR}"
+TARGET_CC_ARCH += "${LDFLAGS}"
+
+BRANCH = "master"
+SRC_URI = "git://git.ti.com/jacinto7_multimedia/ti-img-encode-decode.git;protocol=git;branch=${BRANCH}"
+
+S = "${WORKDIR}/git"
+
+do_compile() {
+	oe_runmake all -C ${S}/linux/decoder
+	oe_runmake all -C ${S}/linux/encoder
+}
+
+do_install() {
+	install -d ${D}/${base_libdir}/modules/${KERNEL_VERSION}/extra
+	install -m 644 ${S}/linux/decoder/vxd-dec.ko ${D}/${base_libdir}/modules/${KERNEL_VERSION}/extra
+	install -m 644 ${S}/linux/encoder/vxe-enc.ko ${D}/${base_libdir}/modules/${KERNEL_VERSION}/extra
+}
--- a/recipes-bsp/ti-img-encode-decode/viddec-test-app_1.0.0.bb
+++ b/recipes-bsp/ti-img-encode-decode/viddec-test-app_1.0.0.bb
@@ -0,0 +1,18 @@
+SUMMARY = "Test applications for TI DEC (v4l2 decoder for IMG D5520)"
+LICENSE = "GPLv2"
+LIC_FILES_CHKSUM = "file://main.c;beginline=1;endline=14;md5=f17e17d664f72942124e4fcf06c178ee"
+
+DEPENDS = "libdrm ffmpeg"
+
+inherit autotools pkgconfig
+
+PR = "r1"
+SRCREV = "94a80c8c090dbfdc7fafd4e5bb78c2091e715af2"
+
+EXTRA_OEMAKE = "CC="${CC}""
+TARGET_CC_ARCH += "${LDFLAGS}"
+
+BRANCH = "master"
+SRC_URI = "git://git.ti.com/jacinto7_multimedia/viddec-test-app.git;protocol=git;branch=${BRANCH}"
+
+S = "${WORKDIR}/git"
--- a/recipes-bsp/ti-img-encode-decode/videnc-test-app_1.0.0.bb
+++ b/recipes-bsp/ti-img-encode-decode/videnc-test-app_1.0.0.bb
@@ -0,0 +1,18 @@
+SUMMARY = "Test applications for TI ENC (v4l2 encoder for IMG VXE384)"
+LICENSE = "GPLv2"
+LIC_FILES_CHKSUM = "file://main.c;beginline=1;endline=14;md5=3545dd5bdf513840937d38c10b866605"
+
+DEPENDS = "libdrm"
+
+inherit autotools pkgconfig
+
+PR = "r0"
+SRCREV = "a5e7d820bea1be24f25a8369d4d4521c784f869a"
+
+EXTRA_OEMAKE = "CC="${CC}""
+TARGET_CC_ARCH += "${LDFLAGS}"
+
+BRANCH = "master"
+SRC_URI = "git://git.ti.com/jacinto7_multimedia/videnc-test-app.git;protocol=git;branch=${BRANCH}"
+
+S = "${WORKDIR}/git"
--- a/recipes-bsp/ti-img-encode-decode/vxd-dec-fw_git.bb
+++ b/recipes-bsp/ti-img-encode-decode/vxd-dec-fw_git.bb
@@ -0,0 +1,34 @@
+SUMMARY = "Video Decoding Firmware Packaging recipe"
+LICENSE = "TI-TFL"
+LIC_FILES_CHKSUM = "file://LICENSE;md5=84ca7278930db001870686ad997d6bb1"
+
+BRANCH = "master"
+SRCREV = "0acbf1d0a7c7eaca0ef14c1a30ce313ea82147e5"
+
+SRC_URI = "git://git.ti.com/jacinto7_multimedia/ti-img-encode-decode.git;protocol=git;branch=${BRANCH}"
+
+S = "${WORKDIR}/git"
+
+PV = "1.0-git${SRCPV}"
+PACKAGE_ARCH = "${MACHINE_ARCH}"
+
+VXD_FW_DIR = "${S}/decoder/firmware/"
+
+# 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
+  install -m 0755 ${VXD_FW_DIR}/pvdec_full_bin.fw ${D}${base_libdir}/firmware
+}
+
+# This is used to prevent the build system to strip the executables
+INHIBIT_PACKAGE_STRIP = "1"
+# This is used to prevent the build system to split the debug info in a separate file
+INHIBIT_PACKAGE_DEBUG_SPLIT = "1"
+# As it likely to be a different arch from the Yocto build, disable checking by adding "arch" to INSANE_SKIP
+INSANE_SKIP_${PN} += "arch"
+
+# we don't want to configure and build the source code
+do_compile[noexec] = "1"
+do_configure[noexec] = "1"
--- a/recipes-bsp/ti-sci-fw/ti-sci-fw-source_2020.04a.bb
+++ b/recipes-bsp/ti-sci-fw/ti-sci-fw-source_2020.04a.bb
@@ -1,45 +0,0 @@
-# ti-sci-fw builds and packages multiple config variants via multiconfig
-# Let's take a page from gcc-source as a common recipe for all gcc stages,
-# but also to provide a single package for MAINMACHINE of all multiconfigs
-
-require recipes-bsp/ti-sci-fw/ti-sci-fw_${PV}.inc
-
-SUMMARY += "- sources"
-
-COMPATIBLE_MACHINE = "k3"
-
-EXCLUDE_FROM_WORLD = "1"
-INHIBIT_DEFAULT_DEPS = "1"
-DEPENDS = ""
-
-PACKAGES = "${PN}"
-PACKAGE_ARCH = "${MACHINE_ARCH}"
-
-do_configure[noexec] = "1"
-do_compile[noexec] = "1"
-
-SRCIPK_SRC_DIR = "${WORKDIR}/imggen"
-SRCIPK_INSTALL_DIR = "board-support/k3-image-gen-${PV}"
-FILES_${PN} = "${SRCIPK_INSTALL_DIR}"
-
-do_install() {
-    # Copy sources for packaging
-    mkdir -p ${D}/${SRCIPK_INSTALL_DIR}
-    if [ -e ${SRCIPK_SRC_DIR} ]; then
-        if [ "${SRCIPK_SRC_DIR}" = "${WORKDIR}" ]; then
-            excludes='--exclude ./temp --exclude ${D}'
-        fi
-        tar -C ${SRCIPK_SRC_DIR} -cO $excludes . | tar -C ${D}/${SRCIPK_INSTALL_DIR} -xpf -
-    fi
-
-    # Fix up patches/ directory to contain actual patches instead of symlinks
-    if [ -e ${D}/${SRCIPK_INSTALL_DIR}/patches ]
-    then
-        mv ${D}/${SRCIPK_INSTALL_DIR}/patches ${D}/${SRCIPK_INSTALL_DIR}/patches-links
-        cp -rL ${D}/${SRCIPK_INSTALL_DIR}/patches-links ${D}/${SRCIPK_INSTALL_DIR}/patches
-        rm -rf ${D}/${SRCIPK_INSTALL_DIR}/patches-links
-    fi
-}
-
-# Do not perform any QA checks on source package
-INSANE_SKIP_${PN} += "${ALL_QA}"
--- a/recipes-bsp/ti-sci-fw/ti-sci-fw_2020.04a.bb
+++ b/recipes-bsp/ti-sci-fw/ti-sci-fw_2020.04a.bb
@@ -1,79 +0,0 @@
-require recipes-bsp/ti-sci-fw/ti-sci-fw_${PV}.inc
-
-DEPENDS = "openssl-native u-boot-mkimage-native dtc-native"
-
-CLEANBROKEN = "1"
-PR = "r1"
-
-# Loaded by R5F core
-COMPATIBLE_MACHINE = "k3r5"
-COMPATIBLE_MACHINE_aarch64 = "null"
-
-PACKAGE_ARCH = "${MACHINE_ARCH}"
-
-TI_SECURE_DEV_PKG ?= ""
-export TI_SECURE_DEV_PKG
-
-SYSFW_SOC ?= "unknown"
-SYSFW_CONFIG ?= "unknown"
-
-SYSFW_PREFIX = "ti-sci-firmware"
-SYSFW_SUFFIX ?= "unknown"
-
-SYSFW_BASE = "${SYSFW_PREFIX}-${SYSFW_SOC}-${SYSFW_SUFFIX}"
-
-SYSFW_TISCI = "${S}/ti-sysfw/${SYSFW_BASE}*.bin"
-
-SYSFW_BINARY = "sysfw-${SYSFW_SOC}-${SYSFW_CONFIG}.itb"
-SYSFW_VBINARY = "sysfw-${PV}-${SYSFW_SOC}-${SYSFW_CONFIG}.itb"
-SYSFW_IMAGE = "sysfw-${SYSFW_SOC}-${SYSFW_CONFIG}.itb"
-SYSFW_SYMLINK ?= "sysfw.itb"
-
-CFLAGS[unexport] = "1"
-LDFLAGS[unexport] = "1"
-AS[unexport] = "1"
-LD[unexport] = "1"
-
-do_configure[noexec] = "1"
-
-EXTRA_OEMAKE = "\
-    CROSS_COMPILE=${TARGET_PREFIX} SYSFW_DL_URL='' SYSFW_HS_DL_URL='' SYSFW_HS_INNER_CERT_DL_URL='' \
-    SYSFW_PATH="${SYSFW_TISCI}" SOC=${SYSFW_SOC} CONFIG=${SYSFW_CONFIG} \
-"
-EXTRA_OEMAKE_HS = " \
-    HS=1 SYSFW_HS_PATH="${S}/ti-sysfw/${SYSFW_BASE}-enc.bin" SYSFW_HS_INNER_CERT_PATH="${S}/ti-sysfw/${SYSFW_BASE}-cert.bin" \
-"
-EXTRA_OEMAKE_append = "${@['',' ${EXTRA_OEMAKE_HS}']['${SYSFW_SUFFIX}' == 'hs']}"
-
-do_compile() {
-	cd ${WORKDIR}/imggen/
-	oe_runmake
-}
-
-do_install() {
-	install -d ${D}/boot
-	install -m 644 ${WORKDIR}/imggen/${SYSFW_BINARY} ${D}/boot/${SYSFW_VBINARY}
-	ln -sf ${SYSFW_VBINARY} ${D}/boot/${SYSFW_IMAGE}
-	if [ ! -z "${SYSFW_SYMLINK}" ]; then
-		ln -sf ${SYSFW_VBINARY} ${D}/boot/${SYSFW_SYMLINK}
-	fi
-}
-
-FILES_${PN} = "/boot"
-
-inherit deploy
-
-do_deploy () {
-	install -d ${DEPLOYDIR}
-	install -m 644 ${WORKDIR}/imggen/${SYSFW_BINARY} ${DEPLOYDIR}/${SYSFW_VBINARY}
-	rm -f ${DEPLOYDIR}/${SYSFW_IMAGE}
-	ln -sf ${SYSFW_VBINARY} ${DEPLOYDIR}/${SYSFW_IMAGE}
-	if [ ! -z "${SYSFW_SYMLINK}" ]; then
-		rm -f ${DEPLOYDIR}/${SYSFW_SYMLINK}
-		ln -sf ${SYSFW_VBINARY} ${DEPLOYDIR}/${SYSFW_SYMLINK}
-	fi
-
-	install -m 644 ${SYSFW_TISCI} ${DEPLOYDIR}/
-}
-
-addtask deploy before do_build after do_compile
--- a/recipes-bsp/ti-sci-fw/ti-sci-fw_2020.04a.inc
+++ b/recipes-bsp/ti-sci-fw/ti-sci-fw_2020.04a.inc
@@ -1,16 +0,0 @@
-SUMMARY = "TI SCI firmware (SYSFW)"
-
-LICENSE = "TI-TFL"
-LIC_FILES_CHKSUM = "file://LICENSE.ti;md5=b5aebf0668bdf95621259288c4a46d76"
-
-SRCREV = "c8decf64be551dfd1244cd1d231a97eb2255fb80"
-BRANCH ?= "ti-linux-firmware"
-SRCREV_imggen = "d9a550b91ec95d06a80f2ccc6dd829815ba35d88"
-SRCREV_FORMAT = "imggen"
-
-SRC_URI = " \
-	git://git.ti.com/processor-firmware/ti-linux-firmware.git;protocol=git;branch=${BRANCH} \
-	git://git.ti.com/k3-image-gen/k3-image-gen.git;protocol=git;branch=master;destsuffix=imggen;name=imggen \
-"
-
-S = "${WORKDIR}/git"
--- a/recipes-bsp/traceframework/traceframework_git.bb
+++ b/recipes-bsp/traceframework/traceframework_git.bb
@@ -36,5 +36,3 @@ PACKAGES =+ "${PN}-test"

 FILES_${PN}-test = "${bindir}/tfw*.out \
                    ${bindir}/*.txt"
-
-INHIBIT_PACKAGE_STRIP_FILES = "${PKGD}${libdir}/libtraceframework.a"
--- a/recipes-bsp/trusted-firmware-a/trusted-firmware-a_%.bbappend
+++ b/recipes-bsp/trusted-firmware-a/trusted-firmware-a_%.bbappend
@@ -1,23 +0,0 @@
-BRANCH_k3 = "ti-atf"
-SRC_URI_k3 = "git://git.ti.com/atf/arm-trusted-firmware.git;branch=${BRANCH};name=tfa"
-SRCREV_tfa_k3 = "5b907a2813faf039d752cdeb6a7b94e95580c46b"
-COMPATIBLE_MACHINE_k3 = "k3"
-TFA_BUILD_TARGET_k3 = "all"
-TFA_INSTALL_TARGET_k3 = "bl31"
-TFA_SPD_k3 = "opteed"
-
-do_compile_append_am65xx-hs-evm() {
-	export TI_SECURE_DEV_PKG=${TI_SECURE_DEV_PKG}
-	( cd ${B}/${BUILD_DIR}/release/; \
-		mv bl31.bin bl31.bin.unsigned; \
-		${TI_SECURE_DEV_PKG}/scripts/secure-binary-image.sh bl31.bin.unsigned bl31.bin; \
-	)
-}
-
-do_compile_append_j7-hs-evm() {
-	export TI_SECURE_DEV_PKG=${TI_SECURE_DEV_PKG}
-	( cd ${B}/${BUILD_DIR}/release/; \
-		mv bl31.bin bl31.bin.unsigned; \
-		${TI_SECURE_DEV_PKG}/scripts/secure-binary-image.sh bl31.bin.unsigned bl31.bin; \
-	)
-}
--- a/recipes-bsp/u-boot/u-boot-ti-staging_2020.01.bb
+++ b/recipes-bsp/u-boot/u-boot-ti-staging_2020.01.bb
@@ -1,7 +1,7 @@
 require u-boot-ti.inc

-PR = "r12"
+PR = "r7"

 BRANCH = "ti-u-boot-2020.01"

-SRCREV = "f9b0d030d31ab79577f1dd1e48814a8f3119c481"
+SRCREV = "ae8ceb7b6e3acb4bc90f730e33dafc7b65066591"
--- a/recipes-bsp/u-boot/u-boot-ti.inc
+++ b/recipes-bsp/u-boot/u-boot-ti.inc
@@ -13,9 +13,10 @@ UBOOT_LOCALVERSION = "-g${@get_git_revision('${S}').__str__()[:10]}"
 UBOOT_SUFFIX ?= "img"
 SPL_BINARY ?= "MLO"

-require ${COREBASE}/meta/recipes-bsp/u-boot/u-boot-common.inc
 require ${COREBASE}/meta/recipes-bsp/u-boot/u-boot.inc

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

 SUMMARY = "u-boot bootloader for TI devices"
@@ -32,13 +33,13 @@ PV_append = "+git${SRCPV}"

 # u-boot needs devtree compiler to parse dts files
 DEPENDS += "dtc-native bc-native lzop-native flex-native bison-native"
+DEPENDS_remove = "python-native"

-PACKAGECONFIG[atf] = "ATF=${STAGING_DIR_HOST}/firmware/bl31.bin,,trusted-firmware-a"
+PACKAGECONFIG[atf] = "ATF=${STAGING_DIR_HOST}/boot/bl31.bin,,arm-trusted-firmware"
 PACKAGECONFIG[optee] = "TEE=${STAGING_DIR_HOST}/boot/bl32.bin,,optee-os"

-PACKAGECONFIG_append_aarch64 = " atf optee"
-
-COMPATIBLE_MACHINE = "(ti-soc)"
+# optee-os is not a direct dependency, do not enable optee by default
+PACKAGECONFIG_append_k3 = " atf"

 EXTRA_OEMAKE += "${PACKAGECONFIG_CONFARGS}"

@@ -57,7 +58,6 @@ export TI_SECURE_DEV_PKG
 SPL_UART_BINARY = "u-boot-spl.bin"
 SPL_UART_BINARY_keystone = ""
 SPL_UART_BINARY_k3 = ""
-SPL_UART_BINARY_k3r5 = ""
 SPL_UART_BINARY_lego-ev3 = ""

 SPL_UART_IMAGE ?= "${SPL_UART_BINARY}-${MACHINE}-${PV}-${PR}"
@@ -259,13 +259,6 @@ do_deploy_append () {
 			ln -sf ${UBOOT_HS_2ND_IMAGE} ${UBOOT_HS_2ND_BINARY}
 		fi
 	fi
-
-	rm ${DEPLOYDIR}/u-boot-initial-env || true
-	rm ${DEPLOYDIR}/${PN}-initial-env || true
-	rm ${DEPLOYDIR}/u-boot-initial-env-${MACHINE} || true
-	rm ${DEPLOYDIR}/${PN}-initial-env-${MACHINE} || true
-	rm ${DEPLOYDIR}/u-boot-initial-env-${MACHINE}-${PV}-${PR} || true
-	rm ${DEPLOYDIR}/${PN}-initial-env-${MACHINE}-${PV}-${PR} || true
 }

 do_install_append_keystone () {
--- a/recipes-graphics/libgal/ti-gc320-libs_5.0.11.p7.bb
+++ b/recipes-graphics/libgal/ti-gc320-libs_5.0.11.p7.bb
@@ -3,10 +3,6 @@ HOMEPAGE = "https://git.ti.com/graphics/ti-gc320-libs"
 LICENSE = "TI-TSPA"
 LIC_FILES_CHKSUM = "file://Manifest.html;md5=a9121e8936ace09820d23f7626daaca5"

-inherit features_check
-
-REQUIRED_MACHINE_FEATURES = "gc320"
-
 COMPATIBLE_MACHINE = "omap-a15"

 CLEANBROKEN = "1"
--- a/recipes-graphics/libgles/ti-img-rogue-umlibs_1.10.5371573.bb
+++ b/recipes-graphics/libgles/ti-img-rogue-umlibs_1.10.5371573.bb
@@ -3,19 +3,15 @@ HOMEPAGE = "http://git.ti.com/graphics/ti-img-rogue-umlibs"
 LICENSE = "TI-TFL"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=7232b98c1c58f99e3baa03de5207e76f"

-inherit features_check
-
-REQUIRED_MACHINE_FEATURES = "gpu"
-
 PACKAGE_ARCH = "${MACHINE_ARCH}"
-COMPATIBLE_MACHINE = "j7"
+COMPATIBLE_MACHINE = "j7-evm"

-PR = "r8"
+PR = "r6"

 BRANCH = "linuxws/zeus/k5.4/${PV}"

 SRC_URI = "git://git.ti.com/graphics/ti-img-rogue-umlibs.git;branch=${BRANCH}"
-SRCREV = "6b4d8e538566bbaf6b9c4a24dbecd740d58c1871"
+SRCREV = "0721cdfc1fc86f40c93745159e3f1bcad5beda17"

 PVR_SOC ?= "j721e_linux"
 PVR_BUILD ?= "release"
@@ -30,6 +26,7 @@ PROVIDES += "virtual/egl virtual/libgles1 virtual/libgles2 virtual/libgbm"

 DEPENDS += "libdrm wayland expat"
 RDEPENDS_${PN} += "bash"
+RDEPENDS_${PN} += "python-core"
 RDEPENDS_${PN} += "wayland expat"

 RPROVIDES_${PN} = "libegl libgles1 libgles2 libgbm"
--- a/recipes-graphics/libgles/ti-sgx-ddk-um_1.17.4948957.bb
+++ b/recipes-graphics/libgles/ti-sgx-ddk-um_1.17.4948957.bb
@@ -3,10 +3,6 @@ HOMEPAGE = "https://git.ti.com/graphics/omap5-sgx-ddk-um-linux"
 LICENSE = "TI-TSPA"
 LIC_FILES_CHKSUM = "file://TI-Linux-Graphics-DDK-UM-Manifest.doc;md5=b17390502bc89535c86cfbbae961a2a8"

-inherit features_check
-
-REQUIRED_MACHINE_FEATURES = "gpu"
-
 PACKAGE_ARCH = "${MACHINE_ARCH}"
 COMPATIBLE_MACHINE = "pandaboard|beagleboard|ti33x|ti43x|omap-a15|k3"

--- a/recipes-kernel/jailhouse/jailhouse/0001-tools-update-shebang-in-helper-scripts-for-python3.patch
+++ b/recipes-kernel/jailhouse/jailhouse/0001-tools-update-shebang-in-helper-scripts-for-python3.patch
@@ -1,56 +0,0 @@
-From 24e58c75592a2ba09f3062c8a4722c0e29a9b558 Mon Sep 17 00:00:00 2001
-From: Denys Dmytriyenko <denys@ti.com>
-Date: Wed, 1 Apr 2020 15:44:46 -0400
-Subject: [PATCH] tools: update shebang in helper scripts for python3
-
-Signed-off-by: Denys Dmytriyenko <denys@ti.com>
---
- tools/jailhouse-cell-linux     | 2 +-
- tools/jailhouse-cell-stats     | 2 +-
- tools/jailhouse-config-create  | 2 +-
- tools/jailhouse-hardware-check | 2 +-
- 4 files changed, 4 insertions(+), 4 deletions(-)
-
-diff --git a/tools/jailhouse-cell-linux b/tools/jailhouse-cell-linux
-index 007a5c4..e106b9d 100755
--- a/tools/jailhouse-cell-linux
-+++ b/tools/jailhouse-cell-linux
-@@ -1,4 +1,4 @@
-#!/usr/bin/env python
-+#!/usr/bin/env python3
- 
- # Jailhouse, a Linux-based partitioning hypervisor
- #
-diff --git a/tools/jailhouse-cell-stats b/tools/jailhouse-cell-stats
-index 2f7e966..4c5289f 100755
--- a/tools/jailhouse-cell-stats
-+++ b/tools/jailhouse-cell-stats
-@@ -1,4 +1,4 @@
-#!/usr/bin/env python
-+#!/usr/bin/env python3
- 
- # Jailhouse, a Linux-based partitioning hypervisor
- #
-diff --git a/tools/jailhouse-config-create b/tools/jailhouse-config-create
-index 1e2df74..9382b05 100755
--- a/tools/jailhouse-config-create
-+++ b/tools/jailhouse-config-create
-@@ -1,4 +1,4 @@
-#!/usr/bin/env python
-+#!/usr/bin/env python3
- #
- # Jailhouse, a Linux-based partitioning hypervisor
- #
-diff --git a/tools/jailhouse-hardware-check b/tools/jailhouse-hardware-check
-index 375816e..658ce6f 100755
--- a/tools/jailhouse-hardware-check
-+++ b/tools/jailhouse-hardware-check
-@@ -1,4 +1,4 @@
-#!/usr/bin/env python
-+#!/usr/bin/env python3
- 
- # Jailhouse, a Linux-based partitioning hypervisor
- #
-- 
-2.7.4
-
--- a/recipes-kernel/jailhouse/jailhouse_git.bb
+++ b/recipes-kernel/jailhouse/jailhouse_git.bb
@@ -11,26 +11,25 @@ LIC_FILES_CHKSUM = " \
 "

 PV = "0.12+git${SRCPV}"
-SRCREV = "8fd88c37ae1a4f7130ef40899c0eadd737c64832"
+SRCREV = "2c6516ce3d0e0c4e9372e4439562dd660877cb79"
 BRANCH = "ti-jailhouse-0.12"

 SRC_URI = " \
    git://git.ti.com/jailhouse/ti-jailhouse.git;protocol=git;branch=${BRANCH} \
-    file://0001-tools-update-shebang-in-helper-scripts-for-python3.patch \
 "

-DEPENDS = "virtual/kernel dtc-native python3-mako-native python3-mako make-native"
+DEPENDS = "virtual/kernel dtc-native python-mako-native python-mako make-native"
 RDEPENDS_${PN} += "\
-	python3-curses\
-	python3-datetime\
-	python3-mmap\
+	python-curses\
+	python-datetime\
+	python-argparse\
+	python-mmap\
 "

-require jailhouse-arch.inc
-inherit module python3native bash-completion deploy setuptools3
-
 S = "${WORKDIR}/git"
-B = "${S}"
+
+require jailhouse-arch.inc
+inherit module pythonnative bash-completion deploy setuptools

 PACKAGE_ARCH = "${MACHINE_ARCH}"
 COMPATIBLE_MACHINE = "(ti-soc)"
@@ -46,22 +45,22 @@ JH_CELL_FILES_k3 ?= "k3-*.cell"

 JH_INMATE_DTB ?= ""
 JH_INMATE_DTB_am65xx ?= "inmate-k3-am654-idk.dtb"
-JH_INMATE_DTB_j7 ?= "inmate-k3-j721e-evm.dtb"
+JH_INMATE_DTB_j7-evm ?= "inmate-k3-j721e-evm.dtb"

 JH_LINUX_DEMO_CELL ?= ""
 JH_LINUX_DEMO_CELL_am65xx ?= "k3-am654-idk-linux-demo.cell"
-JH_LINUX_DEMO_CELL_j7 ?= "k3-j721e-evm-linux-demo.cell"
+JH_LINUX_DEMO_CELL_j7-evm ?= "k3-j721e-evm-linux-demo.cell"

 JH_SYSCONFIG_CELL ?= ""
 JH_SYSCONFIG_CELL_am65xx ?= "k3-am654-idk.cell"
-JH_SYSCONFIG_CELL_j7 ?= "k3-j721e-evm.cell"
+JH_SYSCONFIG_CELL_j7-evm ?= "k3-j721e-evm.cell"

 INITRAMFS_IMAGE ?= ""
 JH_RAMFS_IMAGE ?= "${INITRAMFS_IMAGE}"

 JH_CMDLINE ?= ""
 JH_CMDLINE_am65xx ?= "console=ttyS1,115200n8"
-JH_CMDLINE_j7 ?= "console=ttyS3,115200n8"
+JH_CMDLINE_j7-evm ?= "console=ttyS3,115200n8"

 do_configure() {
 	if [ -d ${STAGING_DIR_HOST}/${CELLCONF_DIR} ]; 
@@ -85,12 +84,12 @@ do_compile() {

 do_install() {
 	# Install pyjailhouse python modules needed by the tools
-	distutils3_do_install
+	distutils_do_install

 	# We want to install the python tools, but we do not want to use pip...
 	# At least with v0.10, we can work around this with
 	# 'PIP=":" PYTHON_PIP_USEABLE=yes'
-	oe_runmake PIP=: PYTHON=python3 PYTHON_PIP_USEABLE=yes DESTDIR=${D} install
+	oe_runmake PIP=: PYTHON_PIP_USEABLE=yes DESTDIR=${D} install

 	install -d ${D}${CELL_DIR}
 	install -m 0644 ${B}/configs/${JH_ARCH}/${JH_CELL_FILES} ${D}${CELL_DIR}/
@@ -138,8 +137,8 @@ FILES_${PN} = "${base_libdir}/firmware ${libexecdir} ${sbindir} ${JH_DATADIR} /b
 FILES_pyjailhouse = "${PYTHON_SITEPACKAGES_DIR}"
 FILES_${PN}-tools = "${libexecdir}/${BPN}/${BPN}-*"

-RDEPENDS_${PN}-tools = "pyjailhouse python3-mmap python3-math python3-datetime python3-curses python3-compression"
-RDEPENDS_pyjailhouse = "python3-core python3-ctypes python3-fcntl python3-shell"
+RDEPENDS_${PN}-tools = "pyjailhouse python-mmap python-math python-argparse python-datetime python-curses python-compression"
+RDEPENDS_pyjailhouse = "python-core python-ctypes python-fcntl python-shell"

 RRECOMMENDS_${PN} = "${PN}-tools"

--- a/recipes-kernel/linux/linux-ti-staging-rt_5.4.bb
+++ b/recipes-kernel/linux/linux-ti-staging-rt_5.4.bb
@@ -6,5 +6,5 @@ FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}-5.4:"

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

-SRCREV = "17e2c5c658e9bcdf7566c9e7f70b1f0a8c9f7036"
-PV = "5.4.43+git${SRCPV}"
+SRCREV = "c3dd64420d144641f0a803523185dffa26250f8b"
+PV = "5.4.28+git${SRCPV}"
--- a/recipes-kernel/linux/linux-ti-staging_5.4.bb
+++ b/recipes-kernel/linux/linux-ti-staging_5.4.bb
@@ -44,16 +44,15 @@ RDEPENDS_${KERNEL_PACKAGE_NAME}-base_append_k2e = " netcp-pa-fw"
 RDEPENDS_${KERNEL_PACKAGE_NAME}-base_append_k2l = " netcp-pa-fw"

 # Add run-time dependency for PRU Ethernet firmware to the rootfs
-RDEPENDS_${KERNEL_PACKAGE_NAME}-base_append_am57xx-evm = " prueth-fw prusw-fw"
-RDEPENDS_${KERNEL_PACKAGE_NAME}-base_append_am57xx-hs-evm = " prueth-fw prusw-fw"
+RDEPENDS_${KERNEL_PACKAGE_NAME}-base_append_am57xx-evm = " prueth-fw"
+RDEPENDS_${KERNEL_PACKAGE_NAME}-base_append_am57xx-hs-evm = " prueth-fw"
 RDEPENDS_${KERNEL_PACKAGE_NAME}-base_append_ti43x = " prueth-fw"
 RDEPENDS_${KERNEL_PACKAGE_NAME}-base_append_ti33x = " prueth-fw"
 RDEPENDS_${KERNEL_PACKAGE_NAME}-base_append_k2g = " prueth-fw"
 RDEPENDS_${KERNEL_PACKAGE_NAME}-base_append_am65xx = " prueth-fw-am65x"
-RDEPENDS_${KERNEL_PACKAGE_NAME}-base_append_am65xx-evm = " prueth-fw-am65x-sr2"

 # Add run-time dependency for Cadence MHDP firmware to the rootfs
-RDEPENDS_${KERNEL_PACKAGE_NAME}-base_append_j7 = " cadence-mhdp-fw"
+RDEPENDS_${KERNEL_PACKAGE_NAME}-base_append_j7-evm = " cadence-mhdp-fw"

 KERNEL_EXTRA_ARGS += "LOADADDR=${UBOOT_ENTRYPOINT}"

@@ -61,8 +60,8 @@ S = "${WORKDIR}/git"

 BRANCH = "ti-linux-5.4.y"

-SRCREV = "66cf445b7697a4963cfc796e06918fe5b147fe7d"
-PV = "5.4.40+git${SRCPV}"
+SRCREV = "6f3bf13d53820fc12432d7052744be2ee046fc92"
+PV = "5.4.28+git${SRCPV}"

 # Append to the MACHINE_KERNEL_PR so that a new SRCREV will cause a rebuild
 MACHINE_KERNEL_PR_append = "a"
@@ -80,4 +79,3 @@ module_conf_rpmsg_client_sample = "blacklist rpmsg_client_sample"
 module_conf_ti_k3_r5_remoteproc = "softdep ti_k3_r5_remoteproc pre: virtio_rpmsg_bus"
 module_conf_ti_k3_dsp_remoteproc = "softdep ti_k3_dsp_remoteproc pre: virtio_rpmsg_bus"
 KERNEL_MODULE_PROBECONF += "rpmsg_client_sample ti_k3_r5_remoteproc ti_k3_dsp_remoteproc"
-KERNEL_MODULE_AUTOLOAD_append_j7 = " rpmsg_kdrv_switch"
--- a/recipes-multimedia/libdce/libdce_3.00.14.00.bb
+++ b/recipes-multimedia/libdce/libdce_3.00.14.00.bb
@@ -1,4 +1,4 @@
-SUMMARY = "Library for remotely invoking HW accelerated codecs on IVA-HD"
+DESCRIPTION = "Library used for remotely invoking the hw accelerated codec on IVA-HD"
 LICENSE = "BSD"
 LIC_FILES_CHKSUM = "file://libdce.h;beginline=1;endline=31;md5=0a398cf815b8b5f31f552266cd453dae"

--- a/recipes-security/optee/optee-%.bbappend
+++ b/recipes-security/optee/optee-%.bbappend
@@ -1 +0,0 @@
-COMPATIBLE_MACHINE_ti-soc = "ti-soc"
--- a/recipes-ti/bios/ti-sysbios_6.76.03.01.bb
+++ b/recipes-ti/bios/ti-sysbios_6.76.03.01.bb
@@ -1,10 +1,12 @@
 require recipes-ti/bios/ti-sysbios.inc

-PV = "6_82_01_19"
+PV = "6_76_03_01"
+PR = "r0"

-LIC_FILES_CHKSUM = "file://manifest_bios_${PV}.html;md5=4b72066ed4cb1dd73ff2f585c428105a"
+LIC_FILES_CHKSUM = "file://manifest_bios_${PV}.html;md5=5cf40699c51b26d36fc01647c0b27fb1"

-SRC_URI[sysbiosbin.sha256sum] = "4d7c6cac993e6bc601083a41a5c52089d4852544b4c38563e4320310a54882b2"
+SRC_URI[sysbiosbin.md5sum] = "647243209d66d5dd35503b0ec5a84ab9"
+SRC_URI[sysbiosbin.sha256sum] = "b762b7f2343d26d367f952488e529046785128005158cc921c3baef08e97116a"

 TI_BIN_UNPK_CMDS = ""
 TI_BIN_UNPK_ARGS = "--mode unattended --prefix ${WORKDIR}"
--- a/recipes-ti/devtools/gcc-aarch64-none-elf_9.2-2019.12.bb
+++ b/recipes-ti/devtools/gcc-aarch64-none-elf_9.2-2019.12.bb
@@ -1,38 +0,0 @@
-# Copyright (C) 2020 Texas Instruments Inc.
-# Released under the MIT license (see COPYING.MIT for the terms)
-
-SUMMARY = "Baremetal GCC for Aarch64 processors"
-LICENSE = "GPL-3.0-with-GCC-exception & GPLv3"
-
-LIC_FILES_CHKSUM = "file://share/doc/gcc/GNU-Free-Documentation-License.html;md5=cc1e9a49a59ce7e6ae5ef37cd16eca0c"
-
-PROVIDES = "virtual/aarch64-none-elf-gcc"
-
-SRC_URI = "https://developer.arm.com/-/media/Files/downloads/gnu-a/9.2-2019.12/binrel/gcc-arm-${PV}-x86_64-aarch64-none-elf.tar.xz"
-
-SRC_URI[sha256sum] = "36d2cbe7c2984f2c20f562ac2f3ba524c59151adfa8ee10f1326c88de337b6d1"
-
-S = "${WORKDIR}/gcc-arm-${PV}-x86_64-aarch64-none-elf"
-
-COMPATIBLE_HOST = "x86_64.*-linux"
-
-do_install() {
-    install -d ${D}${datadir}/aarch64-none-elf/
-    cp -r ${S}/. ${D}${datadir}/aarch64-none-elf/
-
-    install -d ${D}${bindir}
-    # Symlink all executables into bindir
-    for f in ${D}${datadir}/aarch64-none-elf/bin/aarch64-none-elf-*; do
-        lnr $f ${D}${bindir}/$(basename $f)
-    done
-}
-
-FILES_${PN} = "${datadir} ${bindir}"
-
-INSANE_SKIP_${PN} = "already-stripped libdir staticdev file-rdeps"
-
-INHIBIT_SYSROOT_STRIP = "1"
-INHIBIT_PACKAGE_STRIP = "1"
-INHIBIT_PACKAGE_DEBUG_SPLIT = "1"
-
-BBCLASSEXTEND = "native nativesdk"
--- a/recipes-ti/devtools/gcc-arm-none-eabi-native_4.9.2015q3.bb
+++ b/recipes-ti/devtools/gcc-arm-none-eabi-native_4.9.2015q3.bb
@@ -0,0 +1,23 @@
+DESCRIPTION = "Baremetal GCC for ARM"
+LICENSE = "GPL-3.0-with-GCC-exception & GPLv3"
+
+LIC_FILES_CHKSUM = "file://share/doc/gcc-arm-none-eabi/license.txt;md5=cba77c7fde3ed13e866b04a2f3d93918"
+
+inherit native
+require recipes-ti/includes/ti-paths.inc
+
+SRC_URI = "https://launchpad.net/gcc-arm-embedded/4.9/4.9-2015-q3-update/+download/gcc-arm-none-eabi-4_9-2015q3-20150921-linux.tar.bz2;name=gcc-arm-none"
+
+SRC_URI[gcc-arm-none.md5sum] = "8a4a74872830f80c788c944877d3ad8c"
+SRC_URI[gcc-arm-none.sha256sum] = "c50078bfbd29e6c15615900e746f4d0acde917338e55860b0f145f57387c12ab"
+
+S = "${WORKDIR}/gcc-arm-none-eabi-4_9-2015q3"
+
+do_install() {
+    install -d ${D}${GCC_ARM_NONE_TOOLCHAIN_RECIPE}
+    cp -r ${S}/. ${D}${GCC_ARM_NONE_TOOLCHAIN_RECIPE}
+}
+
+FILES_${PN} = "${GCC_ARM_NONE_TOOLCHAIN_RECIPE}/*"
+
+INSANE_SKIP_${PN} = "already-stripped"
--- a/recipes-ti/devtools/gcc-arm-none-eabi_7-2018-q2-update.bb
+++ b/recipes-ti/devtools/gcc-arm-none-eabi_7-2018-q2-update.bb
@@ -0,0 +1,29 @@
+DESCRIPTION = "Baremetal GCC for ARM"
+LICENSE = "GPL-3.0-with-GCC-exception & GPLv3"
+
+LIC_FILES_CHKSUM = "file://share/doc/gcc-arm-none-eabi/license.txt;md5=f77466c63f5787f4bd669c402aabe061"
+
+require recipes-ti/includes/ti-paths.inc
+
+SRC_URI = "https://developer.arm.com/-/media/Files/downloads/gnu-rm/7-2018q2/gcc-arm-none-eabi-7-2018-q2-update-linux.tar.bz2;name=gcc-arm-none"
+
+SRC_URI[gcc-arm-none.md5sum] = "299ebd3f1c2c90930d28ab82e5d8d6c0"
+SRC_URI[gcc-arm-none.sha256sum] = "bb17109f0ee697254a5d4ae6e5e01440e3ea8f0277f2e8169bf95d07c7d5fe69"
+
+S = "${WORKDIR}/gcc-arm-none-eabi-7-2018-q2-update"
+
+# only x86_64 is supported
+COMPATIBLE_HOST = "x86_64.*-linux"
+COMPATIBLE_HOST_class-target = "null"
+
+do_install() {
+    install -d ${D}${GCC_ARM_NONE_TOOLCHAIN_RECIPE}
+    cp -r ${S}/. ${D}${GCC_ARM_NONE_TOOLCHAIN_RECIPE}
+}
+
+FILES_${PN} = "${GCC_ARM_NONE_TOOLCHAIN_RECIPE}/*"
+
+INSANE_SKIP_${PN} = "already-stripped libdir staticdev build-deps file-rdeps"
+INHIBIT_PACKAGE_DEBUG_SPLIT = "1"
+
+BBCLASSEXTEND = "native nativesdk"
--- a/recipes-ti/devtools/gcc-arm-none-eabi_9-2019-q4-major.bb
+++ b/recipes-ti/devtools/gcc-arm-none-eabi_9-2019-q4-major.bb
@@ -1,39 +0,0 @@
-# Copyright (C) 2019 Garmin Ltd. or its subsidiaries
-# Released under the MIT license (see COPYING.MIT for the terms)
-
-SUMMARY = "Baremetal GCC for ARM-R and ARM-M processors"
-LICENSE = "GPL-3.0-with-GCC-exception & GPLv3"
-
-LIC_FILES_CHKSUM = "file://share/doc/gcc-arm-none-eabi/license.txt;md5=c18349634b740b7b95f2c2159af888f5"
-
-PROVIDES = "virtual/arm-none-eabi-gcc"
-
-SRC_URI = "https://developer.arm.com/-/media/Files/downloads/gnu-rm/9-2019q4/${BPN}-${PV}-x86_64-linux.tar.bz2"
-
-SRC_URI[md5sum] = "fe0029de4f4ec43cf7008944e34ff8cc"
-SRC_URI[sha256sum] = "bcd840f839d5bf49279638e9f67890b2ef3a7c9c7a9b25271e83ec4ff41d177a"
-
-S = "${WORKDIR}/${BPN}-${PV}"
-
-COMPATIBLE_HOST = "x86_64.*-linux"
-
-do_install() {
-    install -d ${D}${datadir}/arm-none-eabi/
-    cp -r ${S}/. ${D}${datadir}/arm-none-eabi/
-
-    install -d ${D}${bindir}
-    # Symlink all executables into bindir
-    for f in ${D}${datadir}/arm-none-eabi/bin/arm-none-eabi-*; do
-        lnr $f ${D}${bindir}/$(basename $f)
-    done
-}
-
-FILES_${PN} = "${datadir} ${bindir}"
-
-INSANE_SKIP_${PN} = "already-stripped libdir staticdev file-rdeps"
-
-INHIBIT_SYSROOT_STRIP = "1"
-INHIBIT_PACKAGE_STRIP = "1"
-INHIBIT_PACKAGE_DEBUG_SPLIT = "1"
-
-BBCLASSEXTEND = "native nativesdk"
--- a/recipes-ti/devtools/gcc-linaro-baremetal-aarch64-native.bb
+++ b/recipes-ti/devtools/gcc-linaro-baremetal-aarch64-native.bb
@@ -0,0 +1,23 @@
+include recipes-ti/devtools/gcc-linaro.inc
+
+PACKAGE_DIR = "gcc-linaro-${PV}-${GCC_ARM_YEAR}-x86_64_aarch64-elf"
+S = "${WORKDIR}/${PACKAGE_DIR}"
+
+LIC_CHKSUM = "bc7fad4bba98e7a4cd5ab3042506493c"
+
+inherit native
+require recipes-ti/includes/ti-paths.inc
+
+SRC_URI = "https://releases.linaro.org/components/toolchain/binaries/7.2-${GCC_ARM_YEAR}/aarch64-elf/gcc-linaro-${PV}-${GCC_ARM_YEAR}-x86_64_aarch64-elf.tar.xz;name=gcc-linaro-aarch64"
+
+SRC_URI[gcc-linaro-aarch64.md5sum] = "4972f8943820bdd2f577f498de78964b"
+SRC_URI[gcc-linaro-aarch64.sha256sum] = "30fb7d876bcb982c502057c593d9c1f11b35d5158a26d986718e2b998388c4c8"
+
+do_install() {
+    install -d ${D}${GCC_LINARO_BAREMETAL_AARCH64_TOOLCHAIN_RECIPE}
+    cp -r ${S}/. ${D}${GCC_LINARO_BAREMETAL_AARCH64_TOOLCHAIN_RECIPE}
+}
+
+FILES_${PN} = "${GCC_LINARO_BAREMETAL_AARCH64_TOOLCHAIN_RECIPE}/*"
+
+INSANE_SKIP_${PN} = "already-stripped"
--- a/recipes-ti/devtools/gcc-linaro-baremetal-native.bb
+++ b/recipes-ti/devtools/gcc-linaro-baremetal-native.bb
@@ -0,0 +1,23 @@
+include recipes-ti/devtools/gcc-linaro.inc
+
+PACKAGE_DIR = "gcc-linaro-${PV}-${GCC_ARM_YEAR}-x86_64_arm-eabi"
+S = "${WORKDIR}/${PACKAGE_DIR}"
+
+LIC_CHKSUM = "bc7fad4bba98e7a4cd5ab3042506493c"
+
+inherit native
+require recipes-ti/includes/ti-paths.inc
+
+SRC_URI = "https://releases.linaro.org/components/toolchain/binaries/7.2-${GCC_ARM_YEAR}/arm-eabi/gcc-linaro-${PV}-${GCC_ARM_YEAR}-x86_64_arm-eabi.tar.xz;name=gcc-linaro"
+
+SRC_URI[gcc-linaro.md5sum] = "9a4a39cfc78c84375b1160aa93587aed"
+SRC_URI[gcc-linaro.sha256sum] = "45fc4f90af2e2e9c3197a275f6005ef5639f7a1889fa3eb24c3125ccd70fcd3d"
+
+do_install() {
+    install -d ${D}${GCC_LINARO_BAREMETAL_TOOLCHAIN_RECIPE}
+    cp -r ${S}/. ${D}${GCC_LINARO_BAREMETAL_TOOLCHAIN_RECIPE}
+}
+
+FILES_${PN} = "${GCC_LINARO_BAREMETAL_TOOLCHAIN_RECIPE}/*"
+
+INSANE_SKIP_${PN} = "already-stripped"
--- a/recipes-ti/devtools/ti-cgt-arm_18.12.5.bb
+++ b/recipes-ti/devtools/ti-cgt-arm_18.12.5.bb
@@ -2,7 +2,7 @@ SUMMARY = "TI ARM Code Generation Tools"
 HOMEPAGE = "https://www-a.ti.com/downloads/sds_support/TICodegenerationTools/download.htm"
 LICENSE = "(TI-TSPA & Thai-Open-Source-Software-Center) & BSD-3-Clause & BSL-1.0 & Patrick-Powell & AFL-3.0 & MIT & BSD-2-Clause & PD & BSD-4-Clause"

-LIC_FILES_CHKSUM = "file://ti-cgt-arm_${PV}.LTS/README.html;md5=9ed980fae072af522545a0e5f297bca0"
+LIC_FILES_CHKSUM = "file://ti-cgt-arm_${PV}.LTS/README.txt;md5=79631eb21b2e5b7190cd3ff1dfd41108"

 require recipes-ti/includes/ti-unpack.inc
 require recipes-ti/includes/ti-staging.inc
@@ -27,7 +27,8 @@ do_install() {
    cp -r ${S}/ti-cgt-arm*/. ${D}${M4_TOOLCHAIN_INSTALL_DIR_RECIPE}
 }

-SRC_URI[cgt_arm_installer.sha256sum] = "e27b1ebae58085b1587af3016bf201b54b6ace99e9e7165c1e4a042afe4b55eb"
+SRC_URI[cgt_arm_installer.md5sum] = "e9e668332cf86c965b4da9d1d488426b"
+SRC_URI[cgt_arm_installer.sha256sum] = "da976143128c619a278cb4214a4295c409d100f9e65ad2f4d0d1039db7cf98f4"

 BINFILE_NAME = "cgt_arm_installer"

--- a/recipes-ti/devtools/ti-cgt6x_8.3.2.bb
+++ b/recipes-ti/devtools/ti-cgt6x_8.3.2.bb
@@ -100,7 +100,6 @@ FILES_${PN} += "${datadir}/ti/*"
 FILES_${PN}-dbg += "${datadir}/ti/cgt-c6x/bin/.debug"

 INSANE_SKIP_${PN} += "staticdev"
-INHIBIT_PACKAGE_STRIP_FILES = "${PKGD}${datadir}/ti/cgt-c6x/lib/libc.a"

 BBCLASSEXTEND = "native nativesdk"

--- a/recipes-ti/devtools/ti-cgt7x_1.2.0.bb
+++ b/recipes-ti/devtools/ti-cgt7x_1.2.0.bb
@@ -8,7 +8,7 @@ libraries and standard header files needed to produce a working DSP application.
 HOMEPAGE = "https://www-a.ti.com/downloads/sds_support/TICodegenerationTools/download.htm"
 LICENSE = "(TI-TSPA & Thai-Open-Source-Software-Center) & BSD-3-Clause & BSL-1.0 & Patrick-Powell & AFL-3.0 & MIT & BSD-2-Clause & PD"

-LIC_FILES_CHKSUM = "file://ti-cgt-c7000_${PV}.STS/C7000_Code_Generation_Tools_1.x_manifest.html;md5=3ee1c9f774004535003f80cb8142bb0f"
+LIC_FILES_CHKSUM = "file://ti-cgt-c7000_${PV}.STS/C7000_Code_Generation_Tools_1.x_manifest.html;md5=f1156d241d104c281bc64a6ec8eadc64"

 require recipes-ti/includes/ti-unpack.inc
 require recipes-ti/includes/ti-paths.inc
@@ -25,7 +25,8 @@ SRC_URI = "http://software-dl.ti.com/codegen/esd/cgt_public_sw/C7000/${PV}.STS/$
 TI_BIN_UNPK_ARGS = "--prefix ${S}"
 TI_BIN_UNPK_CMDS = ""

-SRC_URI[cgt7x_x86_installer.sha256sum] = "24071fe0369e55af80e334852cda7fa78b64ae79a411c57ac6995470a7a23694"
+SRC_URI[cgt7x_x86_installer.md5sum]    = "813840908f333dd2a31f92edec71c1fb"
+SRC_URI[cgt7x_x86_installer.sha256sum] = "21379811a8857489f72ca8ec45a46eb086ced0bdbb58e78f73a86e63984ab2f5"

 S = "${WORKDIR}/c7000_${PV}"

@@ -34,9 +35,10 @@ do_install() {
    cp -rP --preserve=mode,links,timestamps --no-preserve=ownership ${WORKDIR}/c7000_${PV}/ti-cgt-c7000_${PV}.STS/. ${D}/${TI_CGT7X_INSTALL_DIR_RECIPE}
 }

+
 FILES_${PN} += "${TI_CGT7X_INSTALL_DIR_RECIPE}"

-INSANE_SKIP_${PN} += "arch staticdev textrel file-rdeps"
+INSANE_SKIP_${PN} += "arch staticdev textrel"

 INHIBIT_PACKAGE_STRIP = "1"
 INHIBIT_SYSROOT_STRIP = "1"
--- a/recipes-ti/devtools/ti-xdctools-common.inc
+++ b/recipes-ti/devtools/ti-xdctools-common.inc
@@ -60,8 +60,6 @@ libjvm.so \
 libhpi.so \
 lib.so \
 libcairo.so.2 \
-libjli.so \
-libawt_xawt.so \
 "

 COMPATIBLE_HOST ?= "null"
--- a/recipes-ti/devtools/ti-xdctools/arm-linker-hack.diff
+++ b/recipes-ti/devtools/ti-xdctools/arm-linker-hack.diff
@@ -0,0 +1,19 @@
+--- a/packages/gnu/targets/arm/linkcmd.xdt	2010-12-30 19:33:53.000000000 +0100
+++ b/packages/gnu/targets/arm/linkcmd.xdt	2010-12-30 19:42:55.000000000 +0100
+@@ -40,12 +40,13 @@
+ 
+ %if ("BINVERS" in prog.build.target) {
+ %    var _utils = xdc.loadCapsule("gnu/targets/linkUtils.xs");
+%    if (prog.build.target.GCCVERS < "4.3.3") {
+ SECTIONS {
+ `_utils.genSections(prog)`
+ }
+-
+-%    if (!prog.build.target.noStdLinkScript
+-%        && prog.build.target.BINVERS >= "2.19") {
+%    }
+%    if (prog.build.target.noStdLinkScript
+%        && prog.build.target.BINVERS >= "2.19") {
+ INSERT BEFORE .gnu.attributes
+ %    }
+ 
--- a/recipes-ti/devtools/ti-xdctools/fix-hardcoded-paths.diff
+++ b/recipes-ti/devtools/ti-xdctools/fix-hardcoded-paths.diff
@@ -0,0 +1,21 @@
+diff -ur a/packages/gnu/targets/ITarget.xs b/packages/gnu/targets/ITarget.xs
+--- a/packages/gnu/targets/ITarget.xs	2011-08-06 13:24:44.000000000 +0200
+++ b/packages/gnu/targets/ITarget.xs	2011-08-06 13:23:37.000000000 +0200
+@@ -251,7 +251,7 @@
+ 
+     function askLd(target)
+     {
+-        var ldCmd = target.rootDir + "/" + target.GCCTARG + "/bin/ld";
+        var ldCmd = target.rootDir + "/" + target.GCCTARG + "-ld";
+         /* If the ld executable cannot be found, and the prefix is not used,
+          * it's probably a misspelled directory path.
+          */
+@@ -486,7 +486,7 @@
+     tool2cmd["link"] = cmd;
+ 
+     /* define the ar command template */
+-    cmd  = prefix + target.ar.cmd
+    cmd  = prefix + target.GCCTARG + "-ar"
+         + " $(AROPTS_P) " + target.ar.opts
+         + " $@ $(AROPTS_S) $(aropts) $(files)";
+     tool2cmd["ar"] = cmd;
--- a/recipes-ti/devtools/ti-xdctools_3.55.02.22.bb
+++ b/recipes-ti/devtools/ti-xdctools_3.55.02.22.bb
@@ -0,0 +1,9 @@
+require recipes-ti/devtools/ti-xdctools-core.inc
+
+PV = "3_55_02_22"
+PR = "r0"
+
+LIC_FILES_CHKSUM = "file://docs/license/xdc/shelf/package.html;beginline=1;endline=140;md5=2e742b9757bc9ce0241aadba9f627ab8"
+
+SRC_URI[xdczip.md5sum] = "bb9154d677ce4724a5eac73817b23a0f"
+SRC_URI[xdczip.sha256sum] = "bf90dfbbe298458c736d81d5631db25b335e79146923a4a50fab217e02723e7b"
--- a/recipes-ti/devtools/ti-xdctools_3.61.00.16.bb
+++ b/recipes-ti/devtools/ti-xdctools_3.61.00.16.bb
@@ -1,7 +0,0 @@
-require recipes-ti/devtools/ti-xdctools-core.inc
-
-PV = "3_61_00_16"
-
-LIC_FILES_CHKSUM = "file://docs/license/xdc/shelf/package.html;beginline=1;endline=140;md5=2e742b9757bc9ce0241aadba9f627ab8"
-
-SRC_URI[xdczip.sha256sum] = "19caf6d5ff412d48c11ba1c05b543e39f5d678203407e5f659ff306b274e7606"
--- a/recipes-ti/engine-pkcs11/engine-pkcs11_git.bb
+++ b/recipes-ti/engine-pkcs11/engine-pkcs11_git.bb
@@ -0,0 +1,22 @@
+DESCRIPTION = "OpenSSL PKCS11 engine"
+LICENSE = "BSD"
+LIC_FILES_CHKSUM = "file://src/engine_pkcs11.h;startline=1;endline=26;md5=471dacb7f0586e35729f422b8098585f"
+SECTION = "libs"
+
+inherit autotools pkgconfig
+
+DEPENDS = "openssl libtool libp11"
+
+COMPATIBLE_MACHINE = "keystone"
+
+BRANCH = "master"
+
+PV = "1.3.0.1"
+# Commit corresponds to DEV.ENGINE_PKCS11-01.03.00.01
+SRCREV = "56ac060e2245907a442376d586924af26ed7e478"
+
+SRC_URI = "git://git.ti.com/keystone-linux/engine-pkcs11.git;protocol=git;branch=${BRANCH}"
+S = "${WORKDIR}/git"
+
+FILES_${PN} += "${libdir}/engines/*.so*"
+FILES_${PN}-dbg += "${libdir}/engines/.debug"
--- a/recipes-ti/includes/ti-paths.inc
+++ b/recipes-ti/includes/ti-paths.inc
@@ -48,7 +48,7 @@ export XDC_INSTALL_DIR_RECIPE        = "${installdir}/ti-xdctools-tree"
 export PDK_INSTALL_DIR_RECIPE        = "${installdir}/ti-pdk-tree"
 export OSAL_INSTALL_DIR_RECIPE       = "${installdir}/ti-osal-tree"
 export M4_TOOLCHAIN_INSTALL_DIR_RECIPE    = "${installdir}/ti-cgt-arm"
-export GCC_ARM_NONE_TOOLCHAIN_RECIPE      = "${datadir}/arm-none-eabi"
+export GCC_ARM_NONE_TOOLCHAIN_RECIPE      = "${installdir}/gcc-arm-none-eabi"
 export TI_CGT_PRU_INSTALL_DIR_RECIPE      = "${installdir}/cgt-pru"
 export MATHLIB_C66_INSTALL_DIR_RECIPE     = "${installdir}/ti-mathlib-c66x-tree"
 export MATHLIB_C674_INSTALL_DIR_RECIPE    = "${installdir}/ti-mathlib-c674x-tree"
@@ -58,8 +58,8 @@ export CG_XML_INSTALL_DIR_RECIPE     = "${installdir}/ti-cg-xml-tree"
 export OMP_INSTALL_DIR_RECIPE        = "${installdir}/ti-omp-tree"
 export MPM_INSTALL_DIR_RECIPE        = "${installdir}/ti-mpm-tree"
 export TI_CGT6X_7_INSTALL_DIR_RECIPE   = "${installdir}/cgt6x-7"
-export GCC_LINARO_BAREMETAL_TOOLCHAIN_RECIPE          = "${datadir}/arm-none-eabi"
-export GCC_LINARO_BAREMETAL_AARCH64_TOOLCHAIN_RECIPE  = "${datadir}/aarch64-none-elf"
+export GCC_LINARO_BAREMETAL_TOOLCHAIN_RECIPE          = "${installdir}/gcc-linaro-baremetal"
+export GCC_LINARO_BAREMETAL_AARCH64_TOOLCHAIN_RECIPE  = "${installdir}/gcc-linaro-baremetal-aarch64"
 export TI_CGT7X_INSTALL_DIR_RECIPE        = "${installdir}/cgt-c7x"


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