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

This reverts commit 6bca11098b.

README

@@ -8,11 +8,7 @@ This layer depends on:
 
 URI: git://git.openembedded.org/openembedded-core
 layers: meta
-branch: dunfell
-
-URI: git://git.yoctoproject.org/meta-arm
-layers: meta-arm
-branch: dunfell
+branch: zeus
 
 
 The base BSP part of meta-ti should work with different OpenEmbedded/Yocto
@@ -22,12 +18,8 @@ distro-less (only with OE-Core), with Yocto/Poky, with Angstrom or Arago.
 Please follow the recommended setup procedures of your OE distribution.
 
 
-Send pull requests, patches, comments or questions to:
-meta-ti@lists.yoctoproject.org
-
+Send pull requests, patches, comments or questions to meta-ti@yoctoproject.org
 Please note - meta-ti mailing list requires subscription for posting:
 https://lists.yoctoproject.org/g/meta-ti
 
-Maintainers:
-Dan Murphy <dmurphy@ti.com>
-Denys Dmytriyenko <denys@ti.com>
+Maintainers: Denys Dmytriyenko <denys@ti.com>

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 ?= "a1ace885998e9adbcbbd0abf8b9ded6ba9ec54ff"
+TI_PDK_SRCREV ?= "9c04a8f4ac2ed95100ee50163b3189d28b9680f1"
 
-TI_PDK_VERSION ?= "2020.5.6"
+TI_PDK_VERSION ?= "2020.4.16"
 
 PV = "${TI_PDK_VERSION}"
-PE = "2"
 
 TI_PDK_COMP ?= ""
 TI_PDK_COMP_PATH = "${@'${TI_PDK_COMP}'.replace('.','/')}"
@@ -15,7 +14,7 @@ TI_PDK_SOURCE_PN = "ti-pdk-source"
 TI_PDK_SOURCE_WORKDIR = "${TMPDIR}/work-shared/ti-pdk-${PV}"
 TI_PDK_SOURCE = "${TI_PDK_SOURCE_WORKDIR}/git"
 
-S = "${@'${WORKDIR}/git/${TI_PDK_COMP_PATH}'.rstrip('/')}"
+S = "${WORKDIR}/git/${TI_PDK_COMP_PATH}"
 
 # Hard-link only required sources from PDK
 python do_unpack_append() {

classes/ti-pdk.bbclass

@@ -3,16 +3,16 @@ require recipes-ti/includes/ti-staging.inc
 
 inherit perlnative
 
-DEPENDS = "ti-xdctools-native ti-cg-xml-native ti-sysbios common-csl-ip-rtos libxml-simple-perl-native gcc-arm-baremetal-native ti-cgt6x-native ti-cgt-pru-native ti-pdk-build-rtos doxygen-native"
+DEPENDS = "ti-xdctools-native ti-cg-xml-native ti-sysbios common-csl-ip-rtos libxml-simple-perl-native gcc-arm-none-eabi-native ti-cgt6x-native ti-cgt-pru-native ti-pdk-build-rtos doxygen-native"
 
 DEPENDS_append_omap-a15 = " ti-cgt-arm-native"
 DEPENDS_remove_ti33x = "ti-cgt6x-native"
 DEPENDS_remove_ti43x = "ti-cgt6x-native"
 DEPENDS_append_omapl1 = " ti-cgt-arm-native"
-DEPENDS_remove_am65xx = "gcc-arm-baremetal-native ti-cgt6x-native"
+DEPENDS_remove_am65xx = "gcc-arm-none-eabi-native ti-cgt6x-native"
 DEPENDS_append_am65xx = " ti-cgt-arm-native gcc-linaro-baremetal-aarch64-native"
-DEPENDS_remove_j7 = "gcc-arm-baremetal-native"
-DEPENDS_append_j7 = " ti-cgt-arm-native gcc-linaro-baremetal-aarch64-native ti-cgt7x-native"
+DEPENDS_remove_j7-evm = "gcc-arm-none-eabi-native"
+DEPENDS_append_j7-evm = " ti-cgt-arm-native gcc-linaro-baremetal-aarch64-native ti-cgt7x-native"
 
 S = "${WORKDIR}/git"
 B = "${WORKDIR}/build"

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 \

conf/machine/am437x-hs-evm.conf

@@ -13,6 +13,6 @@ UBOOT_RD_ENTRYPOINT = "0x84000000"
 
 TI_SECURE_DEV_PKG = "${TI_SECURE_DEV_PKG_CAT}/am4x"
 
-OPTEEMACHINE = "ti-am43xx"
+OPTEEMACHINE = "ti"
 OPTEEFLAVOR = "am43xx"
 OPTEEOUTPUTMACHINE = "ti"

conf/machine/am57xx-hs-evm.conf

@@ -13,7 +13,7 @@ UBOOT_RD_ENTRYPOINT = "0x84000000"
 
 TI_SECURE_DEV_PKG = "${TI_SECURE_DEV_PKG_AUTO}/am5x"
 
-OPTEEMACHINE = "ti-am57xx"
+OPTEEMACHINE = "ti"
 OPTEEFLAVOR = "am57xx"
 OPTEEOUTPUTMACHINE = "ti"
 OPTEEPAGER = "y"

conf/machine/am64xx-evm-k3r5.conf

@@ -1,14 +0,0 @@
-#@TYPE: Machine
-#@NAME: AM64xx EVM (R5F)
-#@DESCRIPTION: Machine configuration for the TI AM64xx EVM (R5F core)
-
-require conf/machine/include/k3r5.inc
-
-SYSFW_SOC = "am64x"
-SYSFW_CONFIG = "evm"
-SYSFW_SUFFIX = "gp"
-
-UBOOT_MACHINE = "am64x_evm_r5_defconfig"
-UBOOT_BINARY = "tiboot3.${UBOOT_SUFFIX}"
-UBOOT_IMAGE = "tiboot3-${MAINMACHINE}-${PV}-${PR}.${UBOOT_SUFFIX}"
-UBOOT_SYMLINK = "tiboot3-${MAINMACHINE}.${UBOOT_SUFFIX}"

conf/machine/am64xx-evm.conf

@@ -1,15 +0,0 @@
-#@TYPE: Machine
-#@NAME: AM64xx EVM
-#@DESCRIPTION: Machine configuration for the TI AM64xx EVM
-
-require conf/machine/include/am64xx.inc
-
-IMAGE_BOOT_FILES = "tispl.bin u-boot.img"
-
-UBOOT_MACHINE = "am64x_evm_a53_defconfig"
-
-do_image_wic[depends] += "trusted-firmware-a:do_deploy"
-do_image_tar[depends] += "trusted-firmware-a:do_deploy"
-
-do_image_wic[mcdepends] = "mc::k3r5:ti-sci-fw:do_deploy"
-do_image_tar[mcdepends] = "mc::k3r5:ti-sci-fw:do_deploy"

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"

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"

conf/machine/am65xx-evm.conf

@@ -4,4 +4,22 @@
 
 require conf/machine/include/am65xx.inc
 
+MACHINE_FEATURES += "touchscreen"
+
+SERIAL_CONSOLES = "115200;ttyS2 115200;ttyS1"
+SERIAL_CONSOLES_CHECK = "${SERIAL_CONSOLES}"
+
+KERNEL_DEVICETREE = " \
+    ti/k3-am654-base-board.dtb ti/k3-am654-gp.dtbo \
+    ti/k3-am654-evm-hdmi.dtbo ti/k3-am654-idk.dtbo \
+    ti/k3-am654-evm-oldi-lcd1evm.dtbo ti/k3-am654-evm-tc358876.dtbo \
+    ti/k3-am654-pcie-usb2.dtbo ti/k3-am654-pcie-usb3.dtbo \
+    ti/k3-am654-base-board-jailhouse.dtbo \
+    ti/k3-am654-evm-prupwm.dtbo \
+"
+
 UBOOT_MACHINE = "am65x_evm_a53_defconfig"
+
+OPTEEMACHINE = "k3"
+OPTEEFLAVOR = "am65x"
+OPTEEOUTPUTMACHINE = "k3"

conf/machine/am65xx-hs-evm-k3r5-sr2.conf

@@ -1,11 +0,0 @@
-#@TYPE: Machine
-#@NAME: AM65xx SR2.0 HS EVM (R5F)
-#@DESCRIPTION: Machine configuration for the TI AM65xx SR2.0 HS EVM (R5F core)
-
-# Booting SR2 requires different SYSFW, the rest is handled at runtime
-
-require conf/machine/am65xx-hs-evm-k3r5.conf
-SOC_FAMILY_append = ":k3r5-sr2"
-
-SYSFW_SOC = "am65x_sr2"
-SYSFW_SYMLINK = "sysfw.itb"

conf/machine/am65xx-hs-evm-k3r5.conf

@@ -1,14 +0,0 @@
-#@TYPE: Machine
-#@NAME: AM65xx HS EVM (R5F)
-#@DESCRIPTION: Machine configuration for the TI AM65xx HS EVM (R5F core)
-
-require conf/machine/include/k3r5.inc
-
-SYSFW_SOC = "am65x"
-SYSFW_CONFIG = "evm"
-SYSFW_SUFFIX = "hs"
-SYSFW_SYMLINK = ""
-
-UBOOT_MACHINE = "am65x_hs_evm_r5_defconfig"
-
-TI_SECURE_DEV_PKG = "${TI_SECURE_DEV_PKG_K3}"

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"

conf/machine/dra7xx-hs-evm.conf

@@ -13,7 +13,7 @@ UBOOT_RD_ENTRYPOINT = "0x84000000"
 
 TI_SECURE_DEV_PKG = "${TI_SECURE_DEV_PKG_AUTO}/dra7"
 
-OPTEEMACHINE = "ti-dra7xx"
+OPTEEMACHINE = "ti"
 OPTEEFLAVOR = "dra7xx"
 OPTEEOUTPUTMACHINE = "ti"
 OPTEEPAGER = "y"

conf/machine/include/am64xx.inc

@@ -1,20 +0,0 @@
-require conf/machine/include/k3.inc
-SOC_FAMILY_append = ":am64xx"
-
-MACHINE_FEATURES += "screen touchscreen"
-
-SERIAL_CONSOLES = "115200;ttyS2 115200;ttyS1"
-SERIAL_CONSOLES_CHECK = "${SERIAL_CONSOLES}"
-
-KERNEL_DEVICETREE = " \
-    ti/k3-am642-evm.dtb \
-"
-
-TFA_BOARD = "lite"
-OPTEEMACHINE = "k3-am65x"
-OPTEEOUTPUTMACHINE = "k3"
-
-# Set the list of device targets for ti-pdk class recipes
-TI_PDK_LIMIT_SOCS = "am64x"
-TI_PDK_LIMIT_BOARDS = "am64x_evm"
-TI_PDK_LIMIT_CORES = "mcu1_0 mpu1_0 mcu1_1 mcu2_0 mcu2_1"

conf/machine/include/am65xx.inc

@@ -1,35 +1,6 @@
 require conf/machine/include/k3.inc
 SOC_FAMILY_append = ":am65xx"
 
-MACHINE_FEATURES += "screen touchscreen gpu"
-
-SERIAL_CONSOLES = "115200;ttyS2 115200;ttyS1"
-SERIAL_CONSOLES_CHECK = "${SERIAL_CONSOLES}"
-
-KERNEL_DEVICETREE = " \
-    ti/k3-am654-base-board.dtb \
-    ti/k3-am654-base-board-sr1.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 \
-"
-
-BBMULTICONFIG += "k3r5-sr2"
-
-IMAGE_BOOT_FILES += "sysfw-am65x-evm.itb"
-do_image_wic[mcdepends] += "mc::k3r5-sr2:ti-sci-fw:do_deploy"
-do_image_tar[mcdepends] += "mc::k3r5-sr2:ti-sci-fw:do_deploy"
-
-OPTEEMACHINE = "k3-am65x"
-OPTEEOUTPUTMACHINE = "k3"
-
 # Set the list of device targets for ti-pdk class recipes
 TI_PDK_LIMIT_SOCS = "am65xx"
 TI_PDK_LIMIT_BOARDS = "am65xx_evm am65xx_idk"

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"
 

conf/machine/include/j7.inc

@@ -1,10 +0,0 @@
-require conf/machine/include/k3.inc
-SOC_FAMILY_append = ":j7"
-
-OPTEEMACHINE = "k3-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"

conf/machine/include/k3.inc

@@ -1,16 +1,12 @@
-# TI K3 Aarch64 profile for Cortex-A53/A72 cores
-
 require conf/machine/include/ti-soc.inc
 SOC_FAMILY_append = ":k3"
 
 require conf/machine/include/arm/arch-arm64.inc
 
-BBMULTICONFIG += "k3r5"
-
 # Increase this everytime you change something in the kernel
 MACHINE_KERNEL_PR = "r0"
 
-PREFERRED_PROVIDER_virtual/kernel ?= "linux-ti-staging"
+PREFERRED_PROVIDER_virtual/kernel = "linux-ti-staging"
 PREFERRED_PROVIDER_virtual/bootloader = "u-boot-ti-staging"
 PREFERRED_PROVIDER_u-boot = "u-boot-ti-staging"
 
@@ -26,9 +22,6 @@ UBOOT_SUFFIX = "img"
 
 EXTRA_IMAGEDEPENDS += "virtual/bootloader"
 
-TFA_PLATFORM = "k3"
-TFA_BOARD = "generic"
-
 MACHINE_GUI_CLASS = "smallscreen"
 
 # Use the expected value of the ubifs filesystem's volume name in the kernel
@@ -36,12 +29,14 @@ MACHINE_GUI_CLASS = "smallscreen"
 UBI_VOLNAME = "rootfs"
 
 # List common SoC features, may need to add touchscreen for specific machines
-MACHINE_FEATURES = "kernel26 apm usbgadget usbhost vfat ext2 alsa ethernet pci"
+MACHINE_FEATURES = "kernel26 apm usbgadget usbhost vfat ext2 screen alsa ethernet pci gpu"
+# Not ready yet - dsp mmip
 
 IMAGE_FSTYPES += "tar.xz wic.xz"
 
-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"

conf/machine/include/k3r5.inc

@@ -1,24 +0,0 @@
-# TI K3 Armv7 profile for Cortex-R5F cores
-
-require conf/machine/include/ti-soc.inc
-SOC_FAMILY_append = ":k3r5"
-
-# The closest of existing tunes for Cortex-R5F
-DEFAULTTUNE = "armv7athf"
-require conf/machine/include/tune-cortexa8.inc
-
-# R5 runs early bootloader and loads SYSFW
-# https://git.ti.com/cgit/ti-u-boot/ti-u-boot/tree/board/ti/am65x/README
-# https://git.ti.com/cgit/ti-u-boot/ti-u-boot/tree/board/ti/j721e/README
-PREFERRED_PROVIDER_virtual/kernel = "linux-dummy"
-PREFERRED_PROVIDER_virtual/bootloader = "u-boot-ti-staging"
-PREFERRED_PROVIDER_u-boot = "u-boot-ti-staging"
-
-SPL_BINARY = ""
-UBOOT_SUFFIX = "bin"
-UBOOT_BINARY = "tiboot3.${UBOOT_SUFFIX}"
-UBOOT_IMAGE = "tiboot3-${MAINMACHINE}-${PV}-${PR}.${UBOOT_SUFFIX}"
-UBOOT_SYMLINK = "tiboot3-${MAINMACHINE}.${UBOOT_SUFFIX}"
-
-PACKAGECONFIG_pn-u-boot-ti-staging = ""
-PACKAGECONFIG_pn-u-boot-ti-mainline = ""

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"
 

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"

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"
 

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"
 

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"

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"

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"

conf/machine/j7-evm.conf

@@ -2,9 +2,7 @@
 #@NAME: J7 EVM
 #@DESCRIPTION: Machine configuration for the TI J7 EVM
 
-require conf/machine/include/j7.inc
-
-MACHINE_FEATURES += "gpu"
+require conf/machine/include/k3.inc
 
 SERIAL_CONSOLES = "115200;ttyS2 115200;ttyS3"
 SERIAL_CONSOLES_CHECK = "${SERIAL_CONSOLES}"
@@ -18,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"

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

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

conf/machine/j7200-evm-k3r5.conf

@@ -1,14 +0,0 @@
-#@TYPE: Machine
-#@NAME: J7200 EVM (R5F)
-#@DESCRIPTION: Machine configuration for the TI J7200 EVM (R5F core)
-
-require conf/machine/include/k3r5.inc
-
-SYSFW_SOC = "j7200"
-SYSFW_CONFIG = "evm"
-SYSFW_SUFFIX = "gp"
-
-UBOOT_MACHINE = "j7200_evm_r5_defconfig"
-UBOOT_BINARY = "tiboot3.${UBOOT_SUFFIX}"
-UBOOT_IMAGE = "tiboot3-${MAINMACHINE}-${PV}-${PR}.${UBOOT_SUFFIX}"
-UBOOT_SYMLINK = "tiboot3-${MAINMACHINE}.${UBOOT_SUFFIX}"

conf/machine/j7200-evm.conf

@@ -1,23 +0,0 @@
-#@TYPE: Machine
-#@NAME: J7200 EVM
-#@DESCRIPTION: Machine configuration for the TI J7200 EVM
-
-require conf/machine/include/j7.inc
-
-SERIAL_CONSOLES = "115200;ttyS2 115200;ttyS3"
-SERIAL_CONSOLES_CHECK = "${SERIAL_CONSOLES}"
-
-KERNEL_DEVICETREE = " \
-    ti/k3-j7200-common-proc-board.dtb \
-    ti/k3-j7200-common-proc-board-jailhouse.dtbo \
-"
-
-UBOOT_MACHINE = "j7200_evm_a72_config"
-
-IMAGE_BOOT_FILES = "tispl.bin u-boot.img"
-
-do_image_wic[depends] += "trusted-firmware-a:do_deploy"
-do_image_tar[depends] += "trusted-firmware-a:do_deploy"
-
-do_image_wic[mcdepends] = "mc::k3r5:ti-sci-fw:do_deploy"
-do_image_tar[mcdepends] = "mc::k3r5:ti-sci-fw:do_deploy"

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"

conf/multiconfig/k3r5-sr2.conf

@@ -1,3 +0,0 @@
-require k3r5.conf
-
-MACHINE_append = "-sr2"

conf/multiconfig/k3r5.conf

@@ -1,5 +0,0 @@
-MAINMACHINE := "${MACHINE}"
-
-DEPLOY_DIR_IMAGE = "${DEPLOY_DIR}/images/${MAINMACHINE}"
-
-MACHINE_append = "-k3r5"

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"

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"

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

recipes-bsp/boot-monitor/boot-monitor_git.bb

@@ -15,7 +15,7 @@ BRANCH = "master"
 
 S = "${WORKDIR}/git"
 
-SRCREV = "d57d5c1d8f0b0b1487484d9ceb1595bd4507231a"
+SRCREV = "e1f885ab6dc544884728e333cc6e396f7eb08286"
 
 BOOT_MONITOR_IMAGE  ?= "skern-${BOOT_MONITOR_MAKE_TARGET}.bin"
 

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

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

@@ -6,7 +6,7 @@ COMPATIBLE_MACHINE = "keystone|dra7xx|ti33x|ti43x|omapl1"
 
 PV = "03.03.00.17B"
 INC_PR = "r0"
-PE = "2"
+PE = "1"
 
 CSL_GIT_URI = "git://git.ti.com/keystone-rtos/common-csl-ip.git"
 CSL_GIT_PROTOCOL ="git"
@@ -14,7 +14,7 @@ CSL_GIT_BRANCH = "release"
 CSL_GIT_DESTSUFFIX = "git"
 
 # Below commit ID corresponding to "DEV.CSL_PROCESSOR-SDK.03.03.00.17B"
-CSL_SRCREV = "027d26031709ad6a0e9f84625d11a3419e486467"
+CSL_SRCREV = "a5a9200fe11575a4eff965d87cb968c5f3377e9f"
 
 BRANCH="${CSL_GIT_BRANCH}"
 SRC_URI = "${CSL_GIT_URI};protocol=${CSL_GIT_PROTOCOL};branch=${BRANCH};destsuffix=${CSL_GIT_DESTSUFFIX}"

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

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"

recipes-bsp/cpsw9g-eth-fw/cpsw9g-eth-fw_git.bb

@@ -11,7 +11,7 @@ inherit update-alternatives
 
 PROTOCOL = "git"
 BRANCH = "master"
-SRCREV = "91f1628507bf7f8716f0bc7cafe88ad7f14c94f5"
+SRCREV = "4da71504488450f34d65459c1de949da1f984471"
 
 SRC_URI = "git://git.ti.com/glsdk/ti-eth-fw.git;protocol=${PROTOCOL};branch=${BRANCH}"
 

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"

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"

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"
 

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

@@ -3,7 +3,7 @@ require recipes-ti/includes/ti-paths.inc
 
 PR = "${INC_PR}.1"
 
-DEPENDS = "ti-sysbios ti-xdctools-native gcc-arm-baremetal-native ti-cgt-arm-native ti-cgt6x-native"
+DEPENDS = "ti-sysbios ti-xdctools-native gcc-arm-none-eabi-native ti-cgt-arm-native ti-cgt6x-native"
 
 COMPATIBLE_MACHINE = "ti33x|ti43x|omap-a15|keystone|c66x|omapl1"
 PACKAGE_ARCH = "${MACHINE_ARCH}"

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"

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

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"

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

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"

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

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

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

@@ -1,15 +1,19 @@
-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"
 
@@ -18,7 +22,7 @@ SRCREV = "df4c50aecc9aad7ab3eb1ca9ebacfe473fcad7c5"
 S = "${WORKDIR}/git"
 
 PV = "3.00.15.00"
-PR = "r7"
+PR = "r5"
 
 require recipes-ti/includes/ti-paths.inc
 

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"

recipes-bsp/osal/osal.inc

@@ -12,4 +12,3 @@ PE = "1"
 
 INC_PR = "r0"
 
-INHIBIT_PACKAGE_STRIP_FILES = "${PKGD}${libdir}/libosal.a"

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

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"

recipes-bsp/powervr-drivers/ti-img-rogue-driver/0001-km-support-general-toolchain.patch

@@ -0,0 +1,56 @@
+From dbdbd9309a58ee723fc827ef5fd45c28347cf61f Mon Sep 17 00:00:00 2001
+From: Eric Ruei <e-ruei1@ti.com>
+Date: Tue, 7 May 2019 17:06:09 -0400
+Subject: [PATCH] km: support general toolchain
+
+This is a patch from IMG to support general toolchains such as
+aarch64-oe-linux-gnu, aarch64-poky-linux-gnu, arm-none-linux-gnueabi
+per IMG ticket 122059
+
+Signed-off-by: Eric Ruei <e-ruei1@ti.com>
+Signed-off-by: Denys Dmytriyenko <denys@ti.com>
+---
+ build/linux/config/compiler.mk        | 12 +++++++++++-
+ .../build/linux/config/compilers/arm-linux-gnueabi.mk       |  6 ++++++
+ 2 files changed, 17 insertions(+), 1 deletion(-)
+ create mode 100644 build/linux/config/compilers/arm-linux-gnueabi.mk
+
+diff --git a/build/linux/config/compiler.mk b/build/linux/config/compiler.mk
+index 82c9d44..dead2f9 100644
+--- a/build/linux/config/compiler.mk
++++ b/build/linux/config/compiler.mk
+@@ -48,13 +48,14 @@ define calculate-compiler-preferred-target
+  ifeq ($(2),qcc)
+   $(1)_compiler_preferred_target := qcc
+  else
+-  $(1)_compiler_preferred_target := $$(subst --,-,$$(shell $(2) -dumpmachine))
++  $(1)_compiler_preferred_target := $$(subst --,-,$$(subst unknown,,$$(shell $(2) -dumpmachine)))
+   ifeq ($$($(1)_compiler_preferred_target),)
+    $$(warning No output from '$(2) -dumpmachine')
+    $$(warning Check that the compiler is in your PATH and CROSS_COMPILE is)
+    $$(warning set correctly.)
+    $$(error Unable to run compiler '$(2)')
+   endif
++  $$(warning $(1) $(2))
+   ifneq ($$(filter %-w64-mingw32,$$($(1)_compiler_preferred_target)),)
+    # Use the compiler target name.
+   else
+@@ -64,6 +65,15 @@ define calculate-compiler-preferred-target
+    ifneq ($$(filter arm-linux-android,$$($(1)_compiler_preferred_target)),)
+     $(1)_compiler_preferred_target := arm-linux-androideabi
+    endif
++  ifneq ($$(filter aarch64-%,$$($(1)_compiler_preferred_target)),)
++   $(1)_compiler_preferred_target := aarch64-linux-gnu
++  endif
++  ifneq ($$(filter arm-%-gnueabi armv7a-cros-linux-gnueabi armv7hl-redhat-linux-gnueabi,$$($(1)_compiler_preferred_target)),)
++   $(1)_compiler_preferred_target := arm-linux-gnueabi
++  endif
++  ifneq ($$(filter arm-%-gnueabihf,$$($(1)_compiler_preferred_target)),)
++   $(1)_compiler_preferred_target := arm-linux-gnueabihf
++  endif
+    ifneq ($$(filter clang%,$(2)),)
+     ifeq ($(1),target)
+      ifeq (arm-linux-gnueabihf,$$(CROSS_TRIPLE))
+-- 
+2.7.4
+

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
+inherit module
 
-REQUIRED_MACHINE_FEATURES = "gpu"
-
-MACHINE_KERNEL_PR_append = "g"
+MACHINE_KERNEL_PR_append = "f"
 PR = "${MACHINE_KERNEL_PR}"
 
 PACKAGE_ARCH = "${MACHINE_ARCH}"
-COMPATIBLE_MACHINE = "j7"
+COMPATIBLE_MACHINE = "j7-evm"
 
 DEPENDS = "virtual/kernel"
 
@@ -19,11 +17,12 @@ PROVIDES = "virtual/gpudriver"
 
 BRANCH = "linuxws/zeus/k5.4/${PV}"
 
-SRC_URI = "git://git.ti.com/graphics/ti-img-rogue-driver.git;branch=${BRANCH}"
-
+SRC_URI = "git://git.ti.com/graphics/ti-img-rogue-driver.git;branch=${BRANCH} \
+    file://0001-km-support-general-toolchain.patch \
+"
 S = "${WORKDIR}/git"
 
-SRCREV = "f58bea1084c5004f129943a53b94ee1446e9c3a7"
+SRCREV = "e0bc128ee5098e30c9fb096634ba6bec01b5fc17"
 
 PVR_SOC = "j721e_linux"
 PVR_BVNC = "22.104.208.318"

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"
 

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}
@@ -53,7 +53,7 @@ do_compile() {
 
 do_install() {
     CP_ARGS="-Prf --preserve=mode,timestamps --no-preserve=ownership"
-    install -d ${D}${base_libdir}/firmware/pru
+    install -d ${D}/lib/firmware/pru
     install -d ${D}${includedir}
     cp ${CP_ARGS} ${S}/include/* ${D}${includedir}
     install -d ${D}${libdir}
@@ -65,49 +65,49 @@ FILES_${PN}-dev = "${includedir}"
 
 do_install_append_ti33x() {
     install -m 644 ${S}/examples/${PLATFORM}/PRU_Halt/gen/PRU_Halt.out \
-                   ${D}${base_libdir}/firmware/pru
+                   ${D}/lib/firmware/pru
     for i in 0 1
     do
         install -m 0644 ${S}/examples/am335x/PRU_RPMsg_Echo_Interrupt${i}/gen/PRU_RPMsg_Echo_Interrupt${i}.out \
-                        ${D}${base_libdir}/firmware/pru
+                        ${D}/lib/firmware/pru
     done
 }
 
 do_install_append_ti43x() {
     install -m 644 ${S}/examples/${PLATFORM}/PRU_Halt/gen/PRU_Halt.out \
-                   ${D}${base_libdir}/firmware/pru
+                   ${D}/lib/firmware/pru
     for i in 0 1
     do
         for j in 0 1
         do
             install -m 0644 ${S}/examples/am437x/PRU_RPMsg_Echo_Interrupt${i}_${j}/gen/PRU_RPMsg_Echo_Interrupt${i}_${j}.out \
-                            ${D}${base_libdir}/firmware/pru
+                            ${D}/lib/firmware/pru
         done
     done
 }
 
 do_install_append_omap-a15() {
     install -m 644 ${S}/examples/${PLATFORM}/PRU_Halt/gen/PRU_Halt.out \
-                   ${D}${base_libdir}/firmware/pru
+                   ${D}/lib/firmware/pru
     for i in 1 2
     do
         for j in 0 1
         do
             install -m 0644 ${S}/examples/am572x/PRU_RPMsg_Echo_Interrupt${i}_${j}/gen/PRU_RPMsg_Echo_Interrupt${i}_${j}.out \
-                            ${D}${base_libdir}/firmware/pru
+                            ${D}/lib/firmware/pru
         done
     done
 }
 
 do_install_append_k2g() {
     install -m 644 ${S}/examples/${PLATFORM}/PRU_Halt/gen/PRU_Halt.out \
-                   ${D}${base_libdir}/firmware/pru
+                   ${D}/lib/firmware/pru
     for i in 0 1
     do
         for j in 0 1
         do
             install -m 0644 ${S}/examples/k2g/PRU_RPMsg_Echo_Interrupt${i}_${j}/gen/PRU_RPMsg_Echo_Interrupt${i}_${j}.out \
-                            ${D}${base_libdir}/firmware/pru
+                            ${D}/lib/firmware/pru
         done
     done
 }
@@ -116,51 +116,49 @@ do_install_append_am65xx() {
     for i in 0 1 
     do
         install -m 644 ${S}/examples/${PLATFORM}/PRU_Halt/gen/PRU${i}/PRU_Halt_${i}.out \
-                   ${D}${base_libdir}/firmware/pru
+                   ${D}/lib/firmware/pru
         install -m 644 ${S}/examples/${PLATFORM}/RTU_Halt/gen/RTU${i}/RTU_Halt_${i}.out \
-                   ${D}${base_libdir}/firmware/pru
-        install -m 644 ${S}/examples/${PLATFORM}/TX_PRU_Halt/gen/TX_PRU${i}/TX_PRU_Halt_${i}.out \
-                   ${D}${base_libdir}/firmware/pru
+                   ${D}/lib/firmware/pru
     done
     for i in 0 1 2
     do
         for j in 0 1
         do
             install -m 0644 ${S}/examples/am65x/PRU_RPMsg_Echo_Interrupt${j}/gen/icssg${i}/PRU_RPMsg_Echo_Interrupt${i}_${j}.out \
-                            ${D}${base_libdir}/firmware/pru
+                            ${D}/lib/firmware/pru
             install -m 0644 ${S}/examples/am65x/RTU_RPMsg_Echo_Interrupt${j}/gen/icssg${i}/RTU_RPMsg_Echo_Interrupt${i}_${j}.out \
-                            ${D}${base_libdir}/firmware/pru
+                            ${D}/lib/firmware/pru
 
         done
     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 \
-                   ${D}${base_libdir}/firmware/pru
+                   ${D}/lib/firmware/pru
         install -m 644 ${S}/examples/${PLATFORM}/RTU_Halt/gen/RTU${i}/RTU_Halt_${i}.out \
-                   ${D}${base_libdir}/firmware/pru
+                   ${D}/lib/firmware/pru
         install -m 644 ${S}/examples/${PLATFORM}/TX_PRU_Halt/gen/TX_PRU${i}/TX_PRU_Halt_${i}.out \
-                   ${D}${base_libdir}/firmware/pru
+                   ${D}/lib/firmware/pru
     done
     for i in 0 1
     do
         for j in 0 1
         do
             install -m 0644 ${S}/examples/j721e/PRU_RPMsg_Echo_Interrupt${j}/gen/icssg${i}/PRU_RPMsg_Echo_Interrupt${i}_${j}.out \
-                            ${D}${base_libdir}/firmware/pru
+                            ${D}/lib/firmware/pru
             install -m 0644 ${S}/examples/j721e/RTU_RPMsg_Echo_Interrupt${j}/gen/icssg${i}/RTU_RPMsg_Echo_Interrupt${i}_${j}.out \
-                            ${D}${base_libdir}/firmware/pru
+                            ${D}/lib/firmware/pru
 
         done
     done
 }
 
 
-FILES_${PN}-halt = "${base_libdir}/firmware/pru/PRU_Halt* ${base_libdir}/firmware/pru/RTU_Halt* ${base_libdir}/firmware/pru/TX_PRU_Halt*"
-FILES_${PN}-rpmsg-echo = "${base_libdir}/firmware/pru/PRU_RPMsg_Echo_Interrupt* ${base_libdir}/firmware/pru/RTU_RPMsg_Echo_Interrupt*"
+FILES_${PN}-halt = "/lib/firmware/pru/PRU_Halt* /lib/firmware/pru/RTU_Halt* /lib/firmware/pru/TX_PRU_Halt*"
+FILES_${PN}-rpmsg-echo = "/lib/firmware/pru/PRU_RPMsg_Echo_Interrupt* /lib/firmware/pru/RTU_RPMsg_Echo_Interrupt*"
 
 # Set up names for the firmwares
 PRU_ICSS_ALTERNATIVES_ti33x    = "am335x-pru0-fw am335x-pru1-fw"
@@ -168,115 +166,102 @@ 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] = "${base_libdir}/firmware/am335x-pru0-fw"
-ALTERNATIVE_LINK_NAME[am335x-pru1-fw] = "${base_libdir}/firmware/am335x-pru1-fw"
+ALTERNATIVE_LINK_NAME[am335x-pru0-fw] = "/lib/firmware/am335x-pru0-fw"
+ALTERNATIVE_LINK_NAME[am335x-pru1-fw] = "/lib/firmware/am335x-pru1-fw"
 
-ALTERNATIVE_LINK_NAME[am437x-pru0_0-fw] = "${base_libdir}/firmware/am437x-pru0_0-fw"
-ALTERNATIVE_LINK_NAME[am437x-pru0_1-fw] = "${base_libdir}/firmware/am437x-pru0_1-fw"
-ALTERNATIVE_LINK_NAME[am437x-pru1_0-fw] = "${base_libdir}/firmware/am437x-pru1_0-fw"
-ALTERNATIVE_LINK_NAME[am437x-pru1_1-fw] = "${base_libdir}/firmware/am437x-pru1_1-fw"
+ALTERNATIVE_LINK_NAME[am437x-pru0_0-fw] = "/lib/firmware/am437x-pru0_0-fw"
+ALTERNATIVE_LINK_NAME[am437x-pru0_1-fw] = "/lib/firmware/am437x-pru0_1-fw"
+ALTERNATIVE_LINK_NAME[am437x-pru1_0-fw] = "/lib/firmware/am437x-pru1_0-fw"
+ALTERNATIVE_LINK_NAME[am437x-pru1_1-fw] = "/lib/firmware/am437x-pru1_1-fw"
 
-ALTERNATIVE_LINK_NAME[am57xx-pru1_0-fw] = "${base_libdir}/firmware/am57xx-pru1_0-fw"
-ALTERNATIVE_LINK_NAME[am57xx-pru1_1-fw] = "${base_libdir}/firmware/am57xx-pru1_1-fw"
-ALTERNATIVE_LINK_NAME[am57xx-pru2_0-fw] = "${base_libdir}/firmware/am57xx-pru2_0-fw"
-ALTERNATIVE_LINK_NAME[am57xx-pru2_1-fw] = "${base_libdir}/firmware/am57xx-pru2_1-fw"
+ALTERNATIVE_LINK_NAME[am57xx-pru1_0-fw] = "/lib/firmware/am57xx-pru1_0-fw"
+ALTERNATIVE_LINK_NAME[am57xx-pru1_1-fw] = "/lib/firmware/am57xx-pru1_1-fw"
+ALTERNATIVE_LINK_NAME[am57xx-pru2_0-fw] = "/lib/firmware/am57xx-pru2_0-fw"
+ALTERNATIVE_LINK_NAME[am57xx-pru2_1-fw] = "/lib/firmware/am57xx-pru2_1-fw"
 
-ALTERNATIVE_LINK_NAME[k2g-pru0_0-fw] = "${base_libdir}/firmware/k2g-pru0_0-fw"
-ALTERNATIVE_LINK_NAME[k2g-pru0_1-fw] = "${base_libdir}/firmware/k2g-pru0_1-fw"
-ALTERNATIVE_LINK_NAME[k2g-pru1_0-fw] = "${base_libdir}/firmware/k2g-pru1_0-fw"
-ALTERNATIVE_LINK_NAME[k2g-pru1_1-fw] = "${base_libdir}/firmware/k2g-pru1_1-fw"
+ALTERNATIVE_LINK_NAME[k2g-pru0_0-fw] = "/lib/firmware/k2g-pru0_0-fw"
+ALTERNATIVE_LINK_NAME[k2g-pru0_1-fw] = "/lib/firmware/k2g-pru0_1-fw"
+ALTERNATIVE_LINK_NAME[k2g-pru1_0-fw] = "/lib/firmware/k2g-pru1_0-fw"
+ALTERNATIVE_LINK_NAME[k2g-pru1_1-fw] = "/lib/firmware/k2g-pru1_1-fw"
 
-ALTERNATIVE_LINK_NAME[am65x-pru0_0-fw] = "${base_libdir}/firmware/am65x-pru0_0-fw"
-ALTERNATIVE_LINK_NAME[am65x-pru0_1-fw] = "${base_libdir}/firmware/am65x-pru0_1-fw"
-ALTERNATIVE_LINK_NAME[am65x-pru1_0-fw] = "${base_libdir}/firmware/am65x-pru1_0-fw"
-ALTERNATIVE_LINK_NAME[am65x-pru1_1-fw] = "${base_libdir}/firmware/am65x-pru1_1-fw"
-ALTERNATIVE_LINK_NAME[am65x-pru2_0-fw] = "${base_libdir}/firmware/am65x-pru2_0-fw"
-ALTERNATIVE_LINK_NAME[am65x-pru2_1-fw] = "${base_libdir}/firmware/am65x-pru2_1-fw"
-ALTERNATIVE_LINK_NAME[am65x-rtu0_0-fw] = "${base_libdir}/firmware/am65x-rtu0_0-fw"
-ALTERNATIVE_LINK_NAME[am65x-rtu0_1-fw] = "${base_libdir}/firmware/am65x-rtu0_1-fw"
-ALTERNATIVE_LINK_NAME[am65x-rtu1_0-fw] = "${base_libdir}/firmware/am65x-rtu1_0-fw"
-ALTERNATIVE_LINK_NAME[am65x-rtu1_1-fw] = "${base_libdir}/firmware/am65x-rtu1_1-fw"
-ALTERNATIVE_LINK_NAME[am65x-rtu2_0-fw] = "${base_libdir}/firmware/am65x-rtu2_0-fw"
-ALTERNATIVE_LINK_NAME[am65x-rtu2_1-fw] = "${base_libdir}/firmware/am65x-rtu2_1-fw"
-ALTERNATIVE_LINK_NAME[am65x-txpru0_0-fw] = "${base_libdir}/firmware/am65x-txpru0_0-fw"
-ALTERNATIVE_LINK_NAME[am65x-txpru0_1-fw] = "${base_libdir}/firmware/am65x-txpru0_1-fw"
-ALTERNATIVE_LINK_NAME[am65x-txpru1_0-fw] = "${base_libdir}/firmware/am65x-txpru1_0-fw"
-ALTERNATIVE_LINK_NAME[am65x-txpru1_1-fw] = "${base_libdir}/firmware/am65x-txpru1_1-fw"
-ALTERNATIVE_LINK_NAME[am65x-txpru2_0-fw] = "${base_libdir}/firmware/am65x-txpru2_0-fw"
-ALTERNATIVE_LINK_NAME[am65x-txpru2_1-fw] = "${base_libdir}/firmware/am65x-txpru2_1-fw"
+ALTERNATIVE_LINK_NAME[am65x-pru0_0-fw] = "/lib/firmware/am65x-pru0_0-fw"
+ALTERNATIVE_LINK_NAME[am65x-pru0_1-fw] = "/lib/firmware/am65x-pru0_1-fw"
+ALTERNATIVE_LINK_NAME[am65x-pru1_0-fw] = "/lib/firmware/am65x-pru1_0-fw"
+ALTERNATIVE_LINK_NAME[am65x-pru1_1-fw] = "/lib/firmware/am65x-pru1_1-fw"
+ALTERNATIVE_LINK_NAME[am65x-pru2_0-fw] = "/lib/firmware/am65x-pru2_0-fw"
+ALTERNATIVE_LINK_NAME[am65x-pru2_1-fw] = "/lib/firmware/am65x-pru2_1-fw"
+ALTERNATIVE_LINK_NAME[am65x-rtu0_0-fw] = "/lib/firmware/am65x-rtu0_0-fw"
+ALTERNATIVE_LINK_NAME[am65x-rtu0_1-fw] = "/lib/firmware/am65x-rtu0_1-fw"
+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[j7-pru0_0-fw] = "${base_libdir}/firmware/j7-pru0_0-fw"
-ALTERNATIVE_LINK_NAME[j7-pru0_1-fw] = "${base_libdir}/firmware/j7-pru0_1-fw"
-ALTERNATIVE_LINK_NAME[j7-pru1_0-fw] = "${base_libdir}/firmware/j7-pru1_0-fw"
-ALTERNATIVE_LINK_NAME[j7-pru1_1-fw] = "${base_libdir}/firmware/j7-pru1_1-fw"
-ALTERNATIVE_LINK_NAME[j7-rtu0_0-fw] = "${base_libdir}/firmware/j7-rtu0_0-fw"
-ALTERNATIVE_LINK_NAME[j7-rtu0_1-fw] = "${base_libdir}/firmware/j7-rtu0_1-fw"
-ALTERNATIVE_LINK_NAME[j7-rtu1_0-fw] = "${base_libdir}/firmware/j7-rtu1_0-fw"
-ALTERNATIVE_LINK_NAME[j7-rtu1_1-fw] = "${base_libdir}/firmware/j7-rtu1_1-fw"
-ALTERNATIVE_LINK_NAME[j7-txpru0_0-fw] = "${base_libdir}/firmware/j7-txpru0_0-fw"
-ALTERNATIVE_LINK_NAME[j7-txpru0_1-fw] = "${base_libdir}/firmware/j7-txpru0_1-fw"
-ALTERNATIVE_LINK_NAME[j7-txpru1_0-fw] = "${base_libdir}/firmware/j7-txpru1_0-fw"
-ALTERNATIVE_LINK_NAME[j7-txpru1_1-fw] = "${base_libdir}/firmware/j7-txpru1_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"
+ALTERNATIVE_LINK_NAME[j7-pru1_0-fw] = "/lib/firmware/j7-pru1_0-fw"
+ALTERNATIVE_LINK_NAME[j7-pru1_1-fw] = "/lib/firmware/j7-pru1_1-fw"
+ALTERNATIVE_LINK_NAME[j7-rtu0_0-fw] = "/lib/firmware/j7-rtu0_0-fw"
+ALTERNATIVE_LINK_NAME[j7-rtu0_1-fw] = "/lib/firmware/j7-rtu0_1-fw"
+ALTERNATIVE_LINK_NAME[j7-rtu1_0-fw] = "/lib/firmware/j7-rtu1_0-fw"
+ALTERNATIVE_LINK_NAME[j7-rtu1_1-fw] = "/lib/firmware/j7-rtu1_1-fw"
+ALTERNATIVE_LINK_NAME[j7-txpru0_0-fw] = "/lib/firmware/j7-txpru0_0-fw"
+ALTERNATIVE_LINK_NAME[j7-txpru0_1-fw] = "/lib/firmware/j7-txpru0_1-fw"
+ALTERNATIVE_LINK_NAME[j7-txpru1_0-fw] = "/lib/firmware/j7-txpru1_0-fw"
+ALTERNATIVE_LINK_NAME[j7-txpru1_1-fw] = "/lib/firmware/j7-txpru1_1-fw"
 
 # Create the pru-icss-halt firmware alternatives
 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] = "${base_libdir}/firmware/pru/PRU_Halt.out"
-ALTERNATIVE_TARGET_pru-icss-halt[am335x-pru1-fw] = "${base_libdir}/firmware/pru/PRU_Halt.out"
+ALTERNATIVE_TARGET_pru-icss-halt[am335x-pru0-fw] = "/lib/firmware/pru/PRU_Halt.out"
+ALTERNATIVE_TARGET_pru-icss-halt[am335x-pru1-fw] = "/lib/firmware/pru/PRU_Halt.out"
 
-ALTERNATIVE_TARGET_pru-icss-halt[am437x-pru0_0-fw] = "${base_libdir}/firmware/pru/PRU_Halt.out"
-ALTERNATIVE_TARGET_pru-icss-halt[am437x-pru0_1-fw] = "${base_libdir}/firmware/pru/PRU_Halt.out"
-ALTERNATIVE_TARGET_pru-icss-halt[am437x-pru1_0-fw] = "${base_libdir}/firmware/pru/PRU_Halt.out"
-ALTERNATIVE_TARGET_pru-icss-halt[am437x-pru1_1-fw] = "${base_libdir}/firmware/pru/PRU_Halt.out"
+ALTERNATIVE_TARGET_pru-icss-halt[am437x-pru0_0-fw] = "/lib/firmware/pru/PRU_Halt.out"
+ALTERNATIVE_TARGET_pru-icss-halt[am437x-pru0_1-fw] = "/lib/firmware/pru/PRU_Halt.out"
+ALTERNATIVE_TARGET_pru-icss-halt[am437x-pru1_0-fw] = "/lib/firmware/pru/PRU_Halt.out"
+ALTERNATIVE_TARGET_pru-icss-halt[am437x-pru1_1-fw] = "/lib/firmware/pru/PRU_Halt.out"
 
-ALTERNATIVE_TARGET_pru-icss-halt[am57xx-pru1_0-fw] = "${base_libdir}/firmware/pru/PRU_Halt.out"
-ALTERNATIVE_TARGET_pru-icss-halt[am57xx-pru1_1-fw] = "${base_libdir}/firmware/pru/PRU_Halt.out"
-ALTERNATIVE_TARGET_pru-icss-halt[am57xx-pru2_0-fw] = "${base_libdir}/firmware/pru/PRU_Halt.out"
-ALTERNATIVE_TARGET_pru-icss-halt[am57xx-pru2_1-fw] = "${base_libdir}/firmware/pru/PRU_Halt.out"
+ALTERNATIVE_TARGET_pru-icss-halt[am57xx-pru1_0-fw] = "/lib/firmware/pru/PRU_Halt.out"
+ALTERNATIVE_TARGET_pru-icss-halt[am57xx-pru1_1-fw] = "/lib/firmware/pru/PRU_Halt.out"
+ALTERNATIVE_TARGET_pru-icss-halt[am57xx-pru2_0-fw] = "/lib/firmware/pru/PRU_Halt.out"
+ALTERNATIVE_TARGET_pru-icss-halt[am57xx-pru2_1-fw] = "/lib/firmware/pru/PRU_Halt.out"
 
-ALTERNATIVE_TARGET_pru-icss-halt[k2g-pru0_0-fw] = "${base_libdir}/firmware/pru/PRU_Halt.out"
-ALTERNATIVE_TARGET_pru-icss-halt[k2g-pru0_1-fw] = "${base_libdir}/firmware/pru/PRU_Halt.out"
-ALTERNATIVE_TARGET_pru-icss-halt[k2g-pru1_0-fw] = "${base_libdir}/firmware/pru/PRU_Halt.out"
-ALTERNATIVE_TARGET_pru-icss-halt[k2g-pru1_1-fw] = "${base_libdir}/firmware/pru/PRU_Halt.out"
+ALTERNATIVE_TARGET_pru-icss-halt[k2g-pru0_0-fw] = "/lib/firmware/pru/PRU_Halt.out"
+ALTERNATIVE_TARGET_pru-icss-halt[k2g-pru0_1-fw] = "/lib/firmware/pru/PRU_Halt.out"
+ALTERNATIVE_TARGET_pru-icss-halt[k2g-pru1_0-fw] = "/lib/firmware/pru/PRU_Halt.out"
+ALTERNATIVE_TARGET_pru-icss-halt[k2g-pru1_1-fw] = "/lib/firmware/pru/PRU_Halt.out"
 
-ALTERNATIVE_TARGET_pru-icss-halt[am65x-pru0_0-fw] = "${base_libdir}/firmware/pru/PRU_Halt_0.out"
-ALTERNATIVE_TARGET_pru-icss-halt[am65x-pru0_1-fw] = "${base_libdir}/firmware/pru/PRU_Halt_1.out"
-ALTERNATIVE_TARGET_pru-icss-halt[am65x-pru1_0-fw] = "${base_libdir}/firmware/pru/PRU_Halt_0.out"
-ALTERNATIVE_TARGET_pru-icss-halt[am65x-pru1_1-fw] = "${base_libdir}/firmware/pru/PRU_Halt_1.out"
-ALTERNATIVE_TARGET_pru-icss-halt[am65x-pru2_0-fw] = "${base_libdir}/firmware/pru/PRU_Halt_0.out"
-ALTERNATIVE_TARGET_pru-icss-halt[am65x-pru2_1-fw] = "${base_libdir}/firmware/pru/PRU_Halt_1.out"
-ALTERNATIVE_TARGET_pru-icss-halt[am65x-rtu0_0-fw] = "${base_libdir}/firmware/pru/RTU_Halt_0.out"
-ALTERNATIVE_TARGET_pru-icss-halt[am65x-rtu0_1-fw] = "${base_libdir}/firmware/pru/RTU_Halt_1.out"
-ALTERNATIVE_TARGET_pru-icss-halt[am65x-rtu1_0-fw] = "${base_libdir}/firmware/pru/RTU_Halt_0.out"
-ALTERNATIVE_TARGET_pru-icss-halt[am65x-rtu1_1-fw] = "${base_libdir}/firmware/pru/RTU_Halt_1.out"
-ALTERNATIVE_TARGET_pru-icss-halt[am65x-rtu2_0-fw] = "${base_libdir}/firmware/pru/RTU_Halt_0.out"
-ALTERNATIVE_TARGET_pru-icss-halt[am65x-rtu2_1-fw] = "${base_libdir}/firmware/pru/RTU_Halt_1.out"
-ALTERNATIVE_TARGET_pru-icss-halt[am65x-txpru0_0-fw] = "${base_libdir}/firmware/pru/TX_PRU_Halt_0.out"
-ALTERNATIVE_TARGET_pru-icss-halt[am65x-txpru0_1-fw] = "${base_libdir}/firmware/pru/TX_PRU_Halt_1.out"
-ALTERNATIVE_TARGET_pru-icss-halt[am65x-txpru1_0-fw] = "${base_libdir}/firmware/pru/TX_PRU_Halt_0.out"
-ALTERNATIVE_TARGET_pru-icss-halt[am65x-txpru1_1-fw] = "${base_libdir}/firmware/pru/TX_PRU_Halt_1.out"
-ALTERNATIVE_TARGET_pru-icss-halt[am65x-txpru2_0-fw] = "${base_libdir}/firmware/pru/TX_PRU_Halt_0.out"
-ALTERNATIVE_TARGET_pru-icss-halt[am65x-txpru2_1-fw] = "${base_libdir}/firmware/pru/TX_PRU_Halt_1.out"
+ALTERNATIVE_TARGET_pru-icss-halt[am65x-pru0_0-fw] = "/lib/firmware/pru/PRU_Halt_0.out"
+ALTERNATIVE_TARGET_pru-icss-halt[am65x-pru0_1-fw] = "/lib/firmware/pru/PRU_Halt_1.out"
+ALTERNATIVE_TARGET_pru-icss-halt[am65x-pru1_0-fw] = "/lib/firmware/pru/PRU_Halt_0.out"
+ALTERNATIVE_TARGET_pru-icss-halt[am65x-pru1_1-fw] = "/lib/firmware/pru/PRU_Halt_1.out"
+ALTERNATIVE_TARGET_pru-icss-halt[am65x-pru2_0-fw] = "/lib/firmware/pru/PRU_Halt_0.out"
+ALTERNATIVE_TARGET_pru-icss-halt[am65x-pru2_1-fw] = "/lib/firmware/pru/PRU_Halt_1.out"
+ALTERNATIVE_TARGET_pru-icss-halt[am65x-rtu0_0-fw] = "/lib/firmware/pru/RTU_Halt_0.out"
+ALTERNATIVE_TARGET_pru-icss-halt[am65x-rtu0_1-fw] = "/lib/firmware/pru/RTU_Halt_1.out"
+ALTERNATIVE_TARGET_pru-icss-halt[am65x-rtu1_0-fw] = "/lib/firmware/pru/RTU_Halt_0.out"
+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[j7-pru0_0-fw] = "${base_libdir}/firmware/pru/PRU_Halt_0.out"
-ALTERNATIVE_TARGET_pru-icss-halt[j7-pru0_1-fw] = "${base_libdir}/firmware/pru/PRU_Halt_1.out"
-ALTERNATIVE_TARGET_pru-icss-halt[j7-pru1_0-fw] = "${base_libdir}/firmware/pru/PRU_Halt_0.out"
-ALTERNATIVE_TARGET_pru-icss-halt[j7-pru1_1-fw] = "${base_libdir}/firmware/pru/PRU_Halt_1.out"
-ALTERNATIVE_TARGET_pru-icss-halt[j7-rtu0_0-fw] = "${base_libdir}/firmware/pru/RTU_Halt_0.out"
-ALTERNATIVE_TARGET_pru-icss-halt[j7-rtu0_1-fw] = "${base_libdir}/firmware/pru/RTU_Halt_1.out"
-ALTERNATIVE_TARGET_pru-icss-halt[j7-rtu1_0-fw] = "${base_libdir}/firmware/pru/RTU_Halt_0.out"
-ALTERNATIVE_TARGET_pru-icss-halt[j7-rtu1_1-fw] = "${base_libdir}/firmware/pru/RTU_Halt_1.out"
-ALTERNATIVE_TARGET_pru-icss-halt[j7-txpru0_0-fw] = "${base_libdir}/firmware/pru/TX_PRU_Halt_0.out"
-ALTERNATIVE_TARGET_pru-icss-halt[j7-txpru0_1-fw] = "${base_libdir}/firmware/pru/TX_PRU_Halt_1.out"
-ALTERNATIVE_TARGET_pru-icss-halt[j7-txpru1_0-fw] = "${base_libdir}/firmware/pru/TX_PRU_Halt_0.out"
-ALTERNATIVE_TARGET_pru-icss-halt[j7-txpru1_1-fw] = "${base_libdir}/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"
+ALTERNATIVE_TARGET_pru-icss-halt[j7-pru1_0-fw] = "/lib/firmware/pru/PRU_Halt_0.out"
+ALTERNATIVE_TARGET_pru-icss-halt[j7-pru1_1-fw] = "/lib/firmware/pru/PRU_Halt_1.out"
+ALTERNATIVE_TARGET_pru-icss-halt[j7-rtu0_0-fw] = "/lib/firmware/pru/RTU_Halt_0.out"
+ALTERNATIVE_TARGET_pru-icss-halt[j7-rtu0_1-fw] = "/lib/firmware/pru/RTU_Halt_1.out"
+ALTERNATIVE_TARGET_pru-icss-halt[j7-rtu1_0-fw] = "/lib/firmware/pru/RTU_Halt_0.out"
+ALTERNATIVE_TARGET_pru-icss-halt[j7-rtu1_1-fw] = "/lib/firmware/pru/RTU_Halt_1.out"
+ALTERNATIVE_TARGET_pru-icss-halt[j7-txpru0_0-fw] = "/lib/firmware/pru/TX_PRU_Halt_0.out"
+ALTERNATIVE_TARGET_pru-icss-halt[j7-txpru0_1-fw] = "/lib/firmware/pru/TX_PRU_Halt_1.out"
+ALTERNATIVE_TARGET_pru-icss-halt[j7-txpru1_0-fw] = "/lib/firmware/pru/TX_PRU_Halt_0.out"
+ALTERNATIVE_TARGET_pru-icss-halt[j7-txpru1_1-fw] = "/lib/firmware/pru/TX_PRU_Halt_1.out"
 
 
 ALTERNATIVE_PRIORITY_pru-icss-halt = "50"
@@ -284,45 +269,45 @@ ALTERNATIVE_PRIORITY_pru-icss-halt = "50"
 # Create the pru-icss-rpmsg-echo firmware alternatives
 ALTERNATIVE_pru-icss-rpmsg-echo = "${PRU_ICSS_ALTERNATIVES}"
 
-ALTERNATIVE_TARGET_pru-icss-rpmsg-echo[am335x-pru0-fw] = "${base_libdir}/firmware/pru/PRU_RPMsg_Echo_Interrupt0.out"
-ALTERNATIVE_TARGET_pru-icss-rpmsg-echo[am335x-pru1-fw] = "${base_libdir}/firmware/pru/PRU_RPMsg_Echo_Interrupt1.out"
+ALTERNATIVE_TARGET_pru-icss-rpmsg-echo[am335x-pru0-fw] = "/lib/firmware/pru/PRU_RPMsg_Echo_Interrupt0.out"
+ALTERNATIVE_TARGET_pru-icss-rpmsg-echo[am335x-pru1-fw] = "/lib/firmware/pru/PRU_RPMsg_Echo_Interrupt1.out"
 
-ALTERNATIVE_TARGET_pru-icss-rpmsg-echo[am437x-pru0_0-fw] = "${base_libdir}/firmware/pru/PRU_RPMsg_Echo_Interrupt0_0.out"
-ALTERNATIVE_TARGET_pru-icss-rpmsg-echo[am437x-pru0_1-fw] = "${base_libdir}/firmware/pru/PRU_RPMsg_Echo_Interrupt0_1.out"
-ALTERNATIVE_TARGET_pru-icss-rpmsg-echo[am437x-pru1_0-fw] = "${base_libdir}/firmware/pru/PRU_RPMsg_Echo_Interrupt1_0.out"
-ALTERNATIVE_TARGET_pru-icss-rpmsg-echo[am437x-pru1_1-fw] = "${base_libdir}/firmware/pru/PRU_RPMsg_Echo_Interrupt1_1.out"
+ALTERNATIVE_TARGET_pru-icss-rpmsg-echo[am437x-pru0_0-fw] = "/lib/firmware/pru/PRU_RPMsg_Echo_Interrupt0_0.out"
+ALTERNATIVE_TARGET_pru-icss-rpmsg-echo[am437x-pru0_1-fw] = "/lib/firmware/pru/PRU_RPMsg_Echo_Interrupt0_1.out"
+ALTERNATIVE_TARGET_pru-icss-rpmsg-echo[am437x-pru1_0-fw] = "/lib/firmware/pru/PRU_RPMsg_Echo_Interrupt1_0.out"
+ALTERNATIVE_TARGET_pru-icss-rpmsg-echo[am437x-pru1_1-fw] = "/lib/firmware/pru/PRU_RPMsg_Echo_Interrupt1_1.out"
 
-ALTERNATIVE_TARGET_pru-icss-rpmsg-echo[am57xx-pru1_0-fw] = "${base_libdir}/firmware/pru/PRU_RPMsg_Echo_Interrupt1_0.out"
-ALTERNATIVE_TARGET_pru-icss-rpmsg-echo[am57xx-pru1_1-fw] = "${base_libdir}/firmware/pru/PRU_RPMsg_Echo_Interrupt1_1.out"
-ALTERNATIVE_TARGET_pru-icss-rpmsg-echo[am57xx-pru2_0-fw] = "${base_libdir}/firmware/pru/PRU_RPMsg_Echo_Interrupt2_0.out"
-ALTERNATIVE_TARGET_pru-icss-rpmsg-echo[am57xx-pru2_1-fw] = "${base_libdir}/firmware/pru/PRU_RPMsg_Echo_Interrupt2_1.out"
+ALTERNATIVE_TARGET_pru-icss-rpmsg-echo[am57xx-pru1_0-fw] = "/lib/firmware/pru/PRU_RPMsg_Echo_Interrupt1_0.out"
+ALTERNATIVE_TARGET_pru-icss-rpmsg-echo[am57xx-pru1_1-fw] = "/lib/firmware/pru/PRU_RPMsg_Echo_Interrupt1_1.out"
+ALTERNATIVE_TARGET_pru-icss-rpmsg-echo[am57xx-pru2_0-fw] = "/lib/firmware/pru/PRU_RPMsg_Echo_Interrupt2_0.out"
+ALTERNATIVE_TARGET_pru-icss-rpmsg-echo[am57xx-pru2_1-fw] = "/lib/firmware/pru/PRU_RPMsg_Echo_Interrupt2_1.out"
 
-ALTERNATIVE_TARGET_pru-icss-rpmsg-echo[k2g-pru0_0-fw] = "${base_libdir}/firmware/pru/PRU_RPMsg_Echo_Interrupt0_0.out"
-ALTERNATIVE_TARGET_pru-icss-rpmsg-echo[k2g-pru0_1-fw] = "${base_libdir}/firmware/pru/PRU_RPMsg_Echo_Interrupt0_1.out"
-ALTERNATIVE_TARGET_pru-icss-rpmsg-echo[k2g-pru1_0-fw] = "${base_libdir}/firmware/pru/PRU_RPMsg_Echo_Interrupt1_0.out"
-ALTERNATIVE_TARGET_pru-icss-rpmsg-echo[k2g-pru1_1-fw] = "${base_libdir}/firmware/pru/PRU_RPMsg_Echo_Interrupt1_1.out"
+ALTERNATIVE_TARGET_pru-icss-rpmsg-echo[k2g-pru0_0-fw] = "/lib/firmware/pru/PRU_RPMsg_Echo_Interrupt0_0.out"
+ALTERNATIVE_TARGET_pru-icss-rpmsg-echo[k2g-pru0_1-fw] = "/lib/firmware/pru/PRU_RPMsg_Echo_Interrupt0_1.out"
+ALTERNATIVE_TARGET_pru-icss-rpmsg-echo[k2g-pru1_0-fw] = "/lib/firmware/pru/PRU_RPMsg_Echo_Interrupt1_0.out"
+ALTERNATIVE_TARGET_pru-icss-rpmsg-echo[k2g-pru1_1-fw] = "/lib/firmware/pru/PRU_RPMsg_Echo_Interrupt1_1.out"
 
-ALTERNATIVE_TARGET_pru-icss-rpmsg-echo[am65x-pru0_0-fw] = "${base_libdir}/firmware/pru/PRU_RPMsg_Echo_Interrupt0_0.out"
-ALTERNATIVE_TARGET_pru-icss-rpmsg-echo[am65x-pru0_1-fw] = "${base_libdir}/firmware/pru/PRU_RPMsg_Echo_Interrupt0_1.out"
-ALTERNATIVE_TARGET_pru-icss-rpmsg-echo[am65x-pru1_0-fw] = "${base_libdir}/firmware/pru/PRU_RPMsg_Echo_Interrupt1_0.out"
-ALTERNATIVE_TARGET_pru-icss-rpmsg-echo[am65x-pru1_1-fw] = "${base_libdir}/firmware/pru/PRU_RPMsg_Echo_Interrupt1_1.out"
-ALTERNATIVE_TARGET_pru-icss-rpmsg-echo[am65x-pru2_0-fw] = "${base_libdir}/firmware/pru/PRU_RPMsg_Echo_Interrupt2_0.out"
-ALTERNATIVE_TARGET_pru-icss-rpmsg-echo[am65x-pru2_1-fw] = "${base_libdir}/firmware/pru/PRU_RPMsg_Echo_Interrupt2_1.out"
-ALTERNATIVE_TARGET_pru-icss-rpmsg-echo[am65x-rtu0_0-fw] = "${base_libdir}/firmware/pru/RTU_RPMsg_Echo_Interrupt0_0.out"
-ALTERNATIVE_TARGET_pru-icss-rpmsg-echo[am65x-rtu0_1-fw] = "${base_libdir}/firmware/pru/RTU_RPMsg_Echo_Interrupt0_1.out"
-ALTERNATIVE_TARGET_pru-icss-rpmsg-echo[am65x-rtu1_0-fw] = "${base_libdir}/firmware/pru/RTU_RPMsg_Echo_Interrupt1_0.out"
-ALTERNATIVE_TARGET_pru-icss-rpmsg-echo[am65x-rtu1_1-fw] = "${base_libdir}/firmware/pru/RTU_RPMsg_Echo_Interrupt1_1.out"
-ALTERNATIVE_TARGET_pru-icss-rpmsg-echo[am65x-rtu2_0-fw] = "${base_libdir}/firmware/pru/RTU_RPMsg_Echo_Interrupt2_0.out"
-ALTERNATIVE_TARGET_pru-icss-rpmsg-echo[am65x-rtu2_1-fw] = "${base_libdir}/firmware/pru/RTU_RPMsg_Echo_Interrupt2_1.out"
+ALTERNATIVE_TARGET_pru-icss-rpmsg-echo[am65x-pru0_0-fw] = "/lib/firmware/pru/PRU_RPMsg_Echo_Interrupt0_0.out"
+ALTERNATIVE_TARGET_pru-icss-rpmsg-echo[am65x-pru0_1-fw] = "/lib/firmware/pru/PRU_RPMsg_Echo_Interrupt0_1.out"
+ALTERNATIVE_TARGET_pru-icss-rpmsg-echo[am65x-pru1_0-fw] = "/lib/firmware/pru/PRU_RPMsg_Echo_Interrupt1_0.out"
+ALTERNATIVE_TARGET_pru-icss-rpmsg-echo[am65x-pru1_1-fw] = "/lib/firmware/pru/PRU_RPMsg_Echo_Interrupt1_1.out"
+ALTERNATIVE_TARGET_pru-icss-rpmsg-echo[am65x-pru2_0-fw] = "/lib/firmware/pru/PRU_RPMsg_Echo_Interrupt2_0.out"
+ALTERNATIVE_TARGET_pru-icss-rpmsg-echo[am65x-pru2_1-fw] = "/lib/firmware/pru/PRU_RPMsg_Echo_Interrupt2_1.out"
+ALTERNATIVE_TARGET_pru-icss-rpmsg-echo[am65x-rtu0_0-fw] = "/lib/firmware/pru/RTU_RPMsg_Echo_Interrupt0_0.out"
+ALTERNATIVE_TARGET_pru-icss-rpmsg-echo[am65x-rtu0_1-fw] = "/lib/firmware/pru/RTU_RPMsg_Echo_Interrupt0_1.out"
+ALTERNATIVE_TARGET_pru-icss-rpmsg-echo[am65x-rtu1_0-fw] = "/lib/firmware/pru/RTU_RPMsg_Echo_Interrupt1_0.out"
+ALTERNATIVE_TARGET_pru-icss-rpmsg-echo[am65x-rtu1_1-fw] = "/lib/firmware/pru/RTU_RPMsg_Echo_Interrupt1_1.out"
+ALTERNATIVE_TARGET_pru-icss-rpmsg-echo[am65x-rtu2_0-fw] = "/lib/firmware/pru/RTU_RPMsg_Echo_Interrupt2_0.out"
+ALTERNATIVE_TARGET_pru-icss-rpmsg-echo[am65x-rtu2_1-fw] = "/lib/firmware/pru/RTU_RPMsg_Echo_Interrupt2_1.out"
 
-ALTERNATIVE_TARGET_pru-icss-rpmsg-echo[j7-pru0_0-fw] = "${base_libdir}/firmware/pru/PRU_RPMsg_Echo_Interrupt0_0.out"
-ALTERNATIVE_TARGET_pru-icss-rpmsg-echo[j7-pru0_1-fw] = "${base_libdir}/firmware/pru/PRU_RPMsg_Echo_Interrupt0_1.out"
-ALTERNATIVE_TARGET_pru-icss-rpmsg-echo[j7-pru1_0-fw] = "${base_libdir}/firmware/pru/PRU_RPMsg_Echo_Interrupt1_0.out"
-ALTERNATIVE_TARGET_pru-icss-rpmsg-echo[j7-pru1_1-fw] = "${base_libdir}/firmware/pru/PRU_RPMsg_Echo_Interrupt1_1.out"
-ALTERNATIVE_TARGET_pru-icss-rpmsg-echo[j7-rtu0_0-fw] = "${base_libdir}/firmware/pru/RTU_RPMsg_Echo_Interrupt0_0.out"
-ALTERNATIVE_TARGET_pru-icss-rpmsg-echo[j7-rtu0_1-fw] = "${base_libdir}/firmware/pru/RTU_RPMsg_Echo_Interrupt0_1.out"
-ALTERNATIVE_TARGET_pru-icss-rpmsg-echo[j7-rtu1_0-fw] = "${base_libdir}/firmware/pru/RTU_RPMsg_Echo_Interrupt1_0.out"
-ALTERNATIVE_TARGET_pru-icss-rpmsg-echo[j7-rtu1_1-fw] = "${base_libdir}/firmware/pru/RTU_RPMsg_Echo_Interrupt1_1.out"
+ALTERNATIVE_TARGET_pru-icss-rpmsg-echo[j7-pru0_0-fw] = "/lib/firmware/pru/PRU_RPMsg_Echo_Interrupt0_0.out"
+ALTERNATIVE_TARGET_pru-icss-rpmsg-echo[j7-pru0_1-fw] = "/lib/firmware/pru/PRU_RPMsg_Echo_Interrupt0_1.out"
+ALTERNATIVE_TARGET_pru-icss-rpmsg-echo[j7-pru1_0-fw] = "/lib/firmware/pru/PRU_RPMsg_Echo_Interrupt1_0.out"
+ALTERNATIVE_TARGET_pru-icss-rpmsg-echo[j7-pru1_1-fw] = "/lib/firmware/pru/PRU_RPMsg_Echo_Interrupt1_1.out"
+ALTERNATIVE_TARGET_pru-icss-rpmsg-echo[j7-rtu0_0-fw] = "/lib/firmware/pru/RTU_RPMsg_Echo_Interrupt0_0.out"
+ALTERNATIVE_TARGET_pru-icss-rpmsg-echo[j7-rtu0_1-fw] = "/lib/firmware/pru/RTU_RPMsg_Echo_Interrupt0_1.out"
+ALTERNATIVE_TARGET_pru-icss-rpmsg-echo[j7-rtu1_0-fw] = "/lib/firmware/pru/RTU_RPMsg_Echo_Interrupt1_0.out"
+ALTERNATIVE_TARGET_pru-icss-rpmsg-echo[j7-rtu1_1-fw] = "/lib/firmware/pru/RTU_RPMsg_Echo_Interrupt1_1.out"
 
 ALTERNATIVE_PRIORITY_pru-icss-rpmsg-echo = "100"
 

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 = "02.02.08.02"
-
-CLEANBROKEN = "1"
-
-COMPATIBLE_MACHINE = "am65xx-evm"
-
-PACKAGE_ARCH = "${MACHINE_ARCH}"
-
-SRCREV = "31e626d84a3f8a5dc7175b79440972ce90a23de0"
-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"

recipes-bsp/prueth-fw/prueth-fw_5.5.13.bb

@@ -1,37 +0,0 @@
-SUMMARY = "PRU Ethernet firmware for AM57xx, AM437x and AM335x"
-
-LICENSE = "TI-TFL"
-LIC_FILES_CHKSUM = "file://LICENSE.ti;md5=b5aebf0668bdf95621259288c4a46d76"
-
-PR = "r0"
-
-CLEANBROKEN = "1"
-
-COMPATIBLE_MACHINE = "ti33x|ti43x|am57xx-evm|am57xx-hs-evm"
-
-PACKAGE_ARCH = "${MACHINE_ARCH}"
-
-SRCREV = "0038ff0ecda8dae83c65d454c85776c6a4ef8e63"
-BRANCH ?= "ti-linux-firmware"
-
-SRC_URI = "git://git.ti.com/processor-firmware/ti-linux-firmware.git;protocol=git;branch=${BRANCH}"
-
-S = "${WORKDIR}/git"
-
-TARGET = ""
-TARGET_ti33x = "am335x-pru0-prueth-fw.elf am335x-pru1-prueth-fw.elf"
-TARGET_ti43x = "am437x-pru0-prueth-fw.elf am437x-pru1-prueth-fw.elf"
-TARGET_am57xx-evm = "am57xx-pru0-prueth-fw.elf am57xx-pru1-prueth-fw.elf"
-TARGET_am57xx-hs-evm = "am57xx-pru0-prueth-fw.elf am57xx-pru1-prueth-fw.elf"
-
-do_install() {
-	install -d ${D}${base_libdir}/firmware/ti-pruss
-	for f in ${TARGET}; do
-		install -m 0644 ${S}/ti-pruss/$f ${D}${base_libdir}/firmware/ti-pruss/$f
-	done
-}
-
-
-FILES_${PN} = "${base_libdir}/firmware"
-
-INSANE_SKIP_${PN} = "arch"

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

@@ -0,0 +1,47 @@
+DESCRIPTION = "PRU Ethernet firmware for AM57xx, AM437x, AM335x and K2G"
+
+require recipes-ti/includes/ti-paths.inc
+require recipes-bsp/icss-emac-lld/icss-emac-lld.inc
+
+LICENSE = "TI-TFL"
+LIC_FILES_CHKSUM = "file://icss_dualemac/src/firmware_version.h;beginline=6;endline=53;md5=1f0a640a261059cdcbbcf01e6a739ff3"
+
+PR = "${INC_PR}.0"
+
+TI_PDK_COMP = "ti.drv.icss_emac.firmware"
+
+B = "${S}/icss_dualemac"
+
+COMPATIBLE_MACHINE = "am57xx-evm|am57xx-hs-evm|ti43x|ti33x|k2g"
+
+PACKAGE_ARCH = "${MACHINE_ARCH}"
+
+DEPENDS = "ti-cgt-pru-native"
+
+PRU_VERSION = ""
+PRU_VERSION_ti33x = "REV1"
+PRU_VERSION_ti43x = "REV1"
+PRU_VERSION_am57xx-evm = "REV2"
+PRU_VERSION_am57xx-hs-evm = "REV2"
+PRU_VERSION_k2g = "REV2"
+
+FW_PREFIX = ""
+FW_PREFIX_ti33x = "am335x"
+FW_PREFIX_ti43x = "am437x"
+FW_PREFIX_am57xx-evm = "am57xx"
+FW_PREFIX_am57xx-hs-evm = "am57xx"
+FW_PREFIX_k2g = "k2g"
+
+EXTRA_OEMAKE += "CL_PRU_INSTALL_PATH="${TI_CGT_PRU_INSTALL_DIR}" PRU_VERSION_LIST="${PRU_VERSION}""
+
+do_install() {
+	install -d ${D}${base_libdir}/firmware/ti-pruss
+	install -m 0644 ./elf/${PRU_VERSION}/icss_dualemac_PRU0.elf \
+		${D}${base_libdir}/firmware/ti-pruss/${FW_PREFIX}-pru0-prueth-fw.elf
+	install -m 0644 ./elf/${PRU_VERSION}/icss_dualemac_PRU1.elf \
+		${D}${base_libdir}/firmware/ti-pruss/${FW_PREFIX}-pru1-prueth-fw.elf
+}
+
+FILES_${PN} = "${base_libdir}/firmware"
+
+INSANE_SKIP_${PN} = "arch"

recipes-bsp/pruhsr-fw/pruhsr-fw_2.17.25.bb

@@ -1,37 +0,0 @@
-SUMMARY = "PRU HSR firmware for AM335x/AM437x/AM57xx"
-
-LICENSE = "TI-TFL"
-LIC_FILES_CHKSUM = "file://LICENSE.ti;md5=b5aebf0668bdf95621259288c4a46d76"
-
-PE = "1"
-PR = "r0"
-
-CLEANBROKEN = "1"
-
-COMPATIBLE_MACHINE = "ti33x|ti43x|am57xx-evm|am57xx-hs-evm"
-
-PACKAGE_ARCH = "${MACHINE_ARCH}"
-
-SRCREV = "0038ff0ecda8dae83c65d454c85776c6a4ef8e63"
-BRANCH ?= "ti-linux-firmware"
-
-SRC_URI = "git://git.ti.com/processor-firmware/ti-linux-firmware.git;protocol=git;branch=${BRANCH}"
-
-S = "${WORKDIR}/git"
-
-TARGET = ""
-TARGET_ti33x = "am335x-pru0-pruhsr-fw.elf am335x-pru1-pruhsr-fw.elf"
-TARGET_ti43x = "am437x-pru0-pruhsr-fw.elf am437x-pru1-pruhsr-fw.elf"
-TARGET_am57xx-evm = "am57xx-pru0-pruhsr-fw.elf am57xx-pru1-pruhsr-fw.elf"
-TARGET_am57xx-hs-evm = "am57xx-pru0-pruhsr-fw.elf am57xx-pru1-pruhsr-fw.elf"
-
-do_install() {
-	install -d ${D}${base_libdir}/firmware/ti-pruss
-	for f in ${TARGET}; do
-		install -m 0644 ${S}/ti-pruss/$f ${D}${base_libdir}/firmware/ti-pruss/$f
-	done
-}
-
-FILES_${PN} = "${base_libdir}/firmware"
-
-INSANE_SKIP_${PN} = "arch"

recipes-bsp/pruprp-fw/pruprp-fw_2.17.25.bb

@@ -1,38 +0,0 @@
-SUMMARY = "PRU PRP firmware for AM335x/AM437x/AM57xx"
-
-LICENSE = "TI-TFL"
-LIC_FILES_CHKSUM = "file://LICENSE.ti;md5=b5aebf0668bdf95621259288c4a46d76"
-
-PE = "1"
-PR = "r0"
-
-CLEANBROKEN = "1"
-
-COMPATIBLE_MACHINE = "ti33x|ti43x|am57xx-evm|am57xx-hs-evm"
-
-PACKAGE_ARCH = "${MACHINE_ARCH}"
-
-SRCREV = "0038ff0ecda8dae83c65d454c85776c6a4ef8e63"
-BRANCH ?= "ti-linux-firmware"
-
-SRC_URI = "git://git.ti.com/processor-firmware/ti-linux-firmware.git;protocol=git;branch=${BRANCH}"
-
-S = "${WORKDIR}/git"
-
-TARGET = ""
-TARGET_ti33x = "am335x-pru0-pruprp-fw.elf am335x-pru1-pruprp-fw.elf"
-TARGET_ti43x = "am437x-pru0-pruprp-fw.elf am437x-pru1-pruprp-fw.elf"
-TARGET_am57xx-evm = "am57xx-pru0-pruprp-fw.elf am57xx-pru1-pruprp-fw.elf"
-TARGET_am57xx-hs-evm = "am57xx-pru0-pruprp-fw.elf am57xx-pru1-pruprp-fw.elf"
-
-
-do_install() {
-	install -d ${D}${base_libdir}/firmware/ti-pruss
-	for f in ${TARGET}; do
-		install -m 0644 ${S}/ti-pruss/$f ${D}${base_libdir}/firmware/ti-pruss/$f
-	done
-}
-
-FILES_${PN} = "${base_libdir}/firmware"
-
-INSANE_SKIP_${PN} = "arch"

recipes-bsp/pruss-lld/pruss-lld.inc

@@ -12,4 +12,3 @@ PE = "1"
 
 INC_PR = "r0"
 
-INHIBIT_PACKAGE_STRIP_FILES = "${PKGD}${libdir}/libpruss.a"

recipes-bsp/prusw-fw/prusw-fw_3.2.7.bb

@@ -1,37 +0,0 @@
-SUMMARY = "PRU Switch firmware for AM57xx, AM437x and AM335x"
-
-LICENSE = "TI-TFL"
-LIC_FILES_CHKSUM = "file://LICENSE.ti;md5=b5aebf0668bdf95621259288c4a46d76"
-
-PR = "r0"
-
-CLEANBROKEN = "1"
-
-COMPATIBLE_MACHINE = "ti33x|ti43x|am57xx-evm|am57xx-hs-evm"
-
-PACKAGE_ARCH = "${MACHINE_ARCH}"
-
-SRCREV = "0038ff0ecda8dae83c65d454c85776c6a4ef8e63"
-BRANCH ?= "ti-linux-firmware"
-
-SRC_URI = "git://git.ti.com/processor-firmware/ti-linux-firmware.git;protocol=git;branch=${BRANCH}"
-
-S = "${WORKDIR}/git"
-
-TARGET = ""
-TARGET_ti33x = "am335x-pru0-prusw-fw.elf am335x-pru1-prusw-fw.elf"
-TARGET_ti43x = "am437x-pru0-prusw-fw.elf am437x-pru1-prusw-fw.elf"
-TARGET_am57xx-evm = "am57xx-pru0-prusw-fw.elf am57xx-pru1-prusw-fw.elf"
-TARGET_am57xx-hs-evm = "am57xx-pru0-prusw-fw.elf am57xx-pru1-prusw-fw.elf"
-
-do_install() {
-	install -d ${D}${base_libdir}/firmware/ti-pruss
-	for f in ${TARGET}; do
-		install -m 0644 ${S}/ti-pruss/$f ${D}${base_libdir}/firmware/ti-pruss/$f
-	done
-}
-
-
-FILES_${PN} = "${base_libdir}/firmware"
-
-INSANE_SKIP_${PN} = "arch"

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

@@ -0,0 +1,40 @@
+DESCRIPTION = "PRU Switch firmware for AM57xx"
+
+require recipes-ti/includes/ti-paths.inc
+require recipes-bsp/icss-emac-lld/icss-emac-lld.inc
+
+LICENSE = "TI-TFL"
+LIC_FILES_CHKSUM = "file://icss_dualemac/src/firmware_version.h;beginline=6;endline=53;md5=1f0a640a261059cdcbbcf01e6a739ff3"
+
+PR = "${INC_PR}.0"
+
+TI_PDK_COMP = "ti.drv.icss_emac.firmware"
+
+B = "${S}/icss_switch"
+
+COMPATIBLE_MACHINE = "dra7xx"
+
+PACKAGE_ARCH = "${MACHINE_ARCH}"
+
+DEPENDS = "ti-cgt-pru-native"
+
+PRU_VERSION = ""
+PRU_VERSION_dra7xx = "REV2"
+
+FW_PREFIX = ""
+FW_PREFIX_dra7xx = "am57xx"
+
+
+EXTRA_OEMAKE += "CL_PRU_INSTALL_PATH="${TI_CGT_PRU_INSTALL_DIR}" PRU_VERSION_LIST="${PRU_VERSION}""
+
+do_install() {
+	install -d ${D}${base_libdir}/firmware/ti-pruss
+	install -m 0644 ./elf/${PRU_VERSION}/icss_stp_switch_PRU0.elf \
+		${D}${base_libdir}/firmware/ti-pruss/${FW_PREFIX}-pru0-prusw-fw.elf
+	install -m 0644 ./elf/${PRU_VERSION}/icss_stp_switch_PRU1.elf \
+		${D}${base_libdir}/firmware/ti-pruss/${FW_PREFIX}-pru1-prusw-fw.elf
+}
+
+FILES_${PN} = "${base_libdir}/firmware"
+
+INSANE_SKIP_${PN} = "arch"

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

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"

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"

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"
 

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"

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

recipes-bsp/starterware/starterware-rtos_git.bb

@@ -1,6 +1,6 @@
 require starterware.inc
 
-DEPENDS = "gcc-arm-baremetal-native ti-pdk-build-rtos ti-xdctools-native"
+DEPENDS = "gcc-arm-none-eabi-native ti-pdk-build-rtos ti-xdctools-native"
 
 require recipes-ti/includes/ti-paths.inc
 

recipes-bsp/ti-display-sharing-fw/ti-display-sharing-fw_git.bb

@@ -0,0 +1,48 @@
+SUMMARY = "TI Display Sharing Firmware"
+
+LICENSE = "TI-TFL"
+LIC_FILES_CHKSUM = "file://LICENSE.ti;md5=b5aebf0668bdf95621259288c4a46d76"
+
+PV = "06.01.00.00+git${SRCPV}"
+PACKAGE_ARCH = "${MACHINE_ARCH}"
+
+inherit deploy
+inherit update-alternatives
+
+PROTOCOL = "git"
+BRANCH = "ti-linux-firmware"
+SRCREV = "e7be1ab85266c47236330e2909997d20fc62e312"
+
+SRC_URI = "git://git.ti.com/processor-firmware/ti-linux-firmware.git;protocol=${PROTOCOL};branch=${BRANCH}"
+
+S = "${WORKDIR}/git"
+
+TI_DISP_SHARE_FW_DIR = "${S}/ti-display-sharing/"
+TI_DISP_SHARE_FW_FILENAME = "ti-display-sharing-j721e.bin"
+
+# 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 ${TI_DISP_SHARE_FW_DIR}/${TI_DISP_SHARE_FW_FILENAME} ${D}${base_libdir}/firmware
+}
+
+TARGET_MAIN_R5FSS0_1 = "j7-main-r5f0_1-fw"
+ALTERNATIVE_${PN} = "j7-main-r5f0_1-fw"
+ALTERNATIVE_LINK_NAME[j7-main-r5f0_1-fw] = "${base_libdir}/firmware/${TARGET_MAIN_R5FSS0_1}"
+ALTERNATIVE_TARGET[j7-main-r5f0_1-fw] = "${base_libdir}/firmware/${TI_DISP_SHARE_FW_FILENAME}"
+ALTERNATIVE_PRIORITY = "9"
+
+# This is used to prevent the build system to strip the executables
+INHIBIT_PACKAGE_STRIP = "1"
+INHIBIT_SYSROOT_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"

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

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"

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"

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"

recipes-bsp/ti-sci-fw/ti-sci-fw-source_git.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.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}"

recipes-bsp/ti-sci-fw/ti-sci-fw.inc

@@ -1,19 +0,0 @@
-SUMMARY = "TI SCI firmware (SYSFW)"
-
-LICENSE = "TI-TFL"
-LIC_FILES_CHKSUM = "file://LICENSE.ti;md5=b5aebf0668bdf95621259288c4a46d76"
-
-PV = "2020.08b"
-PV_am64xx-evm-k3r5 = "2020.12"
-
-SRCREV = "0c268f292f3b3a71d3bd0b367f492304b45e37b1"
-BRANCH ?= "ti-linux-firmware"
-SRCREV_imggen = "a4796e5f1304fe8197cba54ccea3d18b9998ff02"
-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"

recipes-bsp/ti-sci-fw/ti-sci-fw_0.1.1.50.bb

@@ -1,37 +0,0 @@
-DESCRIPTION = "TI SCI firmware"
-
-LICENSE = "TI-TFL"
-LIC_FILES_CHKSUM = "file://LICENCE.ti-keystone;md5=3a86335d32864b0bef996bee26cc0f2c"
-
-PV = "0.1.1.50"
-PR = "r2"
-
-CLEANBROKEN = "1"
-
-COMPATIBLE_MACHINE = "k2g"
-
-PACKAGE_ARCH = "${MACHINE_ARCH}"
-
-SRCREV = "ab507546f0f3f217f4c782a20845856e14b38224"
-BRANCH ?= "ti-linux-firmware"
-
-SRC_URI = "git://git.ti.com/processor-firmware/ti-linux-firmware.git;protocol=git;branch=${BRANCH}"
-
-S = "${WORKDIR}/git"
-TARGET = "ti-sci-firmware-k2g.bin"
-
-do_install() {
-	install -d ${D}/boot
-	install -m 0644 ${S}/ti-keystone/${TARGET} ${D}/boot/${TARGET}
-}
-
-FILES_${PN} = "/boot"
-
-inherit deploy
-
-do_deploy () {
-	install -d ${DEPLOYDIR}
-	install -m 0644 ${S}/ti-keystone/${TARGET} ${DEPLOYDIR}/${TARGET}
-}
-
-addtask deploy before do_build after do_compile

recipes-bsp/ti-sci-fw/ti-sci-fw_git.bb

@@ -1,72 +1,28 @@
-require recipes-bsp/ti-sci-fw/ti-sci-fw.inc
+DESCRIPTION = "TI SCI firmware"
 
-DEPENDS = "openssl-native u-boot-mkimage-native dtc-native"
-DEPENDS_append_j7200-evm-k3r5 = " virtual/bootloader"
-DEPENDS_append_am64xx-evm-k3r5 = " virtual/bootloader"
+LICENSE = "TI-TFL"
+LIC_FILES_CHKSUM = "file://LICENCE.ti-keystone;md5=3a86335d32864b0bef996bee26cc0f2c"
+
+PV = "0.1.1.50"
+PR = "r2"
 
 CLEANBROKEN = "1"
-PR = "r1"
 
-# Loaded by R5F core
-COMPATIBLE_MACHINE = "k3r5"
-COMPATIBLE_MACHINE_aarch64 = "null"
+COMPATIBLE_MACHINE = "k2g"
 
 PACKAGE_ARCH = "${MACHINE_ARCH}"
 
-TI_SECURE_DEV_PKG ?= ""
-export TI_SECURE_DEV_PKG
+SRCREV = "ab507546f0f3f217f4c782a20845856e14b38224"
+BRANCH ?= "ti-linux-firmware"
 
-SYSFW_SOC ?= "unknown"
-SYSFW_CONFIG ?= "unknown"
+SRC_URI = "git://git.ti.com/processor-firmware/ti-linux-firmware.git;protocol=git;branch=${BRANCH}"
 
-SYSFW_PREFIX = "ti-sci-firmware"
-SYSFW_PREFIX_j7-evm-k3r5 = "ti-fs-firmware"
-SYSFW_PREFIX_j7200-evm-k3r5 = "ti-fs-firmware"
-SYSFW_PREFIX_j7-hs-evm-k3r5 = "ti-fs-firmware"
-SYSFW_PREFIX_7200-hs-evm-k3r5 = "ti-fs-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']}"
-
-EXTRA_OEMAKE_append_j7200-evm-k3r5 = " SBL="${STAGING_DIR_HOST}/boot/u-boot-spl.bin""
-EXTRA_OEMAKE_append_am64xx-evm-k3r5 = " SBL="${STAGING_DIR_HOST}/boot/u-boot-spl.bin""
-
-do_compile() {
-	cd ${WORKDIR}/imggen/
-	oe_runmake
-}
+S = "${WORKDIR}/git"
+TARGET = "ti-sci-firmware-k2g.bin"
 
 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
+	install -m 0644 ${S}/ti-keystone/${TARGET} ${D}/boot/${TARGET}
 }
 
 FILES_${PN} = "/boot"
@@ -75,43 +31,7 @@ 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}/
-}
-
-do_install_j7200-evm-k3r5() {
-	install -d ${D}/boot
-	install -m 644 ${WORKDIR}/imggen/${UBOOT_BINARY} ${D}/boot/${UBOOT_IMAGE}
-	ln -sf ${UBOOT_IMAGE} ${D}/boot/${UBOOT_SYMLINK}
-	ln -sf ${UBOOT_IMAGE} ${D}/boot/${UBOOT_BINARY}
-}
-
-do_deploy_j7200-evm-k3r5() {
-	install -d ${DEPLOYDIR}
-	install -m 644 ${WORKDIR}/imggen/${UBOOT_BINARY} ${DEPLOYDIR}/${UBOOT_IMAGE}
-	ln -sf ${UBOOT_IMAGE} ${DEPLOYDIR}/${UBOOT_SYMLINK}
-	ln -sf ${UBOOT_IMAGE} ${DEPLOYDIR}/${UBOOT_BINARY}
-}
-
-do_install_am64xx-evm-k3r5() {
-	install -d ${D}/boot
-	install -m 644 ${WORKDIR}/imggen/${UBOOT_BINARY} ${D}/boot/${UBOOT_IMAGE}
-	ln -sf ${UBOOT_IMAGE} ${D}/boot/${UBOOT_SYMLINK}
-	ln -sf ${UBOOT_IMAGE} ${D}/boot/${UBOOT_BINARY}
-}
-
-do_deploy_am64xx-evm-k3r5() {
-	install -d ${DEPLOYDIR}
-	install -m 644 ${WORKDIR}/imggen/${UBOOT_BINARY} ${DEPLOYDIR}/${UBOOT_IMAGE}
-	ln -sf ${UBOOT_IMAGE} ${DEPLOYDIR}/${UBOOT_SYMLINK}
-	ln -sf ${UBOOT_IMAGE} ${DEPLOYDIR}/${UBOOT_BINARY}
+	install -m 0644 ${S}/ti-keystone/${TARGET} ${DEPLOYDIR}/${TARGET}
 }
 
 addtask deploy before do_build after do_compile

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"

recipes-bsp/trusted-firmware-a/trusted-firmware-a_%.bbappend

@@ -1,25 +0,0 @@
-PV_k3 = "2.4"
-LIC_FILES_CHKSUM_k3 = "file://license.rst;md5=1dd070c98a281d18d9eefd938729b031"
-BRANCH_k3 = "ti-atf"
-SRC_URI_k3 = "git://git.ti.com/atf/arm-trusted-firmware.git;branch=${BRANCH};name=tfa"
-SRCREV_tfa_k3 = "65dd16b4ea5032752af62e94ca64cff41733a123"
-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; \
-	)
-}

recipes-bsp/u-boot/u-boot-ti-mainline_git.bb

@@ -1,10 +0,0 @@
-require u-boot-ti.inc
-
-LIC_FILES_CHKSUM = "file://Licenses/README;md5=5a7450c57ffe5ae63fd732446b988025"
-
-PR = "r0"
-
-PV = "2020.10"
-UBOOT_GIT_URI = "git://gitlab.denx.de/u-boot/u-boot.git"
-UBOOT_GIT_PROTOCOL = "http"
-SRCREV = "050acee119b3757fee3bd128f55d720fdd9bb890"

recipes-bsp/u-boot/u-boot-ti-staging_2020.01.bb

@@ -1,7 +1,7 @@
 require u-boot-ti.inc
 
-PR = "r27"
+PR = "r7"
 
 BRANCH = "ti-u-boot-2020.01"
 
-SRCREV = "7b6b1a17bfdae5e4f6fd13f208c36814803f3ba7"
+SRCREV = "ae8ceb7b6e3acb4bc90f730e33dafc7b65066591"

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,17 +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"
 
-DM_FIRMWARE = "ipc_echo_testb_mcu1_0_release_strip.xer5f"
+PACKAGECONFIG[atf] = "ATF=${STAGING_DIR_HOST}/boot/bl31.bin,,arm-trusted-firmware"
+PACKAGECONFIG[optee] = "TEE=${STAGING_DIR_HOST}/boot/bl32.bin,,optee-os"
 
-PACKAGECONFIG[atf] = "ATF=${STAGING_DIR_HOST}/firmware/bl31.bin,,trusted-firmware-a"
-PACKAGECONFIG[optee] = "TEE=${STAGING_DIR_HOST}${nonarch_base_libdir}/firmware/bl32.bin,,optee-os"
-PACKAGECONFIG[dm] = "DM=${STAGING_DIR_HOST}${nonarch_base_libdir}/firmware/pdk-ipc/${DM_FIRMWARE},,ti-rtos-firmware"
-
-PACKAGECONFIG_append_aarch64 = " atf optee"
-PACKAGECONFIG_append_j7 = " dm"
-
-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,15 +54,11 @@ S = "${WORKDIR}/git"
 TI_SECURE_DEV_PKG ?= ""
 export TI_SECURE_DEV_PKG
 
-SYSROOT_DIRS += "/boot"
-
 # SPL (Second Program Loader) to be loaded over UART
 SPL_UART_BINARY = "u-boot-spl.bin"
 SPL_UART_BINARY_keystone = ""
-SPL_UART_BINARY_k3r5 = ""
+SPL_UART_BINARY_k3 = ""
 SPL_UART_BINARY_lego-ev3 = ""
-SPL_UART_BINARY_j7200-evm-k3r5 = "u-boot-spl.bin"
-SPL_UART_BINARY_am64xx-evm-k3r5 = "u-boot-spl.bin"
 
 SPL_UART_IMAGE ?= "${SPL_UART_BINARY}-${MACHINE}-${PV}-${PR}"
 SPL_UART_SYMLINK ?= "${SPL_UART_BINARY}-${MACHINE}"
@@ -266,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 () {
@@ -388,17 +374,4 @@ do_deploy_append_keystone () {
 	fi
 }
 
-# j7200 uses combined image for tiboot3.bin that includes u-boot-spl.bin and sysfw
-# along with board PM/RM configs generated by k3-image-gen and comes from ti-sci-fw
-# hence move the legacy u-boot's tiboot3.bin and u-boot-spl.bin out of the way
-do_deploy_append_j7200-evm-k3r5 () {
-	mv ${DEPLOYDIR}/tiboot3.bin ${DEPLOYDIR}/tiboot3-r5spl.bin || true
-	mv ${DEPLOYDIR}/u-boot-spl.bin ${DEPLOYDIR}/u-boot-spl-r5spl.bin || true
-}
-
-do_deploy_append_am64xx-evm-k3r5 () {
-	mv ${DEPLOYDIR}/tiboot3.bin ${DEPLOYDIR}/tiboot3-r5spl.bin || true
-	mv ${DEPLOYDIR}/u-boot-spl.bin ${DEPLOYDIR}/u-boot-spl-r5spl.bin || true
-}
-
 TOOLCHAIN = "gcc"

recipes-devtools/k3conf/k3conf_git.bb

@@ -1,14 +1,14 @@
 SUMMARY = "Diagnostic tool for TI K3 processors"
 
 LICENSE = "BSD-3-Clause"
-LIC_FILES_CHKSUM = "file://common/k3conf.c;beginline=1;endline=34;md5=7154c0ffcd418064ffa528e34e70ca9d"
+LIC_FILES_CHKSUM = "file://common/k3conf.c;beginline=1;endline=34;md5=37f4e460bd8501c6f02ce71f02bc7ccf"
 
-PV = "0.2+git${SRCPV}"
+PV = "0.1+git${SRCPV}"
 
 COMPATIBLE_MACHINE = "k3"
 
 BRANCH ?= "master"
-SRCREV = "79f007cd462384ce22e750e9002b714878f56892"
+SRCREV = "9199c3a3b6ec5603a2c4283410b4761e79e81e82"
 
 SRC_URI = "git://git.ti.com/k3conf/k3conf.git;protocol=git;branch=${BRANCH}"
 

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"

recipes-graphics/libgles/ti-img-rogue-umlibs_1.10.5371573.bb

@@ -3,20 +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 = "r9"
+PR = "r6"
 
 BRANCH = "linuxws/zeus/k5.4/${PV}"
 
 SRC_URI = "git://git.ti.com/graphics/ti-img-rogue-umlibs.git;branch=${BRANCH}"
-
-SRCREV = "8d3d1891186ed3f397bb90f4f8c518c6c9970479"
+SRCREV = "0721cdfc1fc86f40c93745159e3f1bcad5beda17"
 
 PVR_SOC ?= "j721e_linux"
 PVR_BUILD ?= "release"
@@ -31,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"

recipes-graphics/libgles/ti-sgx-ddk-um_1.17.4948957.bb

@@ -3,19 +3,15 @@ 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"
 
-PR = "r36"
+PR = "r35"
 
 BRANCH = "ti-img-sgx/zeus/${PV}"
 
 SRC_URI = "git://git.ti.com/graphics/omap5-sgx-ddk-um-linux.git;protocol=git;branch=${BRANCH}"
-SRCREV = "7519eda203308c4356e68fd6af67a0900ed09cb4"
+SRCREV = "ce7b96b88d31da27af5b3a2a890aba180a014fc4"
 
 TARGET_PRODUCT_omap-a15 = "jacinto6evm"
 TARGET_PRODUCT_ti33x = "ti335x"
@@ -57,6 +53,8 @@ do_install () {
     oe_runmake install DESTDIR=${D} TARGET_PRODUCT=${TARGET_PRODUCT}
     ln -sf libGLESv2.so ${D}${libdir}/libGLESv2.so.1
 
+    rm -rf ${D}${includedir}/GL
+
     chown -R root:root ${D}
 }
 

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
-

recipes-kernel/jailhouse/jailhouse_git.bb

@@ -11,26 +11,25 @@ LIC_FILES_CHKSUM = " \
 "
 
 PV = "0.12+git${SRCPV}"
-SRCREV = "0d059b6f2c3efeaa2466517300540498b34b7655"
+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,26 +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_j7200-evm ?= "inmate-k3-j7200-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_j7200-evm ?= "k3-j7200-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_j7200-evm ?= "k3-j7200-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_j7200-evm ?= "console=ttyS3,115200n8"
+JH_CMDLINE_j7-evm ?= "console=ttyS3,115200n8"
 
 do_configure() {
 	if [ -d ${STAGING_DIR_HOST}/${CELLCONF_DIR} ]; 
@@ -89,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}/
@@ -142,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"