From dcd64932bfa0968c35a2bd2804c991ddacefc857 Mon Sep 17 00:00:00 2001 From: Andrew Davis Date: Fri, 4 Nov 2022 22:46:07 +0000 Subject: [PATCH] ti-sci-fw: Make combined R5 boot the default Going forward, the combined tiboot3.bin is going to be the standard. Only AM65x and J721e will still use the split boot. Set DEPENDS and EXTRA_OEMAKE for combined boot and override only for the two split boot platforms. This makes it easier to add new platforms and simplifies deployment logic. Signed-off-by: Andrew Davis Signed-off-by: Ryan Eatmon Signed-off-by: Denys Dmytriyenko Signed-off-by: Ryan Eatmon --- meta-ti-bsp/conf/machine/j721e-hs-evm.conf | 1 + .../recipes-bsp/ti-sci-fw/ti-sci-fw_git.bb | 30 +++++++++---------- 2 files changed, 15 insertions(+), 16 deletions(-) diff --git a/meta-ti-bsp/conf/machine/j721e-hs-evm.conf b/meta-ti-bsp/conf/machine/j721e-hs-evm.conf index a24a986b..0c493459 100644 --- a/meta-ti-bsp/conf/machine/j721e-hs-evm.conf +++ b/meta-ti-bsp/conf/machine/j721e-hs-evm.conf @@ -17,6 +17,7 @@ UBOOT_DTBO_OFFSET = "0x00010000" SPL_BINARY = "tispl.bin_HS" UBOOT_BINARY = "u-boot.img_HS" UBOOT_SYMLINK = "u-boot.img" +SYSFW_SYMLINK = "" BBMULTICONFIG += "k3r5-sr1-1" diff --git a/meta-ti-bsp/recipes-bsp/ti-sci-fw/ti-sci-fw_git.bb b/meta-ti-bsp/recipes-bsp/ti-sci-fw/ti-sci-fw_git.bb index dc7cd588..3daf0c68 100644 --- a/meta-ti-bsp/recipes-bsp/ti-sci-fw/ti-sci-fw_git.bb +++ b/meta-ti-bsp/recipes-bsp/ti-sci-fw/ti-sci-fw_git.bb @@ -1,13 +1,12 @@ require recipes-bsp/ti-linux-fw/ti-linux-fw.inc -DEPENDS = "openssl-native u-boot-mkimage-native dtc-native" -DEPENDS:append:j7200-evm-k3r5 = " virtual/bootloader" -DEPENDS:append:j7200-hs-evm-k3r5 = " virtual/bootloader" -DEPENDS:append:j721s2-evm-k3r5 = " virtual/bootloader" -DEPENDS:append:j721s2-hs-evm-k3r5 = " virtual/bootloader" -DEPENDS:append:am64xx-evm-k3r5 = " virtual/bootloader" -DEPENDS:append:am64xx-hs-evm-k3r5 = " virtual/bootloader" -DEPENDS:append:am62xx-evm-k3r5 = " virtual/bootloader" +DEPENDS = "openssl-native u-boot-mkimage-native dtc-native virtual/bootloader" +DEPENDS:remove:am65xx-evm-k3r5 = "virtual/bootloader" +DEPENDS:remove:am65xx-hs-evm-k3r5 = "virtual/bootloader" +DEPENDS:remove:am65xx-hs-evm-k3r5-sr2 = "virtual/bootloader" +DEPENDS:remove:j721e-evm-k3r5 = "virtual/bootloader" +DEPENDS:remove:j721e-hs-evm-k3r5 = "virtual/bootloader" +DEPENDS:remove:j721e-hs-evm-k3r5-sr1-1 = "virtual/bootloader" CLEANBROKEN = "1" PR = "${INC_PR}.2" @@ -54,15 +53,14 @@ do_configure[noexec] = "1" EXTRA_OEMAKE = "\ CROSS_COMPILE=${TARGET_PREFIX} SOC=${SYSFW_SOC} SOC_TYPE=${SYSFW_SUFFIX} \ CONFIG=${SYSFW_CONFIG} SYSFW_DIR="${S}/ti-sysfw" \ + SBL="${STAGING_DIR_HOST}/boot/u-boot-spl.bin" \ " - -EXTRA_OEMAKE:append:j7200-evm-k3r5 = " SBL="${STAGING_DIR_HOST}/boot/u-boot-spl.bin"" -EXTRA_OEMAKE:append:j7200-hs-evm-k3r5 = " SBL="${STAGING_DIR_HOST}/boot/u-boot-spl.bin"" -EXTRA_OEMAKE:append:j721s2-evm-k3r5 = " SBL="${STAGING_DIR_HOST}/boot/u-boot-spl.bin"" -EXTRA_OEMAKE:append:j721s2-hs-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"" -EXTRA_OEMAKE:append:am64xx-hs-evm-k3r5 = " SBL="${STAGING_DIR_HOST}/boot/u-boot-spl.bin"" -EXTRA_OEMAKE:append:am62xx-evm-k3r5 = " SBL="${STAGING_DIR_HOST}/boot/u-boot-spl.bin"" +EXTRA_OEMAKE:remove:am65xx-evm-k3r5 = "SBL="${STAGING_DIR_HOST}/boot/u-boot-spl.bin"" +EXTRA_OEMAKE:remove:am65xx-hs-evm-k3r5 = "SBL="${STAGING_DIR_HOST}/boot/u-boot-spl.bin"" +EXTRA_OEMAKE:remove:am65xx-hs-evm-k3r5-sr2 = "SBL="${STAGING_DIR_HOST}/boot/u-boot-spl.bin"" +EXTRA_OEMAKE:remove:j721e-evm-k3r5 = "SBL="${STAGING_DIR_HOST}/boot/u-boot-spl.bin"" +EXTRA_OEMAKE:remove:j721e-hs-evm-k3r5 = "SBL="${STAGING_DIR_HOST}/boot/u-boot-spl.bin"" +EXTRA_OEMAKE:remove:j721e-hs-evm-k3r5-sr1-1 = "SBL="${STAGING_DIR_HOST}/boot/u-boot-spl.bin"" do_compile() { cd ${WORKDIR}/imggen/