diff mbox series

[meta-ti,dunfell,RFC,v2] am62axx-evm: Add support for HS-FS and HS-SE platforms

Message ID 20230210000834.24783-1-s-adivi@ti.com
State RFC
Delegated to: Ryan Eatmon
Headers show
Series [meta-ti,dunfell,RFC,v2] am62axx-evm: Add support for HS-FS and HS-SE platforms | expand

Commit Message

Sai Sree Kartheek Adivi Feb. 10, 2023, 12:08 a.m. UTC
Add support for HS-FS and HS-SE along with GP platforms and make HS-FS default.

Signed-off-by: Sai Sree Kartheek Adivi <s-adivi@ti.com>
---
 conf/machine/am62axx-evm-k3r5-gp.conf         | 21 +++++++++++++++++++
 conf/machine/am62axx-evm-k3r5-hs-fs.conf      | 15 +++++++++++++
 conf/machine/am62axx-evm-k3r5-hs-se.conf      | 20 ++++++++++++++++++
 conf/machine/am62axx-evm-k3r5.conf            | 11 ----------
 conf/machine/include/am62axx.inc              | 21 ++++++++++++++++---
 conf/multiconfig/k3r5-hs-fs.conf              |  3 +++
 recipes-bsp/ti-sci-fw/ti-sci-fw_git.bb        |  2 ++
 .../trusted-firmware-a_%.bbappend             |  4 ++++
 recipes-security/optee/optee-os_%.bbappend    |  4 ++++
 recipes-ti/ti-rtos-bin/ti-rtos-firmware.bb    | 16 ++++++++++++++
 10 files changed, 103 insertions(+), 14 deletions(-)
 create mode 100644 conf/machine/am62axx-evm-k3r5-gp.conf
 create mode 100644 conf/machine/am62axx-evm-k3r5-hs-fs.conf
 create mode 100644 conf/machine/am62axx-evm-k3r5-hs-se.conf
 delete mode 100644 conf/machine/am62axx-evm-k3r5.conf
 create mode 100644 conf/multiconfig/k3r5-hs-fs.conf

Comments

Bajjuri, Praneeth Feb. 10, 2023, 11:04 p.m. UTC | #1
Sai,

On 2/9/2023 6:08 PM, Sai Sree Kartheek Adivi wrote:
> Add support for HS-FS and HS-SE along with GP platforms and make HS-FS default.

Now that the needed firmwares are in the production branches, please 
resubmit the patch without RFC in subject.


> 
> Signed-off-by: Sai Sree Kartheek Adivi<s-adivi@ti.com>
> ---
>   conf/machine/am62axx-evm-k3r5-gp.conf         | 21 +++++++++++++++++++
>   conf/machine/am62axx-evm-k3r5-hs-fs.conf      | 15 +++++++++++++
>   conf/machine/am62axx-evm-k3r5-hs-se.conf      | 20 ++++++++++++++++++
>   conf/machine/am62axx-evm-k3r5.conf            | 11 ----------
>   conf/machine/include/am62axx.inc              | 21 ++++++++++++++++---
>   conf/multiconfig/k3r5-hs-fs.conf              |  3 +++
>   recipes-bsp/ti-sci-fw/ti-sci-fw_git.bb        |  2 ++
>   .../trusted-firmware-a_%.bbappend             |  4 ++++
>   recipes-security/optee/optee-os_%.bbappend    |  4 ++++
>   recipes-ti/ti-rtos-bin/ti-rtos-firmware.bb    | 16 ++++++++++++++
>   10 files changed, 103 insertions(+), 14 deletions(-)
>   create mode 100644 conf/machine/am62axx-evm-k3r5-gp.conf
>   create mode 100644 conf/machine/am62axx-evm-k3r5-hs-fs.conf
>   create mode 100644 conf/machine/am62axx-evm-k3r5-hs-se.conf
>   delete mode 100644 conf/machine/am62axx-evm-k3r5.conf
>   create mode 100644 conf/multiconfig/k3r5-hs-fs.conf
Ryan Eatmon Feb. 13, 2023, 11:40 p.m. UTC | #2
On 2/9/2023 18:08, Sai Sree Kartheek Adivi wrote:
> Add support for HS-FS and HS-SE along with GP platforms and make HS-FS default.
> 
> Signed-off-by: Sai Sree Kartheek Adivi <s-adivi@ti.com>
> ---
>   conf/machine/am62axx-evm-k3r5-gp.conf         | 21 +++++++++++++++++++
>   conf/machine/am62axx-evm-k3r5-hs-fs.conf      | 15 +++++++++++++
>   conf/machine/am62axx-evm-k3r5-hs-se.conf      | 20 ++++++++++++++++++
>   conf/machine/am62axx-evm-k3r5.conf            | 11 ----------
>   conf/machine/include/am62axx.inc              | 21 ++++++++++++++++---
>   conf/multiconfig/k3r5-hs-fs.conf              |  3 +++
>   recipes-bsp/ti-sci-fw/ti-sci-fw_git.bb        |  2 ++
>   .../trusted-firmware-a_%.bbappend             |  4 ++++
>   recipes-security/optee/optee-os_%.bbappend    |  4 ++++
>   recipes-ti/ti-rtos-bin/ti-rtos-firmware.bb    | 16 ++++++++++++++
>   10 files changed, 103 insertions(+), 14 deletions(-)
>   create mode 100644 conf/machine/am62axx-evm-k3r5-gp.conf
>   create mode 100644 conf/machine/am62axx-evm-k3r5-hs-fs.conf
>   create mode 100644 conf/machine/am62axx-evm-k3r5-hs-se.conf
>   delete mode 100644 conf/machine/am62axx-evm-k3r5.conf
>   create mode 100644 conf/multiconfig/k3r5-hs-fs.conf
> 
> diff --git a/conf/machine/am62axx-evm-k3r5-gp.conf b/conf/machine/am62axx-evm-k3r5-gp.conf
> new file mode 100644
> index 00000000..898af7e8
> --- /dev/null
> +++ b/conf/machine/am62axx-evm-k3r5-gp.conf
> @@ -0,0 +1,21 @@
> +#@TYPE: Machine
> +#@NAME: AM62A GP EVM (R5F)
> +#@DESCRIPTION: Machine configuration for the TI AM62A GP EVM (R5F core)
> +
> +# Booting GP requires different SYSFW, the rest is handled at runtime
> +
> +require conf/machine/include/k3r5.inc
> +SOC_FAMILY_append = ":k3r5-gp"
> +
> +SYSFW_SOC = "am62ax"
> +SYSFW_CONFIG = "evm"
> +SYSFW_SUFFIX = "gp"
> +SYSFW_TIBOOT3_SYMLINK = ""

There are build errors with this patch.  k3-image-gen is configured to 
build sysfw for am62axx so two things need to occur.

1) You need an extra variable here to avoid the do_deploy duplication 
errors.

    SYSFW_SYMLINK = ""


2) I need to patch ti-sci-fw_git.bb to remove the collision on the 
sysfw.itb files deployed by the recipe.  I have already sent this patch 
to the list.


> +
> +UBOOT_MACHINE = "am62ax_evm_r5_defconfig"
> +
> +SPL_BINARY = ""
> +UBOOT_BINARY = "u-boot-spl.${UBOOT_SUFFIX}"
> +UBOOT_IMAGE = "u-boot-r5spl-gp-${MAINMACHINE}-${PV}-${PR}.${UBOOT_SUFFIX}"
> +UBOOT_SYMLINK = "u-boot-r5spl-gp.${UBOOT_SUFFIX}"
> +
> diff --git a/conf/machine/am62axx-evm-k3r5-hs-fs.conf b/conf/machine/am62axx-evm-k3r5-hs-fs.conf
> new file mode 100644
> index 00000000..2ecba7e4
> --- /dev/null
> +++ b/conf/machine/am62axx-evm-k3r5-hs-fs.conf
> @@ -0,0 +1,15 @@
> +#@TYPE: Machine
> +#@NAME: AM62A HS-FS EVM (R5F)
> +#@DESCRIPTION: Machine configuration for the TI AM62A HS-FS EVM (R5F core)
> +
> +# Booting HS-FS requires different SYSFW, the rest is handled at runtime
> +
> +require conf/machine/include/k3r5.inc
> +SOC_FAMILY_append = ":k3r5-hs-fs"
> +
> +SYSFW_SOC = "am62ax"
> +SYSFW_CONFIG = "evm"
> +SYSFW_SUFFIX = "hs-fs"
> +
> +UBOOT_MACHINE = "am62ax_evm_r5_defconfig"
> +
> diff --git a/conf/machine/am62axx-evm-k3r5-hs-se.conf b/conf/machine/am62axx-evm-k3r5-hs-se.conf
> new file mode 100644
> index 00000000..76d01a0e
> --- /dev/null
> +++ b/conf/machine/am62axx-evm-k3r5-hs-se.conf
> @@ -0,0 +1,20 @@
> +#@TYPE: Machine
> +#@NAME: AM62A HS-SE EVM (R5F)
> +#@DESCRIPTION: Machine configuration for the TI AM62A HS-SE EVM (R5F core)
> +
> +# Booting HS-SE requires different SYSFW, the rest is handled at runtime
> +
> +require conf/machine/include/k3r5.inc
> +SOC_FAMILY_append = ":k3r5-hs-se"
> +
> +SYSFW_SOC = "am62ax"
> +SYSFW_CONFIG = "evm"
> +SYSFW_SUFFIX = "hs" > +SYSFW_TIBOOT3_SYMLINK = ""

Same as above.  Add:

    SYSFW_SYMLINK = ""

> +
> +UBOOT_MACHINE = "am62ax_evm_r5_defconfig"
> +
> +SPL_BINARY = ""
> +UBOOT_BINARY = "u-boot-spl.${UBOOT_SUFFIX}"
> +UBOOT_IMAGE = "u-boot-r5spl-hs-se-${MAINMACHINE}-${PV}-${PR}.${UBOOT_SUFFIX}"
> +UBOOT_SYMLINK = "u-boot-r5spl-hs-se.${UBOOT_SUFFIX}"
> diff --git a/conf/machine/am62axx-evm-k3r5.conf b/conf/machine/am62axx-evm-k3r5.conf
> deleted file mode 100644
> index ca30537f..00000000
> --- a/conf/machine/am62axx-evm-k3r5.conf
> +++ /dev/null
> @@ -1,11 +0,0 @@
> -#@TYPE: Machine
> -#@NAME: AM62AXX EVM (R5F)
> -#@DESCRIPTION: Machine configuration for the TI AM62Axx EVM (R5F core)
> -
> -require conf/machine/include/k3r5.inc
> -
> -SYSFW_SOC = "am62ax"
> -SYSFW_CONFIG = "evm"
> -SYSFW_SUFFIX = "gp"
> -
> -UBOOT_MACHINE = "am62ax_evm_r5_defconfig"
> diff --git a/conf/machine/include/am62axx.inc b/conf/machine/include/am62axx.inc
> index 383d1c3f..71a03e98 100644
> --- a/conf/machine/include/am62axx.inc
> +++ b/conf/machine/include/am62axx.inc
> @@ -8,9 +8,24 @@ SERIAL_CONSOLES_CHECK = "${SERIAL_CONSOLES}"
>   
>   TFA_K3_SYSTEM_SUSPEND = "1"
>   
> -do_image_wic[mcdepends] = "mc::k3r5:ti-sci-fw:do_deploy"
> -do_image_tar[mcdepends] = "mc::k3r5:ti-sci-fw:do_deploy"
> -
>   TFA_BOARD = "lite"
>   OPTEEMACHINE = "k3-am62x"
>   OPTEEOUTPUTMACHINE = "k3"
> +
> +# Default tiboot3.bin on AM62Ax is for HS-FS
> +BBMULTICONFIG = "k3r5-hs-fs"
> +do_image_wic[mcdepends] = "mc::k3r5-hs-fs:ti-sci-fw:do_deploy"
> +do_image_tar[mcdepends] = "mc::k3r5-hs-fs:ti-sci-fw:do_deploy"
> +
> +# Since default tiboot3.bin on AM62Ax is for HS-FS, add a version for GP
> +BBMULTICONFIG += "k3r5-gp"
> +IMAGE_BOOT_FILES += " tiboot3-am62ax-gp-evm.bin"
> +do_image_wic[mcdepends] += "mc::k3r5-gp:ti-sci-fw:do_deploy"
> +do_image_tar[mcdepends] += "mc::k3r5-gp:ti-sci-fw:do_deploy"
> +
> +# Since default tiboot3.bin on AM62Ax is for HS-FS, add a version for HS-SE
> +BBMULTICONFIG += "k3r5-hs-se"
> +IMAGE_BOOT_FILES += " tiboot3-am62ax-hs-se-evm.bin"

This path is wrong.  It is based on the SYSFW_SUFFIX which is "hs" for 
this multiconfig.  Change to:

IMAGE_BOOT_FILES += " tiboot3-am62ax-hs-evm.bin"


> +do_image_wic[mcdepends] += "mc::k3r5-hs-se:ti-sci-fw:do_deploy"
> +do_image_tar[mcdepends] += "mc::k3r5-hs-se:ti-sci-fw:do_deploy"
> +
> diff --git a/conf/multiconfig/k3r5-hs-fs.conf b/conf/multiconfig/k3r5-hs-fs.conf
> new file mode 100644
> index 00000000..c6d58ead
> --- /dev/null
> +++ b/conf/multiconfig/k3r5-hs-fs.conf
> @@ -0,0 +1,3 @@
> +require k3r5.conf
> +
> +MACHINE_append = "-hs-fs"
> 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 7896c366..a9418514 100644
> --- a/recipes-bsp/ti-sci-fw/ti-sci-fw_git.bb
> +++ b/recipes-bsp/ti-sci-fw/ti-sci-fw_git.bb
> @@ -42,6 +42,8 @@ SYSFW_PREFIX_am62xx-evm-k3r5-hs-se = "fs"
>   SYSFW_PREFIX_am62xx-lp-evm-k3r5 = "fs"
>   SYSFW_PREFIX_am62xx-lp-evm-k3r5-hs-se = "fs"
>   SYSFW_PREFIX_am62axx-evm-k3r5 = "fs"
> +SYSFW_PREFIX_am62axx-evm-k3r5-hs-fs = "fs"
> +SYSFW_PREFIX_am62axx-evm-k3r5-hs-se = "fs"
>   
>   SYSFW_TISCI = "${S}/ti-sysfw/ti-${SYSFW_PREFIX}-firmware-${SYSFW_SOC}-*.bin"
>   
> diff --git a/recipes-bsp/trusted-firmware-a/trusted-firmware-a_%.bbappend b/recipes-bsp/trusted-firmware-a/trusted-firmware-a_%.bbappend
> index 41071676..70406724 100644
> --- a/recipes-bsp/trusted-firmware-a/trusted-firmware-a_%.bbappend
> +++ b/recipes-bsp/trusted-firmware-a/trusted-firmware-a_%.bbappend
> @@ -39,6 +39,10 @@ do_compile_append_am62xx-lp-evm() {
>           tfa_sign_k3hs
>   }
>   
> +do_compile_append_am62axx-evm() {
> +        tfa_sign_k3hs
> +}
> +
>   do_compile_append_j7-hs-evm() {
>   	tfa_sign_k3hs
>   }
> diff --git a/recipes-security/optee/optee-os_%.bbappend b/recipes-security/optee/optee-os_%.bbappend
> index 91abbcee..8ef535cc 100644
> --- a/recipes-security/optee/optee-os_%.bbappend
> +++ b/recipes-security/optee/optee-os_%.bbappend
> @@ -80,6 +80,10 @@ do_compile_append_am62xx-lp-evm() {
>       optee_sign_k3hs
>   }
>   
> +do_compile_append_am62axx-evm() {
> +    optee_sign_k3hs
> +}
> +
>   do_compile_append_j7-hs-evm() {
>       optee_sign_k3hs
>   }
> diff --git a/recipes-ti/ti-rtos-bin/ti-rtos-firmware.bb b/recipes-ti/ti-rtos-bin/ti-rtos-firmware.bb
> index 72d85a6b..da7ff4e8 100644
> --- a/recipes-ti/ti-rtos-bin/ti-rtos-firmware.bb
> +++ b/recipes-ti/ti-rtos-bin/ti-rtos-firmware.bb
> @@ -188,6 +188,20 @@ do_install_prepend_am62xx() {
>           )
>   }
>   
> +do_install_prepend_am62axx-evm() {
> +        export TI_SECURE_DEV_PKG=${TI_SECURE_DEV_PKG}
> +        ( cd ${RTOS_DM_FW_DIR}; \
> +                mv ${DM_FIRMWARE} ${DM_FIRMWARE}.unsigned; \
> +                ${TI_SECURE_DEV_PKG}/scripts/secure-binary-image.sh ${DM_FIRMWARE}.unsigned ${DM_FIRMWARE}; \
> +        )
> +        ( cd ${RTOS_IPC_FW_DIR}; \
> +                ${TI_SECURE_DEV_PKG}/scripts/secure-binary-image.sh am62a-mcu-r5f0_0-fw \
> +                    am62a-mcu-r5f0_0-fw.signed; \
> +                ${TI_SECURE_DEV_PKG}/scripts/secure-binary-image.sh ipc_echo_test_c7x_1_release_strip.xe71 \
> +                    ipc_echo_test_c7x_1_release_strip.xe71.signed; \
> +        )
> +}
> +
>   #Install all R5 & DSP ipc echo test binaries in lib/firmware/pdk-ipc, with softlinks up a level
>   do_install() {
>   
> @@ -369,8 +383,10 @@ do_install_am62axx() {
>       install -d ${LEGACY_IPC_FW_DIR}
>       # DM+IPC Firmware
>       install -m 0644 ${RTOS_IPC_FW_DIR}/am62a-mcu-r5f0_0-fw ${LEGACY_IPC_FW_DIR}
> +    install -m 0644 ${RTOS_IPC_FW_DIR}/am62a-mcu-r5f0_0-fw.signed ${LEGACY_IPC_FW_DIR}
>       install -m 0644 ${RTOS_DM_FW_DIR}/ipc_echo_testb_mcu1_0_release_strip.xer5f ${LEGACY_DM_FW_DIR}
>       install -m 0644 ${RTOS_IPC_FW_DIR}/ipc_echo_test_c7x_1_release_strip.xe71 ${LEGACY_IPC_FW_DIR}
> +    install -m 0644 ${RTOS_IPC_FW_DIR}/ipc_echo_test_c7x_1_release_strip.xe71.signed ${LEGACY_IPC_FW_DIR}
>   }
>   
>   do_deploy() {
diff mbox series

Patch

diff --git a/conf/machine/am62axx-evm-k3r5-gp.conf b/conf/machine/am62axx-evm-k3r5-gp.conf
new file mode 100644
index 00000000..898af7e8
--- /dev/null
+++ b/conf/machine/am62axx-evm-k3r5-gp.conf
@@ -0,0 +1,21 @@ 
+#@TYPE: Machine
+#@NAME: AM62A GP EVM (R5F)
+#@DESCRIPTION: Machine configuration for the TI AM62A GP EVM (R5F core)
+
+# Booting GP requires different SYSFW, the rest is handled at runtime
+
+require conf/machine/include/k3r5.inc
+SOC_FAMILY_append = ":k3r5-gp"
+
+SYSFW_SOC = "am62ax"
+SYSFW_CONFIG = "evm"
+SYSFW_SUFFIX = "gp"
+SYSFW_TIBOOT3_SYMLINK = ""
+
+UBOOT_MACHINE = "am62ax_evm_r5_defconfig"
+
+SPL_BINARY = ""
+UBOOT_BINARY = "u-boot-spl.${UBOOT_SUFFIX}"
+UBOOT_IMAGE = "u-boot-r5spl-gp-${MAINMACHINE}-${PV}-${PR}.${UBOOT_SUFFIX}"
+UBOOT_SYMLINK = "u-boot-r5spl-gp.${UBOOT_SUFFIX}"
+
diff --git a/conf/machine/am62axx-evm-k3r5-hs-fs.conf b/conf/machine/am62axx-evm-k3r5-hs-fs.conf
new file mode 100644
index 00000000..2ecba7e4
--- /dev/null
+++ b/conf/machine/am62axx-evm-k3r5-hs-fs.conf
@@ -0,0 +1,15 @@ 
+#@TYPE: Machine
+#@NAME: AM62A HS-FS EVM (R5F)
+#@DESCRIPTION: Machine configuration for the TI AM62A HS-FS EVM (R5F core)
+
+# Booting HS-FS requires different SYSFW, the rest is handled at runtime
+
+require conf/machine/include/k3r5.inc
+SOC_FAMILY_append = ":k3r5-hs-fs"
+
+SYSFW_SOC = "am62ax"
+SYSFW_CONFIG = "evm"
+SYSFW_SUFFIX = "hs-fs"
+
+UBOOT_MACHINE = "am62ax_evm_r5_defconfig"
+
diff --git a/conf/machine/am62axx-evm-k3r5-hs-se.conf b/conf/machine/am62axx-evm-k3r5-hs-se.conf
new file mode 100644
index 00000000..76d01a0e
--- /dev/null
+++ b/conf/machine/am62axx-evm-k3r5-hs-se.conf
@@ -0,0 +1,20 @@ 
+#@TYPE: Machine
+#@NAME: AM62A HS-SE EVM (R5F)
+#@DESCRIPTION: Machine configuration for the TI AM62A HS-SE EVM (R5F core)
+
+# Booting HS-SE requires different SYSFW, the rest is handled at runtime
+
+require conf/machine/include/k3r5.inc
+SOC_FAMILY_append = ":k3r5-hs-se"
+
+SYSFW_SOC = "am62ax"
+SYSFW_CONFIG = "evm"
+SYSFW_SUFFIX = "hs"
+SYSFW_TIBOOT3_SYMLINK = ""
+
+UBOOT_MACHINE = "am62ax_evm_r5_defconfig"
+
+SPL_BINARY = ""
+UBOOT_BINARY = "u-boot-spl.${UBOOT_SUFFIX}"
+UBOOT_IMAGE = "u-boot-r5spl-hs-se-${MAINMACHINE}-${PV}-${PR}.${UBOOT_SUFFIX}"
+UBOOT_SYMLINK = "u-boot-r5spl-hs-se.${UBOOT_SUFFIX}"
diff --git a/conf/machine/am62axx-evm-k3r5.conf b/conf/machine/am62axx-evm-k3r5.conf
deleted file mode 100644
index ca30537f..00000000
--- a/conf/machine/am62axx-evm-k3r5.conf
+++ /dev/null
@@ -1,11 +0,0 @@ 
-#@TYPE: Machine
-#@NAME: AM62AXX EVM (R5F)
-#@DESCRIPTION: Machine configuration for the TI AM62Axx EVM (R5F core)
-
-require conf/machine/include/k3r5.inc
-
-SYSFW_SOC = "am62ax"
-SYSFW_CONFIG = "evm"
-SYSFW_SUFFIX = "gp"
-
-UBOOT_MACHINE = "am62ax_evm_r5_defconfig"
diff --git a/conf/machine/include/am62axx.inc b/conf/machine/include/am62axx.inc
index 383d1c3f..71a03e98 100644
--- a/conf/machine/include/am62axx.inc
+++ b/conf/machine/include/am62axx.inc
@@ -8,9 +8,24 @@  SERIAL_CONSOLES_CHECK = "${SERIAL_CONSOLES}"
 
 TFA_K3_SYSTEM_SUSPEND = "1"
 
-do_image_wic[mcdepends] = "mc::k3r5:ti-sci-fw:do_deploy"
-do_image_tar[mcdepends] = "mc::k3r5:ti-sci-fw:do_deploy"
-
 TFA_BOARD = "lite"
 OPTEEMACHINE = "k3-am62x"
 OPTEEOUTPUTMACHINE = "k3"
+
+# Default tiboot3.bin on AM62Ax is for HS-FS
+BBMULTICONFIG = "k3r5-hs-fs"
+do_image_wic[mcdepends] = "mc::k3r5-hs-fs:ti-sci-fw:do_deploy"
+do_image_tar[mcdepends] = "mc::k3r5-hs-fs:ti-sci-fw:do_deploy"
+
+# Since default tiboot3.bin on AM62Ax is for HS-FS, add a version for GP
+BBMULTICONFIG += "k3r5-gp"
+IMAGE_BOOT_FILES += " tiboot3-am62ax-gp-evm.bin"
+do_image_wic[mcdepends] += "mc::k3r5-gp:ti-sci-fw:do_deploy"
+do_image_tar[mcdepends] += "mc::k3r5-gp:ti-sci-fw:do_deploy"
+
+# Since default tiboot3.bin on AM62Ax is for HS-FS, add a version for HS-SE
+BBMULTICONFIG += "k3r5-hs-se"
+IMAGE_BOOT_FILES += " tiboot3-am62ax-hs-se-evm.bin"
+do_image_wic[mcdepends] += "mc::k3r5-hs-se:ti-sci-fw:do_deploy"
+do_image_tar[mcdepends] += "mc::k3r5-hs-se:ti-sci-fw:do_deploy"
+
diff --git a/conf/multiconfig/k3r5-hs-fs.conf b/conf/multiconfig/k3r5-hs-fs.conf
new file mode 100644
index 00000000..c6d58ead
--- /dev/null
+++ b/conf/multiconfig/k3r5-hs-fs.conf
@@ -0,0 +1,3 @@ 
+require k3r5.conf
+
+MACHINE_append = "-hs-fs"
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 7896c366..a9418514 100644
--- a/recipes-bsp/ti-sci-fw/ti-sci-fw_git.bb
+++ b/recipes-bsp/ti-sci-fw/ti-sci-fw_git.bb
@@ -42,6 +42,8 @@  SYSFW_PREFIX_am62xx-evm-k3r5-hs-se = "fs"
 SYSFW_PREFIX_am62xx-lp-evm-k3r5 = "fs"
 SYSFW_PREFIX_am62xx-lp-evm-k3r5-hs-se = "fs"
 SYSFW_PREFIX_am62axx-evm-k3r5 = "fs"
+SYSFW_PREFIX_am62axx-evm-k3r5-hs-fs = "fs"
+SYSFW_PREFIX_am62axx-evm-k3r5-hs-se = "fs"
 
 SYSFW_TISCI = "${S}/ti-sysfw/ti-${SYSFW_PREFIX}-firmware-${SYSFW_SOC}-*.bin"
 
diff --git a/recipes-bsp/trusted-firmware-a/trusted-firmware-a_%.bbappend b/recipes-bsp/trusted-firmware-a/trusted-firmware-a_%.bbappend
index 41071676..70406724 100644
--- a/recipes-bsp/trusted-firmware-a/trusted-firmware-a_%.bbappend
+++ b/recipes-bsp/trusted-firmware-a/trusted-firmware-a_%.bbappend
@@ -39,6 +39,10 @@  do_compile_append_am62xx-lp-evm() {
         tfa_sign_k3hs
 }
 
+do_compile_append_am62axx-evm() {
+        tfa_sign_k3hs
+}
+
 do_compile_append_j7-hs-evm() {
 	tfa_sign_k3hs
 }
diff --git a/recipes-security/optee/optee-os_%.bbappend b/recipes-security/optee/optee-os_%.bbappend
index 91abbcee..8ef535cc 100644
--- a/recipes-security/optee/optee-os_%.bbappend
+++ b/recipes-security/optee/optee-os_%.bbappend
@@ -80,6 +80,10 @@  do_compile_append_am62xx-lp-evm() {
     optee_sign_k3hs
 }
 
+do_compile_append_am62axx-evm() {
+    optee_sign_k3hs
+}
+
 do_compile_append_j7-hs-evm() {
     optee_sign_k3hs
 }
diff --git a/recipes-ti/ti-rtos-bin/ti-rtos-firmware.bb b/recipes-ti/ti-rtos-bin/ti-rtos-firmware.bb
index 72d85a6b..da7ff4e8 100644
--- a/recipes-ti/ti-rtos-bin/ti-rtos-firmware.bb
+++ b/recipes-ti/ti-rtos-bin/ti-rtos-firmware.bb
@@ -188,6 +188,20 @@  do_install_prepend_am62xx() {
         )
 }
 
+do_install_prepend_am62axx-evm() {
+        export TI_SECURE_DEV_PKG=${TI_SECURE_DEV_PKG}
+        ( cd ${RTOS_DM_FW_DIR}; \
+                mv ${DM_FIRMWARE} ${DM_FIRMWARE}.unsigned; \
+                ${TI_SECURE_DEV_PKG}/scripts/secure-binary-image.sh ${DM_FIRMWARE}.unsigned ${DM_FIRMWARE}; \
+        )
+        ( cd ${RTOS_IPC_FW_DIR}; \
+                ${TI_SECURE_DEV_PKG}/scripts/secure-binary-image.sh am62a-mcu-r5f0_0-fw \
+                    am62a-mcu-r5f0_0-fw.signed; \
+                ${TI_SECURE_DEV_PKG}/scripts/secure-binary-image.sh ipc_echo_test_c7x_1_release_strip.xe71 \
+                    ipc_echo_test_c7x_1_release_strip.xe71.signed; \
+        )
+}
+
 #Install all R5 & DSP ipc echo test binaries in lib/firmware/pdk-ipc, with softlinks up a level
 do_install() {
 
@@ -369,8 +383,10 @@  do_install_am62axx() {
     install -d ${LEGACY_IPC_FW_DIR}
     # DM+IPC Firmware
     install -m 0644 ${RTOS_IPC_FW_DIR}/am62a-mcu-r5f0_0-fw ${LEGACY_IPC_FW_DIR}
+    install -m 0644 ${RTOS_IPC_FW_DIR}/am62a-mcu-r5f0_0-fw.signed ${LEGACY_IPC_FW_DIR}
     install -m 0644 ${RTOS_DM_FW_DIR}/ipc_echo_testb_mcu1_0_release_strip.xer5f ${LEGACY_DM_FW_DIR}
     install -m 0644 ${RTOS_IPC_FW_DIR}/ipc_echo_test_c7x_1_release_strip.xe71 ${LEGACY_IPC_FW_DIR}
+    install -m 0644 ${RTOS_IPC_FW_DIR}/ipc_echo_test_c7x_1_release_strip.xe71.signed ${LEGACY_IPC_FW_DIR}
 }
 
 do_deploy() {