* [meta-ti][dunfell][PATCH 1/4] conf: machine: Make multi-certificate image the default
@ 2022-08-01 21:40 Andrew Davis
2022-08-01 21:40 ` [meta-ti][dunfell][PATCH 2/4] ti-sci-fw: Use new SOC_TYPE and SYSFW_DIR to simplify recipe Andrew Davis
` (3 more replies)
0 siblings, 4 replies; 6+ messages in thread
From: Andrew Davis @ 2022-08-01 21:40 UTC (permalink / raw)
To: Denys Dmytriyenko, Ryan Eatmon, meta-ti; +Cc: Andrew Davis
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 <afd@ti.com>
---
conf/machine/include/am62xx.inc | 3 ---
conf/machine/include/am64xx.inc | 3 ---
conf/machine/include/am65xx.inc | 5 ++++-
conf/machine/include/j7.inc | 2 --
conf/machine/include/k3.inc | 5 +----
conf/machine/j7-evm.conf | 3 +++
conf/machine/j7-hs-evm.conf | 1 -
conf/machine/j7200-evm.conf | 3 ---
conf/machine/j721s2-evm.conf | 3 ---
9 files changed, 8 insertions(+), 20 deletions(-)
diff --git a/conf/machine/include/am62xx.inc b/conf/machine/include/am62xx.inc
index 0364edd1..0231235f 100644
--- a/conf/machine/include/am62xx.inc
+++ b/conf/machine/include/am62xx.inc
@@ -8,9 +8,6 @@ SERIAL_CONSOLES_CHECK = "${SERIAL_CONSOLES}"
TFA_K3_SYSTEM_SUSPEND = "1"
-# 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/conf/machine/include/am64xx.inc b/conf/machine/include/am64xx.inc
index 8e8e146f..930fba08 100644
--- a/conf/machine/include/am64xx.inc
+++ b/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/conf/machine/include/am65xx.inc b/conf/machine/include/am65xx.inc
index 1898f19c..b70d212f 100644
--- a/conf/machine/include/am65xx.inc
+++ b/conf/machine/include/am65xx.inc
@@ -22,9 +22,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/conf/machine/include/j7.inc b/conf/machine/include/j7.inc
index d3eda1a8..c187f299 100644
--- a/conf/machine/include/j7.inc
+++ b/conf/machine/include/j7.inc
@@ -4,8 +4,6 @@ SOC_FAMILY_append = ":j7"
OPTEEMACHINE = "k3-j721e"
OPTEEOUTPUTMACHINE = "k3"
-# Use default IMAGE_BOOT_FILES_LEGACY files
-
# 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"
diff --git a/conf/machine/include/k3.inc b/conf/machine/include/k3.inc
index f85e6b98..24741dee 100644
--- a/conf/machine/include/k3.inc
+++ b/conf/machine/include/k3.inc
@@ -41,10 +41,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"
WKS_FILE ?= "sdimage-2part.wks"
do_image_wic[depends] += "virtual/bootloader:do_deploy"
diff --git a/conf/machine/j7-evm.conf b/conf/machine/j7-evm.conf
index 1f47f00c..514695d6 100644
--- a/conf/machine/j7-evm.conf
+++ b/conf/machine/j7-evm.conf
@@ -9,6 +9,9 @@ MACHINE_FEATURES += "gpu"
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-proc-board-tps65917.dtb \
diff --git a/conf/machine/j7-hs-evm.conf b/conf/machine/j7-hs-evm.conf
index ece0d85e..5cb2a3cd 100644
--- a/conf/machine/j7-hs-evm.conf
+++ b/conf/machine/j7-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 J7 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/conf/machine/j7200-evm.conf b/conf/machine/j7200-evm.conf
index 2565c90c..c8a03a7b 100644
--- a/conf/machine/j7200-evm.conf
+++ b/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/conf/machine/j721s2-evm.conf b/conf/machine/j721s2-evm.conf
index 8cf3a414..ba5e8def 100644
--- a/conf/machine/j721s2-evm.conf
+++ b/conf/machine/j721s2-evm.conf
@@ -18,8 +18,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.36.1
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [meta-ti][dunfell][PATCH 2/4] ti-sci-fw: Use new SOC_TYPE and SYSFW_DIR to simplify recipe
2022-08-01 21:40 [meta-ti][dunfell][PATCH 1/4] conf: machine: Make multi-certificate image the default Andrew Davis
@ 2022-08-01 21:40 ` Andrew Davis
2022-08-01 21:40 ` [meta-ti][dunfell][PATCH 3/4] ti-sci-fw: Deploy all SYSFW firmware types Andrew Davis
` (2 subsequent siblings)
3 siblings, 0 replies; 6+ messages in thread
From: Andrew Davis @ 2022-08-01 21:40 UTC (permalink / raw)
To: Denys Dmytriyenko, Ryan Eatmon, meta-ti; +Cc: Andrew Davis
The k3-image-gen now has two new helper flags SOC_TYPE and SYSFW_DIR
that we can use to simplify this recipe. With these we do not need to do
anything different here for HS builds, the SOC_TYPE selects this now.
DL_URL also do not need cleared anymore, the k3-image-gen will no longer
download missing files when not needed for the current build type.
do_install and do_deploy can also check for the existence of either
sysfw.itb or tiboot3.bin and install/deploy as needed. k3-image-gen only
gerneates the right one now depending on the SoC. Merge all these
steps for all SoCs.
Signed-off-by: Andrew Davis <afd@ti.com>
---
recipes-bsp/ti-linux-fw/ti-linux-fw.inc | 2 +-
recipes-bsp/ti-sci-fw/ti-sci-fw_git.bb | 147 +++++-------------------
2 files changed, 28 insertions(+), 121 deletions(-)
diff --git a/recipes-bsp/ti-linux-fw/ti-linux-fw.inc b/recipes-bsp/ti-linux-fw/ti-linux-fw.inc
index 8aaf1559..a8627c68 100644
--- a/recipes-bsp/ti-linux-fw/ti-linux-fw.inc
+++ b/recipes-bsp/ti-linux-fw/ti-linux-fw.inc
@@ -25,7 +25,7 @@ SRCREV = "${TI_LINUX_FW_SRCREV}"
BRANCH ?= "ti-linux-firmware"
-K3_IMAGE_GEN_SRCREV ?= "85a70059fc24242ea03653a5014b98100e4da2d6"
+K3_IMAGE_GEN_SRCREV ?= "91a75b17c616a5cc41b3345905dccba5c29aca66"
SRCREV_imggen = "${K3_IMAGE_GEN_SRCREV}"
SRCREV_FORMAT = "imggen"
diff --git a/recipes-bsp/ti-sci-fw/ti-sci-fw_git.bb b/recipes-bsp/ti-sci-fw/ti-sci-fw_git.bb
index 983d23e3..d1f2859e 100644
--- a/recipes-bsp/ti-sci-fw/ti-sci-fw_git.bb
+++ b/recipes-bsp/ti-sci-fw/ti-sci-fw_git.bb
@@ -54,13 +54,9 @@ 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} \
+ CROSS_COMPILE=${TARGET_PREFIX} SOC=${SYSFW_SOC} SOC_TYPE=${SYSFW_SUFFIX} \
+ CONFIG=${SYSFW_CONFIG} SYSFW_DIR="${S}/ti-sysfw" \
"
-EXTRA_OEMAKE_HS = " \
- HS=1 SW_REV=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_j7200-hs-evm-k3r5 = " SBL="${STAGING_DIR_HOST}/boot/u-boot-spl.bin""
@@ -77,10 +73,19 @@ do_compile() {
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}
+
+ if [ -f "${WORKDIR}/imggen/${SYSFW_BINARY}" ]; then
+ 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
+ fi
+
+ if [ -f "${WORKDIR}/imggen/${UBOOT_BINARY}" ]; then
+ 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}
fi
}
@@ -90,119 +95,21 @@ 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}
- install -m 644 ${SYSFW_TISCI} ${DEPLOYDIR}/
-}
-
-do_install_j7200-hs-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-hs-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 644 ${SYSFW_TISCI} ${DEPLOYDIR}/
-}
-
-do_install_j721s2-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_j721s2-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 644 ${SYSFW_TISCI} ${DEPLOYDIR}/
-}
-
-do_install_j721s2-hs-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_j721s2-hs-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 644 ${SYSFW_TISCI} ${DEPLOYDIR}/
-}
-
-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 644 ${SYSFW_TISCI} ${DEPLOYDIR}/
-}
-
-do_install_am64xx-hs-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-hs-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 644 ${SYSFW_TISCI} ${DEPLOYDIR}/
-}
+ if [ -f "${WORKDIR}/imggen/${SYSFW_BINARY}" ]; then
+ install -m 644 ${WORKDIR}/imggen/${SYSFW_BINARY} ${DEPLOYDIR}/${SYSFW_VBINARY}
+ ln -sf ${SYSFW_VBINARY} ${DEPLOYDIR}/${SYSFW_IMAGE}
+ if [ ! -z "${SYSFW_SYMLINK}" ]; then
+ ln -sf ${SYSFW_VBINARY} ${DEPLOYDIR}/${SYSFW_SYMLINK}
+ fi
+ fi
-do_install_am62xx-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}
-}
+ if [ -f "${WORKDIR}/imggen/${UBOOT_BINARY}" ]; then
+ install -m 644 ${WORKDIR}/imggen/${UBOOT_BINARY} ${DEPLOYDIR}/${UBOOT_IMAGE}
+ ln -sf ${UBOOT_IMAGE} ${DEPLOYDIR}/${UBOOT_SYMLINK}
+ ln -sf ${UBOOT_IMAGE} ${DEPLOYDIR}/${UBOOT_BINARY}
+ fi
-do_deploy_am62xx-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 644 ${SYSFW_TISCI} ${DEPLOYDIR}/
}
--
2.36.1
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [meta-ti][dunfell][PATCH 3/4] ti-sci-fw: Deploy all SYSFW firmware types
2022-08-01 21:40 [meta-ti][dunfell][PATCH 1/4] conf: machine: Make multi-certificate image the default Andrew Davis
2022-08-01 21:40 ` [meta-ti][dunfell][PATCH 2/4] ti-sci-fw: Use new SOC_TYPE and SYSFW_DIR to simplify recipe Andrew Davis
@ 2022-08-01 21:40 ` Andrew Davis
2022-08-01 21:40 ` [meta-ti][dunfell][PATCH 4/4] ti-sci-fw: Use SYSFW_TIBOOT3 to point to the SYSFW image Andrew Davis
2022-08-02 19:47 ` [meta-ti][dunfell][PATCH 1/4] conf: machine: Make multi-certificate image the default Denys Dmytriyenko
3 siblings, 0 replies; 6+ messages in thread
From: Andrew Davis @ 2022-08-01 21:40 UTC (permalink / raw)
To: Denys Dmytriyenko, Ryan Eatmon, meta-ti; +Cc: Andrew Davis
This allows us to rebuild and re-sign the SYSFW image if needed from
the deploy directory for any SoC type.
Signed-off-by: Andrew Davis <afd@ti.com>
---
recipes-bsp/ti-sci-fw/ti-sci-fw_git.bb | 28 +++++++++++---------------
1 file changed, 12 insertions(+), 16 deletions(-)
diff --git a/recipes-bsp/ti-sci-fw/ti-sci-fw_git.bb b/recipes-bsp/ti-sci-fw/ti-sci-fw_git.bb
index d1f2859e..1bb4fd3e 100644
--- a/recipes-bsp/ti-sci-fw/ti-sci-fw_git.bb
+++ b/recipes-bsp/ti-sci-fw/ti-sci-fw_git.bb
@@ -22,24 +22,20 @@ TI_SECURE_DEV_PKG ?= ""
export TI_SECURE_DEV_PKG
SYSFW_SOC ?= "unknown"
-SYSFW_CONFIG ?= "unknown"
-
-SYSFW_PREFIX = "ti-sci-firmware"
-SYSFW_PREFIX_j7-evm-k3r5 = "ti-fs-firmware"
-SYSFW_PREFIX_j7-hs-evm-k3r5 = "ti-fs-firmware"
-SYSFW_PREFIX_j7-hs-evm-k3r5-sr1-1 = "ti-fs-firmware"
-SYSFW_PREFIX_j7200-evm-k3r5 = "ti-fs-firmware"
-SYSFW_PREFIX_j7200-hs-evm-k3r5 = "ti-fs-firmware"
-SYSFW_PREFIX_j721s2-evm-k3r5 = "ti-fs-firmware"
-SYSFW_PREFIX_j721s2-hs-evm-k3r5 = "ti-fs-firmware"
-SYSFW_PREFIX_am62xx-evm-k3r5 = "ti-fs-firmware"
-
SYSFW_SUFFIX ?= "unknown"
+SYSFW_CONFIG ?= "unknown"
-SYSFW_BASE = "${SYSFW_PREFIX}-${SYSFW_SOC}-${SYSFW_SUFFIX}"
-SYSFW_BASE_append = "${@['','*']['${SYSFW_SUFFIX}' == 'hs']}"
-
-SYSFW_TISCI = "${S}/ti-sysfw/${SYSFW_BASE}.bin"
+SYSFW_PREFIX = "sci"
+SYSFW_PREFIX_j7-evm-k3r5 = "fs"
+SYSFW_PREFIX_j7-hs-evm-k3r5 = "fs"
+SYSFW_PREFIX_j7-hs-evm-k3r5-sr1-1 = "fs"
+SYSFW_PREFIX_j7200-evm-k3r5 = "fs"
+SYSFW_PREFIX_j7200-hs-evm-k3r5 = "fs"
+SYSFW_PREFIX_j721s2-evm-k3r5 = "fs"
+SYSFW_PREFIX_j721s2-hs-evm-k3r5 = "fs"
+SYSFW_PREFIX_am62xx-evm-k3r5 = "fs"
+
+SYSFW_TISCI = "${S}/ti-sysfw/ti-${SYSFW_PREFIX}-firmware-${SYSFW_SOC}-*.bin"
SYSFW_BINARY = "sysfw-${SYSFW_SOC}-${SYSFW_CONFIG}.itb"
SYSFW_VBINARY = "sysfw-${PV}-${SYSFW_SOC}-${SYSFW_CONFIG}.itb"
--
2.36.1
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [meta-ti][dunfell][PATCH 4/4] ti-sci-fw: Use SYSFW_TIBOOT3 to point to the SYSFW image
2022-08-01 21:40 [meta-ti][dunfell][PATCH 1/4] conf: machine: Make multi-certificate image the default Andrew Davis
2022-08-01 21:40 ` [meta-ti][dunfell][PATCH 2/4] ti-sci-fw: Use new SOC_TYPE and SYSFW_DIR to simplify recipe Andrew Davis
2022-08-01 21:40 ` [meta-ti][dunfell][PATCH 3/4] ti-sci-fw: Deploy all SYSFW firmware types Andrew Davis
@ 2022-08-01 21:40 ` Andrew Davis
2022-08-02 19:47 ` [meta-ti][dunfell][PATCH 1/4] conf: machine: Make multi-certificate image the default Denys Dmytriyenko
3 siblings, 0 replies; 6+ messages in thread
From: Andrew Davis @ 2022-08-01 21:40 UTC (permalink / raw)
To: Denys Dmytriyenko, Ryan Eatmon, meta-ti; +Cc: Andrew Davis
Currently we reuse UBOOT_* names which usually are the same we
want to give to the name of the SYSFW binary. This isn't always
correct, we should use a SYSFW specific variable in case the
UBOOT names are changed.
Signed-off-by: Andrew Davis <afd@ti.com>
---
recipes-bsp/ti-sci-fw/ti-sci-fw_git.bb | 16 ++++++++--------
1 file changed, 8 insertions(+), 8 deletions(-)
diff --git a/recipes-bsp/ti-sci-fw/ti-sci-fw_git.bb b/recipes-bsp/ti-sci-fw/ti-sci-fw_git.bb
index 1bb4fd3e..1b2ea184 100644
--- a/recipes-bsp/ti-sci-fw/ti-sci-fw_git.bb
+++ b/recipes-bsp/ti-sci-fw/ti-sci-fw_git.bb
@@ -37,6 +37,8 @@ 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_BINARY = "sysfw-${SYSFW_SOC}-${SYSFW_CONFIG}.itb"
SYSFW_VBINARY = "sysfw-${PV}-${SYSFW_SOC}-${SYSFW_CONFIG}.itb"
SYSFW_IMAGE = "sysfw-${SYSFW_SOC}-${SYSFW_CONFIG}.itb"
@@ -78,10 +80,9 @@ do_install() {
fi
fi
- if [ -f "${WORKDIR}/imggen/${UBOOT_BINARY}" ]; then
- 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}
+ 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
fi
}
@@ -100,10 +101,9 @@ do_deploy () {
fi
fi
- if [ -f "${WORKDIR}/imggen/${UBOOT_BINARY}" ]; then
- install -m 644 ${WORKDIR}/imggen/${UBOOT_BINARY} ${DEPLOYDIR}/${UBOOT_IMAGE}
- ln -sf ${UBOOT_IMAGE} ${DEPLOYDIR}/${UBOOT_SYMLINK}
- ln -sf ${UBOOT_IMAGE} ${DEPLOYDIR}/${UBOOT_BINARY}
+ if [ -f "${WORKDIR}/imggen/${SYSFW_TIBOOT3}" ]; then
+ install -m 644 ${WORKDIR}/imggen/${SYSFW_TIBOOT3} ${DEPLOYDIR}/${SYSFW_TIBOOT3}
+ ln -sf ${SYSFW_TIBOOT3} ${DEPLOYDIR}/tiboot3.bin
fi
install -m 644 ${SYSFW_TISCI} ${DEPLOYDIR}/
--
2.36.1
^ permalink raw reply related [flat|nested] 6+ messages in thread
* Re: [meta-ti][dunfell][PATCH 1/4] conf: machine: Make multi-certificate image the default
2022-08-01 21:40 [meta-ti][dunfell][PATCH 1/4] conf: machine: Make multi-certificate image the default Andrew Davis
` (2 preceding siblings ...)
2022-08-01 21:40 ` [meta-ti][dunfell][PATCH 4/4] ti-sci-fw: Use SYSFW_TIBOOT3 to point to the SYSFW image Andrew Davis
@ 2022-08-02 19:47 ` Denys Dmytriyenko
2022-08-02 19:57 ` Andrew Davis
3 siblings, 1 reply; 6+ messages in thread
From: Denys Dmytriyenko @ 2022-08-02 19:47 UTC (permalink / raw)
To: afd; +Cc: Denys Dmytriyenko, Ryan Eatmon, meta-ti
Is this a third or forth revision of the patch? What are the changes? If no
changes and it is exactly the same as previous, should the existing
Reviewed-by: lines be preserved?
On Mon, Aug 01, 2022 at 04:40:04PM -0500, Andrew Davis via lists.yoctoproject.org wrote:
> 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 <afd@ti.com>
> ---
> conf/machine/include/am62xx.inc | 3 ---
> conf/machine/include/am64xx.inc | 3 ---
> conf/machine/include/am65xx.inc | 5 ++++-
> conf/machine/include/j7.inc | 2 --
> conf/machine/include/k3.inc | 5 +----
> conf/machine/j7-evm.conf | 3 +++
> conf/machine/j7-hs-evm.conf | 1 -
> conf/machine/j7200-evm.conf | 3 ---
> conf/machine/j721s2-evm.conf | 3 ---
> 9 files changed, 8 insertions(+), 20 deletions(-)
>
> diff --git a/conf/machine/include/am62xx.inc b/conf/machine/include/am62xx.inc
> index 0364edd1..0231235f 100644
> --- a/conf/machine/include/am62xx.inc
> +++ b/conf/machine/include/am62xx.inc
> @@ -8,9 +8,6 @@ SERIAL_CONSOLES_CHECK = "${SERIAL_CONSOLES}"
>
> TFA_K3_SYSTEM_SUSPEND = "1"
>
> -# 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/conf/machine/include/am64xx.inc b/conf/machine/include/am64xx.inc
> index 8e8e146f..930fba08 100644
> --- a/conf/machine/include/am64xx.inc
> +++ b/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/conf/machine/include/am65xx.inc b/conf/machine/include/am65xx.inc
> index 1898f19c..b70d212f 100644
> --- a/conf/machine/include/am65xx.inc
> +++ b/conf/machine/include/am65xx.inc
> @@ -22,9 +22,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/conf/machine/include/j7.inc b/conf/machine/include/j7.inc
> index d3eda1a8..c187f299 100644
> --- a/conf/machine/include/j7.inc
> +++ b/conf/machine/include/j7.inc
> @@ -4,8 +4,6 @@ SOC_FAMILY_append = ":j7"
> OPTEEMACHINE = "k3-j721e"
> OPTEEOUTPUTMACHINE = "k3"
>
> -# Use default IMAGE_BOOT_FILES_LEGACY files
> -
> # 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"
> diff --git a/conf/machine/include/k3.inc b/conf/machine/include/k3.inc
> index f85e6b98..24741dee 100644
> --- a/conf/machine/include/k3.inc
> +++ b/conf/machine/include/k3.inc
> @@ -41,10 +41,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"
>
> WKS_FILE ?= "sdimage-2part.wks"
> do_image_wic[depends] += "virtual/bootloader:do_deploy"
> diff --git a/conf/machine/j7-evm.conf b/conf/machine/j7-evm.conf
> index 1f47f00c..514695d6 100644
> --- a/conf/machine/j7-evm.conf
> +++ b/conf/machine/j7-evm.conf
> @@ -9,6 +9,9 @@ MACHINE_FEATURES += "gpu"
> 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-proc-board-tps65917.dtb \
> diff --git a/conf/machine/j7-hs-evm.conf b/conf/machine/j7-hs-evm.conf
> index ece0d85e..5cb2a3cd 100644
> --- a/conf/machine/j7-hs-evm.conf
> +++ b/conf/machine/j7-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 J7 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/conf/machine/j7200-evm.conf b/conf/machine/j7200-evm.conf
> index 2565c90c..c8a03a7b 100644
> --- a/conf/machine/j7200-evm.conf
> +++ b/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/conf/machine/j721s2-evm.conf b/conf/machine/j721s2-evm.conf
> index 8cf3a414..ba5e8def 100644
> --- a/conf/machine/j721s2-evm.conf
> +++ b/conf/machine/j721s2-evm.conf
> @@ -18,8 +18,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.36.1
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [meta-ti][dunfell][PATCH 1/4] conf: machine: Make multi-certificate image the default
2022-08-02 19:47 ` [meta-ti][dunfell][PATCH 1/4] conf: machine: Make multi-certificate image the default Denys Dmytriyenko
@ 2022-08-02 19:57 ` Andrew Davis
0 siblings, 0 replies; 6+ messages in thread
From: Andrew Davis @ 2022-08-02 19:57 UTC (permalink / raw)
To: Denys Dmytriyenko; +Cc: Denys Dmytriyenko, Ryan Eatmon, meta-ti
On 8/2/22 2:47 PM, Denys Dmytriyenko wrote:
> Is this a third or forth revision of the patch? What are the changes? If no
> changes and it is exactly the same as previous, should the existing
> Reviewed-by: lines be preserved?
>
The last posting was an RFC. I see it did get included in a previous series
before that, which I do see your reviewed-by. Yes, it should have been preserved.
Andrew
>
> On Mon, Aug 01, 2022 at 04:40:04PM -0500, Andrew Davis via lists.yoctoproject.org wrote:
>> 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 <afd@ti.com>
>> ---
>> conf/machine/include/am62xx.inc | 3 ---
>> conf/machine/include/am64xx.inc | 3 ---
>> conf/machine/include/am65xx.inc | 5 ++++-
>> conf/machine/include/j7.inc | 2 --
>> conf/machine/include/k3.inc | 5 +----
>> conf/machine/j7-evm.conf | 3 +++
>> conf/machine/j7-hs-evm.conf | 1 -
>> conf/machine/j7200-evm.conf | 3 ---
>> conf/machine/j721s2-evm.conf | 3 ---
>> 9 files changed, 8 insertions(+), 20 deletions(-)
>>
>> diff --git a/conf/machine/include/am62xx.inc b/conf/machine/include/am62xx.inc
>> index 0364edd1..0231235f 100644
>> --- a/conf/machine/include/am62xx.inc
>> +++ b/conf/machine/include/am62xx.inc
>> @@ -8,9 +8,6 @@ SERIAL_CONSOLES_CHECK = "${SERIAL_CONSOLES}"
>>
>> TFA_K3_SYSTEM_SUSPEND = "1"
>>
>> -# 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/conf/machine/include/am64xx.inc b/conf/machine/include/am64xx.inc
>> index 8e8e146f..930fba08 100644
>> --- a/conf/machine/include/am64xx.inc
>> +++ b/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/conf/machine/include/am65xx.inc b/conf/machine/include/am65xx.inc
>> index 1898f19c..b70d212f 100644
>> --- a/conf/machine/include/am65xx.inc
>> +++ b/conf/machine/include/am65xx.inc
>> @@ -22,9 +22,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/conf/machine/include/j7.inc b/conf/machine/include/j7.inc
>> index d3eda1a8..c187f299 100644
>> --- a/conf/machine/include/j7.inc
>> +++ b/conf/machine/include/j7.inc
>> @@ -4,8 +4,6 @@ SOC_FAMILY_append = ":j7"
>> OPTEEMACHINE = "k3-j721e"
>> OPTEEOUTPUTMACHINE = "k3"
>>
>> -# Use default IMAGE_BOOT_FILES_LEGACY files
>> -
>> # 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"
>> diff --git a/conf/machine/include/k3.inc b/conf/machine/include/k3.inc
>> index f85e6b98..24741dee 100644
>> --- a/conf/machine/include/k3.inc
>> +++ b/conf/machine/include/k3.inc
>> @@ -41,10 +41,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"
>>
>> WKS_FILE ?= "sdimage-2part.wks"
>> do_image_wic[depends] += "virtual/bootloader:do_deploy"
>> diff --git a/conf/machine/j7-evm.conf b/conf/machine/j7-evm.conf
>> index 1f47f00c..514695d6 100644
>> --- a/conf/machine/j7-evm.conf
>> +++ b/conf/machine/j7-evm.conf
>> @@ -9,6 +9,9 @@ MACHINE_FEATURES += "gpu"
>> 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-proc-board-tps65917.dtb \
>> diff --git a/conf/machine/j7-hs-evm.conf b/conf/machine/j7-hs-evm.conf
>> index ece0d85e..5cb2a3cd 100644
>> --- a/conf/machine/j7-hs-evm.conf
>> +++ b/conf/machine/j7-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 J7 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/conf/machine/j7200-evm.conf b/conf/machine/j7200-evm.conf
>> index 2565c90c..c8a03a7b 100644
>> --- a/conf/machine/j7200-evm.conf
>> +++ b/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/conf/machine/j721s2-evm.conf b/conf/machine/j721s2-evm.conf
>> index 8cf3a414..ba5e8def 100644
>> --- a/conf/machine/j721s2-evm.conf
>> +++ b/conf/machine/j721s2-evm.conf
>> @@ -18,8 +18,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.36.1
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2022-08-02 19:57 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-08-01 21:40 [meta-ti][dunfell][PATCH 1/4] conf: machine: Make multi-certificate image the default Andrew Davis
2022-08-01 21:40 ` [meta-ti][dunfell][PATCH 2/4] ti-sci-fw: Use new SOC_TYPE and SYSFW_DIR to simplify recipe Andrew Davis
2022-08-01 21:40 ` [meta-ti][dunfell][PATCH 3/4] ti-sci-fw: Deploy all SYSFW firmware types Andrew Davis
2022-08-01 21:40 ` [meta-ti][dunfell][PATCH 4/4] ti-sci-fw: Use SYSFW_TIBOOT3 to point to the SYSFW image Andrew Davis
2022-08-02 19:47 ` [meta-ti][dunfell][PATCH 1/4] conf: machine: Make multi-certificate image the default Denys Dmytriyenko
2022-08-02 19:57 ` Andrew Davis
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.