* [meta-ti][dunfell][RFC 1/6] conf: machine: Make multi-certificate image the default
2022-07-01 22:02 [meta-ti][dunfell][RFC 0/6] HS SDK on GP EVM support Andrew Davis
@ 2022-07-01 22:02 ` Andrew Davis
2022-07-01 22:02 ` [meta-ti][dunfell][RFC 2/6] ti-sci-fw: Use new SOC_TYPE and SYSFW_DIR to simplify recipe Andrew Davis
` (5 subsequent siblings)
6 siblings, 0 replies; 11+ messages in thread
From: Andrew Davis @ 2022-07-01 22:02 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 e5ed0b73..a8898f12 100644
--- a/conf/machine/j721s2-evm.conf
+++ b/conf/machine/j721s2-evm.conf
@@ -17,8 +17,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] 11+ messages in thread* [meta-ti][dunfell][RFC 2/6] ti-sci-fw: Use new SOC_TYPE and SYSFW_DIR to simplify recipe
2022-07-01 22:02 [meta-ti][dunfell][RFC 0/6] HS SDK on GP EVM support Andrew Davis
2022-07-01 22:02 ` [meta-ti][dunfell][RFC 1/6] conf: machine: Make multi-certificate image the default Andrew Davis
@ 2022-07-01 22:02 ` Andrew Davis
2022-07-02 22:30 ` Denys Dmytriyenko
2022-07-01 22:02 ` [meta-ti][dunfell][RFC 3/6] ti-sci-fw: Deploy all SYSFW firmware types Andrew Davis
` (4 subsequent siblings)
6 siblings, 1 reply; 11+ messages in thread
From: Andrew Davis @ 2022-07-01 22:02 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-sci-fw/ti-sci-fw_git.bb | 325 +++++++++----------------
1 file changed, 116 insertions(+), 209 deletions(-)
rewrite recipes-bsp/ti-sci-fw/ti-sci-fw_git.bb (64%)
diff --git a/recipes-bsp/ti-sci-fw/ti-sci-fw_git.bb b/recipes-bsp/ti-sci-fw/ti-sci-fw_git.bb
dissimilarity index 64%
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
@@ -1,209 +1,116 @@
-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"
-
-CLEANBROKEN = "1"
-PR = "${INC_PR}.2"
-
-# Loaded by R5F core
-COMPATIBLE_MACHINE = "k3r5"
-COMPATIBLE_MACHINE_aarch64 = "null"
-
-PACKAGE_ARCH = "${MACHINE_ARCH}"
-
-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_BASE = "${SYSFW_PREFIX}-${SYSFW_SOC}-${SYSFW_SUFFIX}"
-SYSFW_BASE_append = "${@['','*']['${SYSFW_SUFFIX}' == 'hs']}"
-
-SYSFW_TISCI = "${S}/ti-sysfw/${SYSFW_BASE}.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"
-SYSFW_SYMLINK ?= "sysfw.itb"
-
-CFLAGS[unexport] = "1"
-LDFLAGS[unexport] = "1"
-AS[unexport] = "1"
-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} \
-"
-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""
-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""
-
-do_compile() {
- cd ${WORKDIR}/imggen/
- oe_runmake
-}
-
-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}
- fi
-}
-
-FILES_${PN} = "/boot"
-
-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}/
-}
-
-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}
-}
-
-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}/
-}
-
-addtask deploy before do_build after do_compile
+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"
+
+CLEANBROKEN = "1"
+PR = "${INC_PR}.2"
+
+# Loaded by R5F core
+COMPATIBLE_MACHINE = "k3r5"
+COMPATIBLE_MACHINE_aarch64 = "null"
+
+PACKAGE_ARCH = "${MACHINE_ARCH}"
+
+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_BASE = "${SYSFW_PREFIX}-${SYSFW_SOC}-${SYSFW_SUFFIX}"
+SYSFW_BASE_append = "${@['','*']['${SYSFW_SUFFIX}' == 'hs']}"
+
+SYSFW_TISCI = "${S}/ti-sysfw/${SYSFW_BASE}.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"
+SYSFW_SYMLINK ?= "sysfw.itb"
+
+CFLAGS[unexport] = "1"
+LDFLAGS[unexport] = "1"
+AS[unexport] = "1"
+LD[unexport] = "1"
+
+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" \
+"
+
+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""
+
+do_compile() {
+ cd ${WORKDIR}/imggen/
+ oe_runmake
+}
+
+do_install() {
+ install -d ${D}/boot
+
+ 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
+}
+
+FILES_${PN} = "/boot"
+
+inherit deploy
+
+do_deploy () {
+ install -d ${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
+
+ 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
+
+ install -m 644 ${SYSFW_TISCI} ${DEPLOYDIR}/
+}
+
+addtask deploy before do_build after do_compile
--
2.36.1
^ permalink raw reply related [flat|nested] 11+ messages in thread* Re: [meta-ti][dunfell][RFC 2/6] ti-sci-fw: Use new SOC_TYPE and SYSFW_DIR to simplify recipe
2022-07-01 22:02 ` [meta-ti][dunfell][RFC 2/6] ti-sci-fw: Use new SOC_TYPE and SYSFW_DIR to simplify recipe Andrew Davis
@ 2022-07-02 22:30 ` Denys Dmytriyenko
2022-07-05 15:04 ` Andrew Davis
0 siblings, 1 reply; 11+ messages in thread
From: Denys Dmytriyenko @ 2022-07-02 22:30 UTC (permalink / raw)
To: afd; +Cc: Denys Dmytriyenko, Ryan Eatmon, meta-ti
Please lower the similarity threshold so the change shows as a diff and not
just remove/add. Thanks!
On Fri, Jul 01, 2022 at 05:02:24PM -0500, Andrew Davis via lists.yoctoproject.org wrote:
> 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-sci-fw/ti-sci-fw_git.bb | 325 +++++++++----------------
> 1 file changed, 116 insertions(+), 209 deletions(-)
> rewrite recipes-bsp/ti-sci-fw/ti-sci-fw_git.bb (64%)
>
> diff --git a/recipes-bsp/ti-sci-fw/ti-sci-fw_git.bb b/recipes-bsp/ti-sci-fw/ti-sci-fw_git.bb
> dissimilarity index 64%
> 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
> @@ -1,209 +1,116 @@
> -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"
> -
> -CLEANBROKEN = "1"
> -PR = "${INC_PR}.2"
> -
> -# Loaded by R5F core
> -COMPATIBLE_MACHINE = "k3r5"
> -COMPATIBLE_MACHINE_aarch64 = "null"
> -
> -PACKAGE_ARCH = "${MACHINE_ARCH}"
> -
> -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_BASE = "${SYSFW_PREFIX}-${SYSFW_SOC}-${SYSFW_SUFFIX}"
> -SYSFW_BASE_append = "${@['','*']['${SYSFW_SUFFIX}' == 'hs']}"
> -
> -SYSFW_TISCI = "${S}/ti-sysfw/${SYSFW_BASE}.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"
> -SYSFW_SYMLINK ?= "sysfw.itb"
> -
> -CFLAGS[unexport] = "1"
> -LDFLAGS[unexport] = "1"
> -AS[unexport] = "1"
> -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} \
> -"
> -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""
> -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""
> -
> -do_compile() {
> - cd ${WORKDIR}/imggen/
> - oe_runmake
> -}
> -
> -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}
> - fi
> -}
> -
> -FILES_${PN} = "/boot"
> -
> -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}/
> -}
> -
> -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}
> -}
> -
> -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}/
> -}
> -
> -addtask deploy before do_build after do_compile
> +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"
> +
> +CLEANBROKEN = "1"
> +PR = "${INC_PR}.2"
> +
> +# Loaded by R5F core
> +COMPATIBLE_MACHINE = "k3r5"
> +COMPATIBLE_MACHINE_aarch64 = "null"
> +
> +PACKAGE_ARCH = "${MACHINE_ARCH}"
> +
> +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_BASE = "${SYSFW_PREFIX}-${SYSFW_SOC}-${SYSFW_SUFFIX}"
> +SYSFW_BASE_append = "${@['','*']['${SYSFW_SUFFIX}' == 'hs']}"
> +
> +SYSFW_TISCI = "${S}/ti-sysfw/${SYSFW_BASE}.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"
> +SYSFW_SYMLINK ?= "sysfw.itb"
> +
> +CFLAGS[unexport] = "1"
> +LDFLAGS[unexport] = "1"
> +AS[unexport] = "1"
> +LD[unexport] = "1"
> +
> +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" \
> +"
> +
> +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""
> +
> +do_compile() {
> + cd ${WORKDIR}/imggen/
> + oe_runmake
> +}
> +
> +do_install() {
> + install -d ${D}/boot
> +
> + 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
> +}
> +
> +FILES_${PN} = "/boot"
> +
> +inherit deploy
> +
> +do_deploy () {
> + install -d ${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
> +
> + 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
> +
> + install -m 644 ${SYSFW_TISCI} ${DEPLOYDIR}/
> +}
> +
> +addtask deploy before do_build after do_compile
> --
> 2.36.1
>
^ permalink raw reply [flat|nested] 11+ messages in thread
* [meta-ti][dunfell][RFC 3/6] ti-sci-fw: Deploy all SYSFW firmware types
2022-07-01 22:02 [meta-ti][dunfell][RFC 0/6] HS SDK on GP EVM support Andrew Davis
2022-07-01 22:02 ` [meta-ti][dunfell][RFC 1/6] conf: machine: Make multi-certificate image the default Andrew Davis
2022-07-01 22:02 ` [meta-ti][dunfell][RFC 2/6] ti-sci-fw: Use new SOC_TYPE and SYSFW_DIR to simplify recipe Andrew Davis
@ 2022-07-01 22:02 ` Andrew Davis
2022-07-01 22:02 ` [meta-ti][dunfell][RFC 4/6] ti-sci-fw: Use SYSFW_TIBOOT3 to point to the SYSFW image Andrew Davis
` (3 subsequent siblings)
6 siblings, 0 replies; 11+ messages in thread
From: Andrew Davis @ 2022-07-01 22:02 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] 11+ messages in thread* [meta-ti][dunfell][RFC 4/6] ti-sci-fw: Use SYSFW_TIBOOT3 to point to the SYSFW image
2022-07-01 22:02 [meta-ti][dunfell][RFC 0/6] HS SDK on GP EVM support Andrew Davis
` (2 preceding siblings ...)
2022-07-01 22:02 ` [meta-ti][dunfell][RFC 3/6] ti-sci-fw: Deploy all SYSFW firmware types Andrew Davis
@ 2022-07-01 22:02 ` Andrew Davis
2022-07-01 22:02 ` [meta-ti][dunfell][RFC 5/6] machine: am64xx-k3r5: The output of u-boot is not used Andrew Davis
` (2 subsequent siblings)
6 siblings, 0 replies; 11+ messages in thread
From: Andrew Davis @ 2022-07-01 22:02 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] 11+ messages in thread* [meta-ti][dunfell][RFC 5/6] machine: am64xx-k3r5: The output of u-boot is not used
2022-07-01 22:02 [meta-ti][dunfell][RFC 0/6] HS SDK on GP EVM support Andrew Davis
` (3 preceding siblings ...)
2022-07-01 22:02 ` [meta-ti][dunfell][RFC 4/6] ti-sci-fw: Use SYSFW_TIBOOT3 to point to the SYSFW image Andrew Davis
@ 2022-07-01 22:02 ` Andrew Davis
2022-07-01 22:02 ` [meta-ti][dunfell][RFC 6/6] ti-sci-fw: Deploy GP version of tiboot3.bin with HS SDK Andrew Davis
2022-07-02 22:43 ` [meta-ti][dunfell][RFC 0/6] HS SDK on GP EVM support Denys Dmytriyenko
6 siblings, 0 replies; 11+ messages in thread
From: Andrew Davis @ 2022-07-01 22:02 UTC (permalink / raw)
To: Denys Dmytriyenko, Ryan Eatmon, meta-ti; +Cc: Andrew Davis
The file tiboot3.bin produced by u-boot is not the final used
output, it should not be installed or deployed. The file with
the same name from ti-sci-fw is used. Correct this.
Signed-off-by: Andrew Davis <afd@ti.com>
---
conf/machine/am64xx-evm-k3r5.conf | 7 +++++++
conf/machine/am64xx-hs-evm-k3r5.conf | 7 +++++++
recipes-bsp/u-boot/u-boot-ti.inc | 10 ----------
3 files changed, 14 insertions(+), 10 deletions(-)
diff --git a/conf/machine/am64xx-evm-k3r5.conf b/conf/machine/am64xx-evm-k3r5.conf
index afd36b72..0835d13f 100644
--- a/conf/machine/am64xx-evm-k3r5.conf
+++ b/conf/machine/am64xx-evm-k3r5.conf
@@ -8,4 +8,11 @@ SYSFW_SOC = "am64x"
SYSFW_CONFIG = "evm"
SYSFW_SUFFIX = "gp"
+# SoCs that use combined image for tiboot3.bin include u-boot-spl.bin with sysfw
+# along with board configs generated by k3-image-gen and comes from ti-sci-fw
+# hence remove the legacy u-boot's tiboot3.bin and add u-boot-spl.bin instead
+UBOOT_BINARY = "spl/u-boot-spl.${UBOOT_SUFFIX}"
+UBOOT_IMAGE = "spl/u-boot-spl-${MAINMACHINE}-${PV}-${PR}.${UBOOT_SUFFIX}"
+UBOOT_SYMLINK = "u-boot-spl.${UBOOT_SUFFIX}"
+
UBOOT_MACHINE = "am64x_evm_r5_defconfig"
diff --git a/conf/machine/am64xx-hs-evm-k3r5.conf b/conf/machine/am64xx-hs-evm-k3r5.conf
index d12c030f..1b2548fd 100644
--- a/conf/machine/am64xx-hs-evm-k3r5.conf
+++ b/conf/machine/am64xx-hs-evm-k3r5.conf
@@ -9,6 +9,13 @@ SYSFW_CONFIG = "evm"
SYSFW_SUFFIX = "hs"
SYSFW_SYMLINK = ""
+# SoCs that use combined image for tiboot3.bin include u-boot-spl.bin with sysfw
+# along with board configs generated by k3-image-gen and comes from ti-sci-fw
+# hence remove the legacy u-boot's tiboot3.bin and add u-boot-spl.bin instead
+UBOOT_BINARY = "spl/u-boot-spl.${UBOOT_SUFFIX}"
+UBOOT_IMAGE = "spl/u-boot-spl-${MAINMACHINE}-${PV}-${PR}.${UBOOT_SUFFIX}"
+UBOOT_SYMLINK = "u-boot-spl.${UBOOT_SUFFIX}"
+
UBOOT_MACHINE = "am64x_hs_evm_r5_defconfig"
TI_SECURE_DEV_PKG = "${TI_SECURE_DEV_PKG_K3}"
diff --git a/recipes-bsp/u-boot/u-boot-ti.inc b/recipes-bsp/u-boot/u-boot-ti.inc
index e7c93335..cfb57056 100644
--- a/recipes-bsp/u-boot/u-boot-ti.inc
+++ b/recipes-bsp/u-boot/u-boot-ti.inc
@@ -409,16 +409,6 @@ do_deploy_append_j721s2-hs-evm-k3r5 () {
mv ${DEPLOYDIR}/u-boot-spl.bin ${DEPLOYDIR}/u-boot-spl-r5spl.bin || true
}
-do_deploy_append_am64xx-evm-k3r5 () {
- mv ${DEPLOYDIR}/tiboot3.bin ${DEPLOYDIR}/tiboot3-r5spl.bin || true
- mv ${DEPLOYDIR}/u-boot-spl.bin ${DEPLOYDIR}/u-boot-spl-r5spl.bin || true
-}
-
-do_deploy_append_am64xx-hs-evm-k3r5 () {
- mv ${DEPLOYDIR}/tiboot3.bin ${DEPLOYDIR}/tiboot3-r5spl.bin || true
- mv ${DEPLOYDIR}/u-boot-spl.bin ${DEPLOYDIR}/u-boot-spl-r5spl.bin || true
-}
-
do_deploy_append_am62xx-evm-k3r5 () {
mv ${DEPLOYDIR}/tiboot3.bin ${DEPLOYDIR}/tiboot3-r5spl.bin || true
mv ${DEPLOYDIR}/u-boot-spl.bin ${DEPLOYDIR}/u-boot-spl-r5spl.bin || true
--
2.36.1
^ permalink raw reply related [flat|nested] 11+ messages in thread* [meta-ti][dunfell][RFC 6/6] ti-sci-fw: Deploy GP version of tiboot3.bin with HS SDK
2022-07-01 22:02 [meta-ti][dunfell][RFC 0/6] HS SDK on GP EVM support Andrew Davis
` (4 preceding siblings ...)
2022-07-01 22:02 ` [meta-ti][dunfell][RFC 5/6] machine: am64xx-k3r5: The output of u-boot is not used Andrew Davis
@ 2022-07-01 22:02 ` Andrew Davis
2022-07-02 22:43 ` [meta-ti][dunfell][RFC 0/6] HS SDK on GP EVM support Denys Dmytriyenko
6 siblings, 0 replies; 11+ messages in thread
From: Andrew Davis @ 2022-07-01 22:02 UTC (permalink / raw)
To: Denys Dmytriyenko, Ryan Eatmon, meta-ti; +Cc: Andrew Davis
This allows users of the HS SDK to run on GP EVMs. This file
can be used instead of the HS default.
Signed-off-by: Andrew Davis <afd@ti.com>
---
conf/machine/am64xx-hs-evm.conf | 2 ++
recipes-bsp/ti-sci-fw/ti-sci-fw_git.bb | 13 +++++++++++++
2 files changed, 15 insertions(+)
diff --git a/conf/machine/am64xx-hs-evm.conf b/conf/machine/am64xx-hs-evm.conf
index ebbe2e62..85c5325b 100644
--- a/conf/machine/am64xx-hs-evm.conf
+++ b/conf/machine/am64xx-hs-evm.conf
@@ -18,4 +18,6 @@ SPL_BINARY = "tispl.bin_HS"
UBOOT_BINARY = "u-boot.img_HS"
UBOOT_SYMLINK = "u-boot.img"
+IMAGE_BOOT_FILES += "tiboot3-am64x-gp-evm.bin"
+
TI_SECURE_DEV_PKG = "${TI_SECURE_DEV_PKG_K3}"
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 1b2ea184..c96078e6 100644
--- a/recipes-bsp/ti-sci-fw/ti-sci-fw_git.bb
+++ b/recipes-bsp/ti-sci-fw/ti-sci-fw_git.bb
@@ -69,6 +69,11 @@ do_compile() {
oe_runmake
}
+do_compile_prepend_am64xx-hs-evm-k3r5() {
+ cd ${WORKDIR}/imggen/
+ oe_runmake SOC_TYPE=gp
+}
+
do_install() {
install -d ${D}/boot
@@ -86,6 +91,10 @@ do_install() {
fi
}
+do_install_append_am64xx-hs-evm-k3r5() {
+ install -m 644 ${WORKDIR}/imggen/tiboot3-${SYSFW_SOC}-gp-${SYSFW_CONFIG}.bin ${D}/boot/tiboot3-${SYSFW_SOC}-gp-${SYSFW_CONFIG}.bin
+}
+
FILES_${PN} = "/boot"
inherit deploy
@@ -109,4 +118,8 @@ do_deploy () {
install -m 644 ${SYSFW_TISCI} ${DEPLOYDIR}/
}
+do_deploy_append_am64xx-hs-evm-k3r5() {
+ install -m 644 ${WORKDIR}/imggen/tiboot3-${SYSFW_SOC}-gp-${SYSFW_CONFIG}.bin ${DEPLOYDIR}/tiboot3-${SYSFW_SOC}-gp-${SYSFW_CONFIG}.bin
+}
+
addtask deploy before do_build after do_compile
--
2.36.1
^ permalink raw reply related [flat|nested] 11+ messages in thread* Re: [meta-ti][dunfell][RFC 0/6] HS SDK on GP EVM support
2022-07-01 22:02 [meta-ti][dunfell][RFC 0/6] HS SDK on GP EVM support Andrew Davis
` (5 preceding siblings ...)
2022-07-01 22:02 ` [meta-ti][dunfell][RFC 6/6] ti-sci-fw: Deploy GP version of tiboot3.bin with HS SDK Andrew Davis
@ 2022-07-02 22:43 ` Denys Dmytriyenko
2022-07-05 15:28 ` Andrew Davis
6 siblings, 1 reply; 11+ messages in thread
From: Denys Dmytriyenko @ 2022-07-02 22:43 UTC (permalink / raw)
To: afd; +Cc: Denys Dmytriyenko, Ryan Eatmon, meta-ti
On Fri, Jul 01, 2022 at 05:02:22PM -0500, Andrew Davis via lists.yoctoproject.org wrote:
> Hello all,
>
> Still some changes pending in the k3-image-gen and u-boot projects
> but wanted to get some comments on this early. Plan is to remove
> the GP SDK. Have the HS SDK work on GP SoCs with minimal effort
> and have HS become the default single SDK type (starting only
> with AM64x and working out from there so don't panic (yet)).
So, quick question - does this set have any chance to get merged this year
into dunfell before kirkstone becomes the current base?
Reason being is that I've been mulling over a much better and granular
grouping of platforms in master/kirkstone into different categories, such
as legacy (ARMv7) HS vs. K3 HS, legacy vs. multi-cert boot, GPU vs headless,
etc.
This would be the best use of those new groupings...
> Thanks,
> Andrew
>
> Andrew Davis (6):
> conf: machine: Make multi-certificate image the default
> ti-sci-fw: Use new SOC_TYPE and SYSFW_DIR to simplify recipe
> ti-sci-fw: Deploy all SYSFW firmware types
> ti-sci-fw: Use SYSFW_TIBOOT3 to point to the SYSFW image
> machine: am64xx-k3r5: The output of u-boot is not used
> ti-sci-fw: Deploy GP version of tiboot3.bin with HS SDK
>
> conf/machine/am64xx-evm-k3r5.conf | 7 +
> conf/machine/am64xx-hs-evm-k3r5.conf | 7 +
> conf/machine/am64xx-hs-evm.conf | 2 +
> 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 -
> recipes-bsp/ti-sci-fw/ti-sci-fw_git.bb | 334 +++++++++----------------
> recipes-bsp/u-boot/u-boot-ti.inc | 10 -
> 14 files changed, 149 insertions(+), 239 deletions(-)
> rewrite recipes-bsp/ti-sci-fw/ti-sci-fw_git.bb (72%)
>
> --
> 2.36.1
^ permalink raw reply [flat|nested] 11+ messages in thread* Re: [meta-ti][dunfell][RFC 0/6] HS SDK on GP EVM support
2022-07-02 22:43 ` [meta-ti][dunfell][RFC 0/6] HS SDK on GP EVM support Denys Dmytriyenko
@ 2022-07-05 15:28 ` Andrew Davis
0 siblings, 0 replies; 11+ messages in thread
From: Andrew Davis @ 2022-07-05 15:28 UTC (permalink / raw)
To: Denys Dmytriyenko; +Cc: Denys Dmytriyenko, Ryan Eatmon, meta-ti
On 7/2/22 5:43 PM, Denys Dmytriyenko wrote:
> On Fri, Jul 01, 2022 at 05:02:22PM -0500, Andrew Davis via lists.yoctoproject.org wrote:
>> Hello all,
>>
>> Still some changes pending in the k3-image-gen and u-boot projects
>> but wanted to get some comments on this early. Plan is to remove
>> the GP SDK. Have the HS SDK work on GP SoCs with minimal effort
>> and have HS become the default single SDK type (starting only
>> with AM64x and working out from there so don't panic (yet)).
>
> So, quick question - does this set have any chance to get merged this year
> into dunfell before kirkstone becomes the current base?
>
Was hoping this (for AM64x only) could be ready for merge in the next week or so..
> Reason being is that I've been mulling over a much better and granular
> grouping of platforms in master/kirkstone into different categories, such
> as legacy (ARMv7) HS vs. K3 HS, legacy vs. multi-cert boot, GPU vs headless,
> etc.
>
> This would be the best use of those new groupings...
>
Does sound interesting, I'm game for re-working this series for
master/kirkstone as needed too.
Is this new grouping still in the mulling stage only, or do you
have some details on what this new grouping scheme might look like?
Most categories feel orthogonal already, (any can be GPU vs headless, etc.),
only the "Legacy vs K3" being a top level that would have some specifics
under it,
* legacy
- GP / HS
* K3
- non-combined / multi-cert boot
- combined / split SYSFW
- GP / HS <- this one I'd like to go away making it a legacy-only
category and not a purely orthogonal one like before.
Andrew
>
>> Thanks,
>> Andrew
>>
>> Andrew Davis (6):
>> conf: machine: Make multi-certificate image the default
>> ti-sci-fw: Use new SOC_TYPE and SYSFW_DIR to simplify recipe
>> ti-sci-fw: Deploy all SYSFW firmware types
>> ti-sci-fw: Use SYSFW_TIBOOT3 to point to the SYSFW image
>> machine: am64xx-k3r5: The output of u-boot is not used
>> ti-sci-fw: Deploy GP version of tiboot3.bin with HS SDK
>>
>> conf/machine/am64xx-evm-k3r5.conf | 7 +
>> conf/machine/am64xx-hs-evm-k3r5.conf | 7 +
>> conf/machine/am64xx-hs-evm.conf | 2 +
>> 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 -
>> recipes-bsp/ti-sci-fw/ti-sci-fw_git.bb | 334 +++++++++----------------
>> recipes-bsp/u-boot/u-boot-ti.inc | 10 -
>> 14 files changed, 149 insertions(+), 239 deletions(-)
>> rewrite recipes-bsp/ti-sci-fw/ti-sci-fw_git.bb (72%)
>>
>> --
>> 2.36.1
^ permalink raw reply [flat|nested] 11+ messages in thread