Skip to contentSkip to conversation

u-boot-ti: Do not prepend output files with DEPLOYDIR

PATCH New Andrew Davis 1 participant 8 messages Aug 5, 2022

lore
Share & tools
lore
#0 lore raw

PATCH 1/8 u-boot-ti: Do not prepend output files with DEPLOYDIR

We already cd into DEPLOYDIR so this is not needed. This now matches the keystone version below. Also fixes build in some odd situations.

---
 recipes-bsp/u-boot/u-boot-ti.inc | 36 ++++++++++++++++----------------
 1 file changed, 18 insertions(+), 18 deletions(-)
recipes-bsp/u-boot/u-boot-ti.inc +18 -18
index 1f8fb6de..acc06fea 100644
@@ -187,15 +187,15 @@ do_deploy_append () {
 				then
 					cd ${DEPLOYDIR}
 					if [ "x${SPL_UART_BINARY}" != "x" ]; then
-						install ${B}/${config}/spl/${SPL_UART_BINARY} ${DEPLOYDIR}/${SPL_UART_IMAGE}-${type}
-						rm -f ${DEPLOYDIR}/${SPL_UART_BINARY} ${DEPLOYDIR}/${SPL_UART_SYMLINK}
-						ln -sf ${SPL_UART_IMAGE}-${type} ${DEPLOYDIR}/${SPL_UART_BINARY}-${type}
-						ln -sf ${SPL_UART_IMAGE}-${type} ${DEPLOYDIR}/${SPL_UART_BINARY}
-						ln -sf ${SPL_UART_IMAGE}-${type} ${DEPLOYDIR}/${SPL_UART_SYMLINK}-${type}
-						ln -sf ${SPL_UART_IMAGE}-${type} ${DEPLOYDIR}/${SPL_UART_SYMLINK}
+						install ${B}/${config}/spl/${SPL_UART_BINARY} ${SPL_UART_IMAGE}-${type}
+						rm -f ${SPL_UART_BINARY} ${SPL_UART_SYMLINK}
+						ln -sf ${SPL_UART_IMAGE}-${type} ${SPL_UART_BINARY}-${type}
+						ln -sf ${SPL_UART_IMAGE}-${type} ${SPL_UART_BINARY}
+						ln -sf ${SPL_UART_IMAGE}-${type} ${SPL_UART_SYMLINK}-${type}
+						ln -sf ${SPL_UART_IMAGE}-${type} ${SPL_UART_SYMLINK}
 					fi
 					if [ -f ${B}/${config}/${UBOOT_HS_XLD_BINARY} ]; then
-						install ${B}/${config}/${UBOOT_HS_XLD_BINARY} ${DEPLOYDIR}/${UBOOT_HS_XLD_IMAGE}-${type}
+						install ${B}/${config}/${UBOOT_HS_XLD_BINARY} ${UBOOT_HS_XLD_IMAGE}-${type}
 						rm -f ${UBOOT_HS_XLD_BINARY} ${UBOOT_HS_XLD_SYMLINK}
 						ln -sf ${UBOOT_HS_XLD_IMAGE}-${type} ${UBOOT_HS_XLD_SYMLINK}-${type}
 						ln -sf ${UBOOT_HS_XLD_IMAGE}-${type} ${UBOOT_HS_XLD_SYMLINK}
@@ -203,7 +203,7 @@ do_deploy_append () {
 						ln -sf ${UBOOT_HS_XLD_IMAGE}-${type} ${UBOOT_HS_XLD_BINARY}
 					fi
 					if [ -f ${B}/${config}/${UBOOT_HS_MLO_BINARY} ]; then
-						install ${B}/${config}/${UBOOT_HS_MLO_BINARY} ${DEPLOYDIR}/${UBOOT_HS_MLO_IMAGE}-${type}
+						install ${B}/${config}/${UBOOT_HS_MLO_BINARY} ${UBOOT_HS_MLO_IMAGE}-${type}
 						rm -f ${UBOOT_HS_MLO_BINARY} ${UBOOT_HS_MLO_SYMLINK}
 						ln -sf ${UBOOT_HS_MLO_IMAGE}-${type} ${UBOOT_HS_MLO_SYMLINK}-${type}
 						ln -sf ${UBOOT_HS_MLO_IMAGE}-${type} ${UBOOT_HS_MLO_SYMLINK}
@@ -211,7 +211,7 @@ do_deploy_append () {
 						ln -sf ${UBOOT_HS_MLO_IMAGE}-${type} ${UBOOT_HS_MLO_BINARY}
 					fi
 					if [ -f ${B}/${config}/${UBOOT_HS_ISSW_BINARY} ]; then
-						install ${B}/${config}/${UBOOT_HS_ISSW_BINARY} ${DEPLOYDIR}/${UBOOT_HS_ISSW_IMAGE}-${type}
+						install ${B}/${config}/${UBOOT_HS_ISSW_BINARY} ${UBOOT_HS_ISSW_IMAGE}-${type}
 						rm -f ${UBOOT_HS_ISSW_BINARY} ${UBOOT_HS_ISSW_SYMLINK}
 						ln -sf ${UBOOT_HS_ISSW_IMAGE}-${type} ${UBOOT_HS_ISSW_SYMLINK}-${type}
 						ln -sf ${UBOOT_HS_ISSW_IMAGE}-${type} ${UBOOT_HS_ISSW_SYMLINK}
@@ -219,7 +219,7 @@ do_deploy_append () {
 						ln -sf ${UBOOT_HS_ISSW_IMAGE}-${type} ${UBOOT_HS_ISSW_BINARY}
 					fi
 					if [ -f ${B}/${config}/${UBOOT_HS_2ND_BINARY} ]; then
-						install ${B}/${config}/${UBOOT_HS_2ND_BINARY} ${DEPLOYDIR}/${UBOOT_HS_2ND_IMAGE}-${type}
+						install ${B}/${config}/${UBOOT_HS_2ND_BINARY} ${UBOOT_HS_2ND_IMAGE}-${type}
 						rm -f ${UBOOT_HS_2ND_BINARY} ${UBOOT_HS_2ND_SYMLINK}
 						ln -sf ${UBOOT_HS_2ND_IMAGE}-${type} ${UBOOT_HS_2ND_SYMLINK}-${type}
 						ln -sf ${UBOOT_HS_2ND_IMAGE}-${type} ${UBOOT_HS_2ND_SYMLINK}
@@ -234,31 +234,31 @@ do_deploy_append () {
 	else
 		cd ${DEPLOYDIR}
 		if [ "x${SPL_UART_BINARY}" != "x" ]; then
-			install ${B}/spl/${SPL_UART_BINARY} ${DEPLOYDIR}/${SPL_UART_IMAGE}
-			rm -f ${DEPLOYDIR}/${SPL_UART_BINARY} ${DEPLOYDIR}/${SPL_UART_SYMLINK}
-			ln -sf ${SPL_UART_IMAGE} ${DEPLOYDIR}/${SPL_UART_BINARY}
-			ln -sf ${SPL_UART_IMAGE} ${DEPLOYDIR}/${SPL_UART_SYMLINK}
+			install ${B}/spl/${SPL_UART_BINARY} ${SPL_UART_IMAGE}
+			rm -f ${SPL_UART_BINARY} ${SPL_UART_SYMLINK}
+			ln -sf ${SPL_UART_IMAGE} ${SPL_UART_BINARY}
+			ln -sf ${SPL_UART_IMAGE} ${SPL_UART_SYMLINK}
 		fi
 		if [ -f ${B}/${UBOOT_HS_XLD_BINARY} ]; then
-			install ${B}/${UBOOT_HS_XLD_BINARY} ${DEPLOYDIR}/${UBOOT_HS_XLD_IMAGE}
+			install ${B}/${UBOOT_HS_XLD_BINARY} ${UBOOT_HS_XLD_IMAGE}
 			rm -f ${UBOOT_HS_XLD_BINARY} ${UBOOT_HS_XLD_SYMLINK}
 			ln -sf ${UBOOT_HS_XLD_IMAGE} ${UBOOT_HS_XLD_SYMLINK}
 			ln -sf ${UBOOT_HS_XLD_IMAGE} ${UBOOT_HS_XLD_BINARY}
 		fi
 		if [ -f ${B}/${UBOOT_HS_MLO_BINARY} ]; then
-			install ${B}/${UBOOT_HS_MLO_BINARY} ${DEPLOYDIR}/${UBOOT_HS_MLO_IMAGE}
+			install ${B}/${UBOOT_HS_MLO_BINARY} ${UBOOT_HS_MLO_IMAGE}
 			rm -f ${UBOOT_HS_MLO_BINARY} ${UBOOT_HS_MLO_SYMLINK}
 			ln -sf ${UBOOT_HS_MLO_IMAGE} ${UBOOT_HS_MLO_SYMLINK}
 			ln -sf ${UBOOT_HS_MLO_IMAGE} ${UBOOT_HS_MLO_BINARY}
 		fi
 		if [ -f ${B}/${UBOOT_HS_ISSW_BINARY} ]; then
-			install ${B}/${UBOOT_HS_ISSW_BINARY} ${DEPLOYDIR}/${UBOOT_HS_ISSW_IMAGE}
+			install ${B}/${UBOOT_HS_ISSW_BINARY} ${UBOOT_HS_ISSW_IMAGE}
 			rm -f ${UBOOT_HS_ISSW_BINARY} ${UBOOT_HS_ISSW_SYMLINK}
 			ln -sf ${UBOOT_HS_ISSW_IMAGE} ${UBOOT_HS_ISSW_SYMLINK}
 			ln -sf ${UBOOT_HS_ISSW_IMAGE} ${UBOOT_HS_ISSW_BINARY}
 		fi
 		if [ -f ${B}/${UBOOT_HS_2ND_BINARY} ]; then
-			install ${B}/${UBOOT_HS_2ND_BINARY} ${DEPLOYDIR}/${UBOOT_HS_2ND_IMAGE}
+			install ${B}/${UBOOT_HS_2ND_BINARY} ${UBOOT_HS_2ND_IMAGE}
 			rm -f ${UBOOT_HS_2ND_BINARY} ${UBOOT_HS_2ND_SYMLINK}
 			ln -sf ${UBOOT_HS_2ND_IMAGE} ${UBOOT_HS_2ND_SYMLINK}
 			ln -sf ${UBOOT_HS_2ND_IMAGE} ${UBOOT_HS_2ND_BINARY}
Signature · 1 line
2.36.1
#1 lore raw

PATCH 2/8 optee-os: Allow build to continue without TI_SECURE_DEV_PKG set

---
 recipes-security/optee/optee-os_%.bbappend | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)
recipes-security/optee/optee-os_%.bbappend +6 -1
index 7fe5f26e..5a25bd99 100644
@@ -43,7 +43,12 @@ optee_sign_legacyhs() {
 # Signing procedure for K3 HS devices
 optee_sign_k3hs() {
     ( cd out/arm-plat-${OPTEEOUTPUTMACHINE}/core/; \
-        ${TI_SECURE_DEV_PKG}/scripts/secure-binary-image.sh tee-pager_v2.bin tee-pager.bin.signed; \
+        if [ -f ${TI_SECURE_DEV_PKG}/scripts/secure-binary-image.sh ]; then \
+            ${TI_SECURE_DEV_PKG}/scripts/secure-binary-image.sh tee-pager_v2.bin tee-pager.bin.signed; \
+        else \
+            echo "Warning: TI_SECURE_DEV_PKG not set, OP-TEE not signed."; \
+            cp tee-pager_v2.bin tee-pager.bin.signed; \
+        fi; \
         mv tee-pager.bin.signed ${B}/bl32.bin; \
         cp tee.elf ${B}/bl32.elf; \
     )
Signature · 1 line
2.36.1
#2 lore raw

PATCH 3/8 trusted-firmware-a: Allow build to continue without TI_SECURE_DEV_PKG set

In reply to Andrew Davis
---
 .../trusted-firmware-a_%.bbappend             | 38 ++++++++-----------
 1 file changed, 16 insertions(+), 22 deletions(-)
recipes-bsp/trusted-firmware-a/trusted-firmware-a_%.bbappend +16 -22
index 9645137e..965c99d4 100644
@@ -9,42 +9,36 @@ TFA_SPD_k3 = "opteed"
 EXTRA_OEMAKE_append_k3 = "${@ 'K3_USART=' + d.getVar('TFA_K3_USART') if d.getVar('TFA_K3_USART') else ''}"
 EXTRA_OEMAKE_append_k3 = "${@ 'K3_PM_SYSTEM_SUSPEND=' + d.getVar('TFA_K3_SYSTEM_SUSPEND') if d.getVar('TFA_K3_SYSTEM_SUSPEND') else ''}"
 
-do_compile_append_am65xx-hs-evm() {
+# Signing procedure for K3 HS devices
+tfa_sign_k3hs() {
 	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; \
+		if [ -f ${TI_SECURE_DEV_PKG}/scripts/secure-binary-image.sh ]; then \
+			${TI_SECURE_DEV_PKG}/scripts/secure-binary-image.sh bl31.bin.unsigned bl31.bin; \
+		else \
+			echo "Warning: TI_SECURE_DEV_PKG not set, TF-A not signed."; \
+			cp bl31.bin.unsigned bl31.bin; \
+		fi; \
 	)
 }
 
+do_compile_append_am65xx-hs-evm() {
+	tfa_sign_k3hs
+}
+
 do_compile_append_am64xx-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; \
-        )
+	tfa_sign_k3hs
 }
 
 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; \
-	)
+	tfa_sign_k3hs
 }
 
 do_compile_append_j7200-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; \
-        )
+	tfa_sign_k3hs
 }
 
 do_compile_append_j721s2-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; \
-	)
+	tfa_sign_k3hs
 }
Signature · 1 line
2.36.1
#3 lore raw

PATCH 4/8 prueth-fw: Deploy for AM64xx based on SoC not EVM

In reply to Andrew Davis

This makes sense but looks like was done wrong to match AM65xx which needed the exact EVM specified due to this only working on SR2.

---
 recipes-bsp/prueth-fw/prueth-fw-am65x-sr2_git.bb | 2 +-
 recipes-kernel/linux/kernel-rdepends.inc         | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
recipes-bsp/prueth-fw/prueth-fw-am65x-sr2_git.bb +1 -1
index cf65e09a..e5446423 100644
@@ -7,7 +7,7 @@ PR = "${INC_PR}.0"
 
 CLEANBROKEN = "1"
 
-COMPATIBLE_MACHINE = "am65xx-evm|am64xx-evm"
+COMPATIBLE_MACHINE = "am65xx-evm|am64xx"
 
 PACKAGE_ARCH = "${MACHINE_ARCH}"
 
recipes-kernel/linux/kernel-rdepends.inc +1 -1
index 2ac6eac4..143e6545 100644
@@ -35,7 +35,7 @@ RDEPENDS_${KERNEL_PACKAGE_NAME}-base_append_ti43x = " prueth-fw pruhsr-fw pruprp
 RDEPENDS_${KERNEL_PACKAGE_NAME}-base_append_ti33x = " prueth-fw pruhsr-fw pruprp-fw"
 RDEPENDS_${KERNEL_PACKAGE_NAME}-base_append_am65xx = " prueth-fw-am65x"
 RDEPENDS_${KERNEL_PACKAGE_NAME}-base_append_am65xx-evm = " prueth-fw-am65x-sr2 prusw-fw-am65x-sr2"
-RDEPENDS_${KERNEL_PACKAGE_NAME}-base_append_am64xx-evm = " prueth-fw-am65x-sr2"
+RDEPENDS_${KERNEL_PACKAGE_NAME}-base_append_am64xx = " prueth-fw-am65x-sr2"
 
 # Add run-time dependency for Cadence MHDP firmware to the rootfs
 RDEPENDS_${KERNEL_PACKAGE_NAME}-base_append_j7-evm = " cadence-mhdp-fw"
Signature · 1 line
2.36.1
#4 lore raw

PATCH 5/8 machine: k3r5: Make combined R5 boot the default

In reply to Andrew Davis

Going forward, the combined tiboot3.bin is going to be the standard. Only AM65x and J721e will still use the split boot. Set the output of U-Boot to be u-boot-spl.bin by default and override only for the two split boot platforms. This makes it easier to add new platforms and simplifies deployment logic.

---
 conf/machine/am65xx-evm-k3r5.conf    |  6 ++++
 conf/machine/am65xx-hs-evm-k3r5.conf |  6 ++++
 conf/machine/include/k3r5.inc        |  6 ++--
 conf/machine/j7-evm-k3r5.conf        |  6 ++++
 conf/machine/j7-hs-evm-k3r5.conf     |  6 ++++
 recipes-bsp/u-boot/u-boot-ti.inc     | 51 ++++------------------------
 6 files changed, 33 insertions(+), 48 deletions(-)
conf/machine/am65xx-evm-k3r5.conf +6 -0
index bd17474e..a484e444 100644
@@ -9,4 +9,10 @@ SYSFW_CONFIG = "evm"
 SYSFW_SUFFIX = "gp"
 SYSFW_SYMLINK = ""
 
+SPL_BINARY = "spl/u-boot-spl.${UBOOT_SUFFIX}"
+SPL_SYMLINK = "u-boot-r5spl.${UBOOT_SUFFIX}"
+UBOOT_BINARY = "tiboot3.${UBOOT_SUFFIX}"
+UBOOT_IMAGE = "tiboot3-${MAINMACHINE}-${PV}-${PR}.${UBOOT_SUFFIX}"
+UBOOT_SYMLINK = "tiboot3-${MAINMACHINE}.${UBOOT_SUFFIX}"
+
 UBOOT_MACHINE = "am65x_evm_r5_defconfig"
conf/machine/am65xx-hs-evm-k3r5.conf +6 -0
index d6d4b1e3..81b8c75f 100644
@@ -9,6 +9,12 @@ SYSFW_CONFIG = "evm"
 SYSFW_SUFFIX = "hs"
 SYSFW_SYMLINK = ""
 
+SPL_BINARY = "spl/u-boot-spl.${UBOOT_SUFFIX}"
+SPL_SYMLINK = "u-boot-r5spl.${UBOOT_SUFFIX}"
+UBOOT_BINARY = "tiboot3.${UBOOT_SUFFIX}"
+UBOOT_IMAGE = "tiboot3-${MAINMACHINE}-${PV}-${PR}.${UBOOT_SUFFIX}"
+UBOOT_SYMLINK = "tiboot3-${MAINMACHINE}.${UBOOT_SUFFIX}"
+
 UBOOT_MACHINE = "am65x_hs_evm_r5_defconfig"
 
 TI_SECURE_DEV_PKG = "${TI_SECURE_DEV_PKG_K3}"
conf/machine/include/k3r5.inc +3 -3
index a32accae..035ad812 100644
@@ -16,9 +16,9 @@ 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}"
+UBOOT_BINARY = "u-boot-spl.${UBOOT_SUFFIX}"
+UBOOT_IMAGE = "u-boot-r5spl-${MAINMACHINE}-${PV}-${PR}.${UBOOT_SUFFIX}"
+UBOOT_SYMLINK = "u-boot-r5spl.${UBOOT_SUFFIX}"
 
 PACKAGECONFIG_pn-u-boot-ti-staging = ""
 PACKAGECONFIG_pn-u-boot-ti-mainline = ""
conf/machine/j7-evm-k3r5.conf +6 -0
index b9e8cc01..862b017c 100644
@@ -8,4 +8,10 @@ SYSFW_SOC = "j721e"
 SYSFW_CONFIG = "evm"
 SYSFW_SUFFIX = "gp"
 
+SPL_BINARY = "spl/u-boot-spl.${UBOOT_SUFFIX}"
+SPL_SYMLINK = "u-boot-r5spl.${UBOOT_SUFFIX}"
+UBOOT_BINARY = "tiboot3.${UBOOT_SUFFIX}"
+UBOOT_IMAGE = "tiboot3-${MAINMACHINE}-${PV}-${PR}.${UBOOT_SUFFIX}"
+UBOOT_SYMLINK = "tiboot3-${MAINMACHINE}.${UBOOT_SUFFIX}"
+
 UBOOT_MACHINE = "j721e_evm_r5_defconfig"
conf/machine/j7-hs-evm-k3r5.conf +6 -0
index 92d37dee..c0ddfcec 100644
@@ -9,6 +9,12 @@ SYSFW_CONFIG = "evm"
 SYSFW_SUFFIX = "hs"
 SYSFW_SYMLINK = ""
 
+SPL_BINARY = "spl/u-boot-spl.${UBOOT_SUFFIX}"
+SPL_SYMLINK = "u-boot-r5spl.${UBOOT_SUFFIX}"
+UBOOT_BINARY = "tiboot3.${UBOOT_SUFFIX}"
+UBOOT_IMAGE = "tiboot3-${MAINMACHINE}-${PV}-${PR}.${UBOOT_SUFFIX}"
+UBOOT_SYMLINK = "tiboot3-${MAINMACHINE}.${UBOOT_SUFFIX}"
+
 UBOOT_MACHINE = "j721e_hs_evm_r5_defconfig"
 
 TI_SECURE_DEV_PKG = "${TI_SECURE_DEV_PKG_K3}"
recipes-bsp/u-boot/u-boot-ti.inc +6 -45

67 lines not on this page · raw message

Signature · 1 line
2.36.1
#5 lore raw

PATCH 6/8 ti-sci-fw: Make combined R5 boot the default

In reply to Andrew Davis

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.

---
 conf/machine/j7-hs-evm.conf            |  1 +
 recipes-bsp/ti-sci-fw/ti-sci-fw_git.bb | 30 ++++++++++++--------------
 2 files changed, 15 insertions(+), 16 deletions(-)
conf/machine/j7-hs-evm.conf +1 -0
index 5cb2a3cd..ff998dc7 100644
@@ -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"
 
recipes-bsp/ti-sci-fw/ti-sci-fw_git.bb +14 -16
index 1b2ea184..b06f6abe 100644
@@ -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_j7-evm-k3r5 = " virtual/bootloader"
+DEPENDS_remove_j7-hs-evm-k3r5 = " virtual/bootloader"
+DEPENDS_remove_j7-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_j7-evm-k3r5 = " SBL="${STAGING_DIR_HOST}/boot/u-boot-spl.bin""
+EXTRA_OEMAKE_remove_j7-hs-evm-k3r5 = " SBL="${STAGING_DIR_HOST}/boot/u-boot-spl.bin""
+EXTRA_OEMAKE_remove_j7-hs-evm-k3r5-sr1-1 = " SBL="${STAGING_DIR_HOST}/boot/u-boot-spl.bin""
 
 do_compile() {
 	cd ${WORKDIR}/imggen/
Signature · 1 line
2.36.1
#6 lore raw

PATCH 7/8 ti-sci-fw: Only install and deploy combined boot symlink when set

In reply to Andrew Davis

Add SYSFW_TIBOOT3_SYMLINK and use it the same way we use SYSFW_SYMLINK for the non-combined boot flow, to allow not setting the default for some machine types.

---
 recipes-bsp/ti-sci-fw/ti-sci-fw_git.bb | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)
recipes-bsp/ti-sci-fw/ti-sci-fw_git.bb +7 -2
index b06f6abe..72a3120e 100644
@@ -37,6 +37,7 @@ SYSFW_PREFIX_am62xx-evm-k3r5 = "fs"
 SYSFW_TISCI = "${S}/ti-sysfw/ti-${SYSFW_PREFIX}-firmware-${SYSFW_SOC}-*.bin"
 
 SYSFW_TIBOOT3 = "tiboot3-${SYSFW_SOC}-${SYSFW_SUFFIX}-${SYSFW_CONFIG}.bin"
+SYSFW_TIBOOT3_SYMLINK ?= "tiboot3.bin"
 
 SYSFW_BINARY = "sysfw-${SYSFW_SOC}-${SYSFW_CONFIG}.itb"
 SYSFW_VBINARY = "sysfw-${PV}-${SYSFW_SOC}-${SYSFW_CONFIG}.itb"
@@ -80,7 +81,9 @@ do_install() {
 
 	if [ -f "${WORKDIR}/imggen/${SYSFW_TIBOOT3}" ]; then
 		install -m 644 ${WORKDIR}/imggen/${SYSFW_TIBOOT3} ${D}/boot/${SYSFW_TIBOOT3}
-		ln -sf ${SYSFW_TIBOOT3} ${D}/boot/tiboot3.bin
+		if [ ! -z "${SYSFW_TIBOOT3_SYMLINK}" ]; then
+			ln -sf ${SYSFW_TIBOOT3} ${D}/boot/${SYSFW_TIBOOT3_SYMLINK}
+		fi
 	fi
 }
 
@@ -101,7 +104,9 @@ do_deploy () {
 
 	if [ -f "${WORKDIR}/imggen/${SYSFW_TIBOOT3}" ]; then
 		install -m 644 ${WORKDIR}/imggen/${SYSFW_TIBOOT3} ${DEPLOYDIR}/${SYSFW_TIBOOT3}
-		ln -sf ${SYSFW_TIBOOT3} ${DEPLOYDIR}/tiboot3.bin
+		if [ ! -z "${SYSFW_TIBOOT3_SYMLINK}" ]; then
+			ln -sf ${SYSFW_TIBOOT3} ${DEPLOYDIR}/${SYSFW_TIBOOT3_SYMLINK}
+		fi
 	fi
 
 	install -m 644 ${SYSFW_TISCI} ${DEPLOYDIR}/
Signature · 1 line
2.36.1
#7 lore raw

PATCH 8/8 conf: machine: Move K3 TI_SECURE_DEV_PKG definition to common include

In reply to Andrew Davis

The K3 TI_SECURE_DEV_PKG is the same for all devices, move this out of each machine file and into the common K3 includes. This doesn't have any effect on the GP machines as they make no use of it.

---
 conf/machine/am64xx-hs-evm-k3r5.conf | 2 --
 conf/machine/am64xx-hs-evm.conf      | 2 --
 conf/machine/am65xx-hs-evm-k3r5.conf | 2 --
 conf/machine/am65xx-hs-evm.conf      | 2 --
 conf/machine/include/k3.inc          | 2 ++
 conf/machine/include/k3r5.inc        | 2 ++
 conf/machine/j7-hs-evm-k3r5.conf     | 2 --
 conf/machine/j7-hs-evm.conf          | 2 --
 conf/machine/j7200-hs-evm-k3r5.conf  | 2 --
 conf/machine/j7200-hs-evm.conf       | 2 --
 conf/machine/j721s2-hs-evm-k3r5.conf | 2 --
 conf/machine/j721s2-hs-evm.conf      | 2 --
 12 files changed, 4 insertions(+), 20 deletions(-)
conf/machine/am64xx-hs-evm-k3r5.conf +0 -2
index d12c030f..647c8beb 100644
@@ -10,5 +10,3 @@ SYSFW_SUFFIX = "hs"
 SYSFW_SYMLINK = ""
 
 UBOOT_MACHINE = "am64x_hs_evm_r5_defconfig"
-
-TI_SECURE_DEV_PKG = "${TI_SECURE_DEV_PKG_K3}"
conf/machine/am64xx-hs-evm.conf +0 -2
index ebbe2e62..3ab9a49e 100644
@@ -17,5 +17,3 @@ UBOOT_DTBO_OFFSET =      "0x00010000"
 SPL_BINARY = "tispl.bin_HS"
 UBOOT_BINARY = "u-boot.img_HS"
 UBOOT_SYMLINK = "u-boot.img"
-
-TI_SECURE_DEV_PKG = "${TI_SECURE_DEV_PKG_K3}"
conf/machine/am65xx-hs-evm-k3r5.conf +0 -2
index 81b8c75f..d9041c9d 100644
@@ -16,5 +16,3 @@ UBOOT_IMAGE = "tiboot3-${MAINMACHINE}-${PV}-${PR}.${UBOOT_SUFFIX}"
 UBOOT_SYMLINK = "tiboot3-${MAINMACHINE}.${UBOOT_SUFFIX}"
 
 UBOOT_MACHINE = "am65x_hs_evm_r5_defconfig"
-
-TI_SECURE_DEV_PKG = "${TI_SECURE_DEV_PKG_K3}"
conf/machine/am65xx-hs-evm.conf +0 -2
index de92cacb..ea1f8ff1 100644
@@ -17,5 +17,3 @@ UBOOT_DTBO_OFFSET =      "0x00010000"
 SPL_BINARY = "tispl.bin_HS"
 UBOOT_BINARY = "u-boot.img_HS"
 UBOOT_SYMLINK = "u-boot.img"
-
-TI_SECURE_DEV_PKG = "${TI_SECURE_DEV_PKG_K3}"
conf/machine/include/k3.inc +2 -0
index 24741dee..a5f96087 100644
@@ -47,3 +47,5 @@ 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"
+
+TI_SECURE_DEV_PKG = "${TI_SECURE_DEV_PKG_K3}"
conf/machine/include/k3r5.inc +2 -0
index 035ad812..c29d6c95 100644
@@ -22,3 +22,5 @@ UBOOT_SYMLINK = "u-boot-r5spl.${UBOOT_SUFFIX}"
 
 PACKAGECONFIG_pn-u-boot-ti-staging = ""
 PACKAGECONFIG_pn-u-boot-ti-mainline = ""
+
+TI_SECURE_DEV_PKG = "${TI_SECURE_DEV_PKG_K3}"
conf/machine/j7-hs-evm-k3r5.conf +0 -2
index c0ddfcec..e4b233db 100644
@@ -16,5 +16,3 @@ UBOOT_IMAGE = "tiboot3-${MAINMACHINE}-${PV}-${PR}.${UBOOT_SUFFIX}"
 UBOOT_SYMLINK = "tiboot3-${MAINMACHINE}.${UBOOT_SUFFIX}"
 
 UBOOT_MACHINE = "j721e_hs_evm_r5_defconfig"
-
-TI_SECURE_DEV_PKG = "${TI_SECURE_DEV_PKG_K3}"
conf/machine/j7-hs-evm.conf +0 -2
index ff998dc7..bbfe6fcb 100644
@@ -25,5 +25,3 @@ BBMULTICONFIG += "k3r5-sr1-1"
 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"
-
-TI_SECURE_DEV_PKG = "${TI_SECURE_DEV_PKG_K3}"
conf/machine/j7200-hs-evm-k3r5.conf +0 -2
index 3f134877..3fe06e74 100644
@@ -9,5 +9,3 @@ SYSFW_CONFIG = "evm"
 SYSFW_SUFFIX = "hs"
 
 UBOOT_MACHINE = "j7200_hs_evm_r5_defconfig"
-
-TI_SECURE_DEV_PKG = "${TI_SECURE_DEV_PKG_K3}"
conf/machine/j7200-hs-evm.conf +0 -2
index 8821ffac..ef7268b1 100644
@@ -17,5 +17,3 @@ UBOOT_DTBO_OFFSET =      "0x00010000"
 SPL_BINARY = "tispl.bin_HS"
 UBOOT_BINARY = "u-boot.img_HS"
 UBOOT_SYMLINK = "u-boot.img"
-
-TI_SECURE_DEV_PKG = "${TI_SECURE_DEV_PKG_K3}"
conf/machine/j721s2-hs-evm-k3r5.conf +0 -2
index ac4df86e..a4d51904 100644
@@ -9,5 +9,3 @@ SYSFW_CONFIG = "evm"
 SYSFW_SUFFIX = "hs"
 
 UBOOT_MACHINE = "j721s2_hs_evm_r5_defconfig"
-
-TI_SECURE_DEV_PKG = "${TI_SECURE_DEV_PKG_K3}"
conf/machine/j721s2-hs-evm.conf +0 -2
index 7ffad45a..84db90bb 100644
@@ -17,5 +17,3 @@ UBOOT_DTBO_OFFSET =      "0x00010000"
 SPL_BINARY = "tispl.bin_HS"
 UBOOT_BINARY = "u-boot.img_HS"
 UBOOT_SYMLINK = "u-boot.img"
-
-TI_SECURE_DEV_PKG = "${TI_SECURE_DEV_PKG_K3}"
Signature · 1 line
2.36.1