@@ -12,9 +12,6 @@ PREFERRED_PROVIDER_virtual/libgles2 ?= "ti-img-rogue-umlibs"
PREFERRED_PROVIDER_virtual/libgbm ?= "ti-img-rogue-umlibs"
PREFERRED_PROVIDER_virtual/gpudriver ?= "ti-img-rogue-driver"
-do_image_wic[mcdepends] = "mc::k3r5:ti-sci-fw:do_deploy"
-do_image_tar[mcdepends] = "mc::k3r5:ti-sci-fw:do_deploy"
-
TFA_BOARD = "lite"
TFA_K3_SYSTEM_SUSPEND = "1"
@@ -17,19 +17,17 @@ KERNEL_DEVICETREE = " \
# Default tiboot3.bin on AM64x is for SR2.0 HS-FS
BBMULTICONFIG = "k3r5-sr2-hs-fs"
do_image_wic[mcdepends] = "mc::k3r5-sr2-hs-fs:ti-sci-fw:do_deploy"
-do_image_tar[mcdepends] = "mc::k3r5-sr2-hs-fs:ti-sci-fw:do_deploy"
+IMAGE_BOOT_FILES += "tiboot3-am64x_sr2-hs-fs-evm.bin"
# Since default tiboot3.bin on AM64x is for SR2.0 HS-FS, add a version for GP
BBMULTICONFIG += "k3r5-gp"
-IMAGE_BOOT_FILES += "tiboot3-am64x-gp-evm.bin"
do_image_wic[mcdepends] += "mc::k3r5-gp:ti-sci-fw:do_deploy"
-do_image_tar[mcdepends] += "mc::k3r5-gp:ti-sci-fw:do_deploy"
+IMAGE_BOOT_FILES += "tiboot3-am64x-gp-evm.bin"
# Since default tiboot3.bin on AM64x is for SR2.0 HS-FS, add a version for SR2.0 HS-SE
BBMULTICONFIG += "k3r5-sr2-hs-se"
-IMAGE_BOOT_FILES += "tiboot3-am64x_sr2-hs-evm.bin"
do_image_wic[mcdepends] += "mc::k3r5-sr2-hs-se:ti-sci-fw:do_deploy"
-do_image_tar[mcdepends] += "mc::k3r5-sr2-hs-se:ti-sci-fw:do_deploy"
+IMAGE_BOOT_FILES += "tiboot3-am64x_sr2-hs-evm.bin"
TFA_BOARD = "lite"
@@ -26,17 +26,17 @@ KERNEL_DEVICETREE = " \
ti/k3-am654-evm-ov5640.dtbo \
"
-BBMULTICONFIG += "k3r5-sr2"
+# On AM65x the file tiboot3.bin comes from the bootloader not ti-sci-fw
+do_image_wic[mcdepends] += "mc::k3r5:virtual/bootloader:do_deploy"
-# Since J721e does not support multi-cert tiboot3.bin add standalone sysfw.itb
+# Default sysfw.itb on AM65x is for SR2.0
+BBMULTICONFIG += "k3r5-sr2"
+do_image_wic[mcdepends] += "mc::k3r5-sr2:ti-sci-fw:do_deploy"
IMAGE_BOOT_FILES += "sysfw.itb"
# Since default sysfw.itb on AM65x is for SR2.0, add a version for SR1.0
IMAGE_BOOT_FILES += "sysfw-am65x-evm.itb"
-do_image_wic[mcdepends] += "mc::k3r5-sr2:ti-sci-fw:do_deploy"
-do_image_tar[mcdepends] += "mc::k3r5-sr2:ti-sci-fw:do_deploy"
-
TFA_BOARD = "generic"
OPTEEMACHINE = "k3-am65x"
@@ -9,6 +9,11 @@ PREFERRED_PROVIDER_virtual/libgles2 ?= "ti-img-rogue-umlibs"
PREFERRED_PROVIDER_virtual/libgbm ?= "ti-img-rogue-umlibs"
PREFERRED_PROVIDER_virtual/gpudriver ?= "ti-img-rogue-driver"
+# On J721e the file tiboot3.bin comes from the bootloader not ti-sci-fw
+do_image_wic[mcdepends] += "mc::k3r5:virtual/bootloader:do_deploy"
+
+IMAGE_BOOT_FILES += "sysfw.itb"
+
TFA_BOARD = "generic"
OPTEEMACHINE = "k3-j721e"
@@ -47,7 +47,6 @@ MACHINE_FEATURES += "efi"
WKS_FILE ?= "sdimage-2part-efi.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"
+do_image_wic[mcdepends] += "mc::k3r5:ti-sci-fw:do_deploy"
TI_SECURE_DEV_PKG = "${TI_SECURE_DEV_PKG_K3}"
@@ -50,4 +50,4 @@ MACHINE_FEATURES = "kernel26 apm usbgadget usbhost vfat ext2 screen alsa etherne
IMAGE_FSTYPES += "tar.xz wic.xz wic.bmap"
WKS_FILE ?= "sdimage-2part.wks"
IMAGE_BOOT_FILES ?= "${SPL_BINARY} u-boot.${UBOOT_SUFFIX} ${UBOOT_EXTLINUX_BOOT_FILES}"
-do_image_wic[depends] += "u-boot:do_deploy"
+do_image_wic[depends] += "virtual/bootloader:do_deploy"
@@ -59,4 +59,4 @@ MACHINE_FEATURES = "kernel26 apm usbgadget usbhost vfat ext2 screen alsa etherne
IMAGE_FSTYPES += "tar.xz wic.xz wic.bmap"
WKS_FILE ?= "sdimage-2part.wks"
IMAGE_BOOT_FILES ?= "${SPL_BINARY} u-boot.${UBOOT_SUFFIX} ${UBOOT_EXTLINUX_BOOT_FILES}"
-do_image_wic[depends] += "u-boot:do_deploy"
+do_image_wic[depends] += "virtual/bootloader:do_deploy"
@@ -12,6 +12,3 @@ KERNEL_DEVICETREE = " \
"
UBOOT_MACHINE = "j7200_evm_a72_config"
-
-do_image_wic[mcdepends] = "mc::k3r5:ti-sci-fw:do_deploy"
-do_image_tar[mcdepends] = "mc::k3r5:ti-sci-fw:do_deploy"
@@ -7,9 +7,6 @@ require conf/machine/include/j721e.inc
SERIAL_CONSOLES = "115200;ttyS2 115200;ttyS3"
SERIAL_CONSOLES_CHECK = "${SERIAL_CONSOLES}"
-# Since J721e does not support multi-cert tiboot3.bin add standalone sysfw.itb
-IMAGE_BOOT_FILES += "sysfw.itb"
-
KERNEL_DEVICETREE = " \
ti/k3-j721e-common-proc-board.dtb \
ti/k3-j721e-common-proc-board-infotainment.dtbo \
deleted file mode 100644
@@ -1,11 +0,0 @@
-#@TYPE: Machine
-#@NAME: J721e SR1.1 HS EVM (R5F)
-#@DESCRIPTION: Machine configuration for the TI J721e SR1.1 HS EVM (R5F core)
-
-# Booting SR1.1 requires different SYSFW, the rest is handled at runtime
-
-require conf/machine/j721e-hs-evm-k3r5.conf
-SOC_FAMILY:append = ":k3r5-sr1-1"
-
-SYSFW_SOC = "j721e_sr1_1"
-SYSFW_SYMLINK = "sysfw.itb"
@@ -4,10 +4,9 @@
require conf/machine/include/k3r5.inc
-SYSFW_SOC = "j721e"
+SYSFW_SOC = "j721e_sr1_1"
SYSFW_CONFIG = "evm"
SYSFW_SUFFIX = "hs"
-SYSFW_SYMLINK = ""
SPL_BINARY = "spl/u-boot-spl.${UBOOT_SUFFIX}"
SPL_SYMLINK = "u-boot-r5spl.${UBOOT_SUFFIX}"
@@ -18,10 +18,3 @@ SPL_BINARY = "tispl.bin_HS"
UBOOT_BINARY = "u-boot.img_HS"
UBOOT_SYMLINK = "u-boot.img"
SYSFW_SYMLINK = ""
-
-BBMULTICONFIG += "k3r5-sr1-1"
-
-# Since default sysfw.itb on J721e is for SR1.1, add a version for SR1.0
-IMAGE_BOOT_FILES += "sysfw-j721e-evm.itb"
-do_image_wic[mcdepends] += "mc::k3r5-sr1-1:ti-sci-fw:do_deploy"
-do_image_tar[mcdepends] += "mc::k3r5-sr1-1:ti-sci-fw:do_deploy"
@@ -15,6 +15,3 @@ KERNEL_DEVICETREE = " \
"
UBOOT_MACHINE = "j721s2_evm_a72_defconfig"
-
-do_image_wic[mcdepends] = "mc::k3r5:ti-sci-fw:do_deploy"
-do_image_tar[mcdepends] = "mc::k3r5:ti-sci-fw:do_deploy"
@@ -14,6 +14,3 @@ KERNEL_DEVICETREE = " \
"
UBOOT_MACHINE = "j784s4_evm_a72_defconfig"
-
-do_image_wic[mcdepends] = "mc::k3r5:ti-sci-fw:do_deploy"
-do_image_tar[mcdepends] = "mc::k3r5:ti-sci-fw:do_deploy"
deleted file mode 100644
@@ -1,3 +0,0 @@
-require k3r5.conf
-
-MACHINE:append = "-sr1-1"