1
0
mirror of https://git.yoctoproject.org/meta-ti synced 2026-06-06 02:42:34 +00:00

j721s2-hs: changes to support new hs platform

Changes to support new j721s2-hs platform in:
1) ti-sci-fw_git: Update firmware prefix for j721s2-hs
2) atf: sign the image
3) u-boot: Add u-boot-spl image for combined boot image
4) optee: sign the image

Signed-off-by: Jayesh Choudhary <j-choudhary@ti.com>
Signed-off-by: Ryan Eatmon <reatmon@ti.com>
Signed-off-by: Denys Dmytriyenko <denys@konsulko.com>
Signed-off-by: Ryan Eatmon <reatmon@ti.com>
This commit is contained in:
Jayesh Choudhary
2022-09-13 03:54:52 +00:00
committed by Ryan Eatmon
parent b3822e7b26
commit 3a1e3bfe6c
4 changed files with 36 additions and 0 deletions
@@ -4,6 +4,7 @@ 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"
@@ -30,6 +31,7 @@ SYSFW_PREFIX:j721e-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"
@@ -63,6 +65,7 @@ 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""
@@ -143,6 +146,21 @@ do_deploy:j721s2-evm-k3r5() {
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}
@@ -42,3 +42,11 @@ do_compile:append:j7200-hs-evm() {
${TI_SECURE_DEV_PKG}/scripts/secure-binary-image.sh bl31.bin.unsigned bl31.bin; \
)
}
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; \
)
}
@@ -59,6 +59,7 @@ SPL_UART_BINARY:lego-ev3 = ""
SPL_UART_BINARY:j7200-evm-k3r5 = "u-boot-spl.bin"
SPL_UART_BINARY:j7200-hs-evm-k3r5 = "u-boot-spl.bin"
SPL_UART_BINARY:j721s2-evm-k3r5 = "u-boot-spl.bin"
SPL_UART_BINARY:j721s2-hs-evm-k3r5 = "u-boot-spl.bin"
SPL_UART_BINARY:am64xx-evm-k3r5 = "u-boot-spl.bin"
SPL_UART_BINARY:am64xx-hs-evm-k3r5 = "u-boot-spl.bin"
SPL_UART_BINARY:am62xx-evm-k3r5 = "u-boot-spl.bin"
@@ -277,6 +278,11 @@ do_deploy:append:j721s2-evm-k3r5 () {
mv ${DEPLOYDIR}/u-boot-spl.bin ${DEPLOYDIR}/u-boot-spl-r5spl.bin || true
}
do_deploy:append:j721s2-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: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
@@ -63,6 +63,10 @@ do_compile:append:j7200-hs-evm() {
optee_sign_k3hs
}
do_compile:append:j721s2-hs-evm() {
optee_sign_k3hs
}
do_install:append:ti-soc() {
install -m 644 ${B}/*.optee ${D}${nonarch_base_libdir}/firmware/ || true
install -m 644 ${B}/bl32.bin ${D}${nonarch_base_libdir}/firmware/ || true