From: Andrew Davis <a...@ti.com> Only the first two K3 devices do not support multi-cert boot so lets make multi-cert the default and only add back sysfw.itb for these two devices.
Signed-off-by: Andrew Davis <a...@ti.com> Reviewed-by: lines be preserved? Signed-off-by: Ryan Eatmon <reat...@ti.com> Signed-off-by: Denys Dmytriyenko <de...@konsulko.com> --- meta-ti-bsp/conf/machine/include/am62xx.inc | 3 --- meta-ti-bsp/conf/machine/include/am64xx.inc | 3 --- meta-ti-bsp/conf/machine/include/am65xx.inc | 5 ++++- meta-ti-bsp/conf/machine/include/k3.inc | 5 +---- meta-ti-bsp/conf/machine/j7200-evm.conf | 3 --- meta-ti-bsp/conf/machine/j721e-evm.conf | 3 +++ meta-ti-bsp/conf/machine/j721e-hs-evm.conf | 1 - meta-ti-bsp/conf/machine/j721s2-evm.conf | 3 --- 8 files changed, 8 insertions(+), 18 deletions(-) diff --git a/meta-ti-bsp/conf/machine/include/am62xx.inc b/meta-ti-bsp/conf/machine/include/am62xx.inc index 80df1844..a5aad994 100644 --- a/meta-ti-bsp/conf/machine/include/am62xx.inc +++ b/meta-ti-bsp/conf/machine/include/am62xx.inc @@ -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" -# AM62 supports multi-certificate images, use the same -IMAGE_BOOT_FILES = "${IMAGE_BOOT_FILES_MULTI_CERT}" - do_image_wic[mcdepends] = "mc::k3r5:ti-sci-fw:do_deploy" do_image_tar[mcdepends] = "mc::k3r5:ti-sci-fw:do_deploy" diff --git a/meta-ti-bsp/conf/machine/include/am64xx.inc b/meta-ti-bsp/conf/machine/include/am64xx.inc index 87791ef7..297d6007 100644 --- a/meta-ti-bsp/conf/machine/include/am64xx.inc +++ b/meta-ti-bsp/conf/machine/include/am64xx.inc @@ -14,9 +14,6 @@ KERNEL_DEVICETREE = " \ ti/k3-am642-evm-nand.dtbo \ " -# AM64 supports multi-certificate images, use the same -IMAGE_BOOT_FILES = "${IMAGE_BOOT_FILES_MULTI_CERT}" - do_image_wic[mcdepends] = "mc::k3r5:ti-sci-fw:do_deploy" do_image_tar[mcdepends] = "mc::k3r5:ti-sci-fw:do_deploy" diff --git a/meta-ti-bsp/conf/machine/include/am65xx.inc b/meta-ti-bsp/conf/machine/include/am65xx.inc index d6bd9810..80aa6d27 100644 --- a/meta-ti-bsp/conf/machine/include/am65xx.inc +++ b/meta-ti-bsp/conf/machine/include/am65xx.inc @@ -28,9 +28,12 @@ KERNEL_DEVICETREE = " \ BBMULTICONFIG += "k3r5-sr2" -# Use default IMAGE_BOOT_FILES_LEGACY files +# Since J721e does not support multi-cert tiboot3.bin add standalone sysfw.itb +IMAGE_BOOT_FILES += "sysfw.itb" + # Since default sysfw.itb on AM65x is for SR2.0, add a version for SR1.0 IMAGE_BOOT_FILES += "sysfw-am65x-evm.itb" + do_image_wic[mcdepends] += "mc::k3r5-sr2:ti-sci-fw:do_deploy" do_image_tar[mcdepends] += "mc::k3r5-sr2:ti-sci-fw:do_deploy" diff --git a/meta-ti-bsp/conf/machine/include/k3.inc b/meta-ti-bsp/conf/machine/include/k3.inc index 5b5fb1b6..8a32e0fe 100644 --- a/meta-ti-bsp/conf/machine/include/k3.inc +++ b/meta-ti-bsp/conf/machine/include/k3.inc @@ -39,10 +39,7 @@ MACHINE_FEATURES = "kernel26 apm usbgadget usbhost vfat ext2 alsa ethernet pci" IMAGE_FSTYPES += "tar.xz wic.xz wic.bmap" -IMAGE_BOOT_FILES_LEGACY = "${SPL_BINARYNAME} u-boot.${UBOOT_SUFFIX} tiboot3.bin sysfw.itb" -IMAGE_BOOT_FILES_MULTI_CERT = "${SPL_BINARYNAME} u-boot.${UBOOT_SUFFIX} tiboot3.bin" - -IMAGE_BOOT_FILES ?= "${IMAGE_BOOT_FILES_LEGACY}" +IMAGE_BOOT_FILES ?= "${SPL_BINARYNAME} u-boot.${UBOOT_SUFFIX} tiboot3.bin" IMAGE_EFI_BOOT_FILES ?= "${IMAGE_BOOT_FILES}" EFI_PROVIDER ?= "grub-efi" diff --git a/meta-ti-bsp/conf/machine/j7200-evm.conf b/meta-ti-bsp/conf/machine/j7200-evm.conf index 175d30f8..303ec182 100644 --- a/meta-ti-bsp/conf/machine/j7200-evm.conf +++ b/meta-ti-bsp/conf/machine/j7200-evm.conf @@ -13,8 +13,5 @@ KERNEL_DEVICETREE = " \ UBOOT_MACHINE = "j7200_evm_a72_config" -# J7200 supports multi-certificate images, use the same -IMAGE_BOOT_FILES = "${IMAGE_BOOT_FILES_MULTI_CERT}" - do_image_wic[mcdepends] = "mc::k3r5:ti-sci-fw:do_deploy" do_image_tar[mcdepends] = "mc::k3r5:ti-sci-fw:do_deploy" diff --git a/meta-ti-bsp/conf/machine/j721e-evm.conf b/meta-ti-bsp/conf/machine/j721e-evm.conf index fe28e6f5..d28d16d1 100644 --- a/meta-ti-bsp/conf/machine/j721e-evm.conf +++ b/meta-ti-bsp/conf/machine/j721e-evm.conf @@ -7,6 +7,9 @@ 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 \ diff --git a/meta-ti-bsp/conf/machine/j721e-hs-evm.conf b/meta-ti-bsp/conf/machine/j721e-hs-evm.conf index 56eaa64e..a24a986b 100644 --- a/meta-ti-bsp/conf/machine/j721e-hs-evm.conf +++ b/meta-ti-bsp/conf/machine/j721e-hs-evm.conf @@ -20,7 +20,6 @@ UBOOT_SYMLINK = "u-boot.img" BBMULTICONFIG += "k3r5-sr1-1" -# Use default IMAGE_BOOT_FILES_LEGACY files # 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" diff --git a/meta-ti-bsp/conf/machine/j721s2-evm.conf b/meta-ti-bsp/conf/machine/j721s2-evm.conf index bbe011c0..77fc3e66 100644 --- a/meta-ti-bsp/conf/machine/j721s2-evm.conf +++ b/meta-ti-bsp/conf/machine/j721s2-evm.conf @@ -16,8 +16,5 @@ KERNEL_DEVICETREE = " \ UBOOT_MACHINE = "j721s2_evm_a72_defconfig" -# J721S2 supports multi-certificate images, use the same -IMAGE_BOOT_FILES = "${IMAGE_BOOT_FILES_MULTI_CERT}" - do_image_wic[mcdepends] = "mc::k3r5:ti-sci-fw:do_deploy" do_image_tar[mcdepends] = "mc::k3r5:ti-sci-fw:do_deploy" -- 2.25.1
-=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#15077): https://lists.yoctoproject.org/g/meta-ti/message/15077 Mute This Topic: https://lists.yoctoproject.org/mt/93648962/21656 Group Owner: meta-ti+ow...@lists.yoctoproject.org Unsubscribe: https://lists.yoctoproject.org/g/meta-ti/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-