hs: Deploy the unsigned versions of bl31 and bl32

In addition to releasing the signed versions of the bl31.bin and
bl32.bin files, also release the unsigned original versions.

Signed-off-by: Ryan Eatmon <reatmon@ti.com>

2 files changed, 17 insertions, 0 deletions

diff --git a/recipes-bsp/trusted-firmware-a/trusted-firmware-a_%.bbappend b/recipes-bsp/trusted-firmware-a/trusted-firmware-a_%.bbappend
index bb969da2..a5eb9ff8 100644
--- a/recipes-bsp/trusted-firmware-a/trusted-firmware-a_%.bbappend
+++ b/recipes-bsp/trusted-firmware-a/trusted-firmware-a_%.bbappend
@@ -50,3 +50,16 @@ do_compile_append_j721s2-hs-evm() {
 do_compile_append_j784s4-hs-evm() {
         tfa_sign_k3hs
 }
+
+do_install_append_k3() {
+    if [ -f $BUILD_PLAT/bl31.bin.unsigned ]; then
+        echo "Install bl31.bin.unsigned"
+        install -m 0644 $BUILD_PLAT/bl31.bin.unsigned \
+        ${D}/firmware/bl31.bin.unsigned
+    else
+        echo "Install bl31.bin.unsigned"
+        install -m 0644 $BUILD_PLAT/bl31.bin \
+        ${D}/firmware/bl31.bin.unsigned
+    fi
+}
+
diff --git a/recipes-security/optee/optee-os_%.bbappend b/recipes-security/optee/optee-os_%.bbappend
index ca2fd42e..db9064de 100644
--- a/recipes-security/optee/optee-os_%.bbappend
+++ b/recipes-security/optee/optee-os_%.bbappend
@@ -17,6 +17,7 @@ do_compile_prepend_ti-soc() {
 do_compile_append_k3() {
     ( cd out/arm-plat-${OPTEEOUTPUTMACHINE}/core/; \
         cp tee-pager_v2.bin ${B}/bl32.bin; \
+        cp tee-pager_v2.bin ${B}/bl32.bin.unsigned; \
         cp tee.elf ${B}/bl32.elf; \
     )
 }
@@ -50,6 +51,7 @@ optee_sign_k3hs() {
             cp tee-pager_v2.bin tee-pager.bin.signed; \
         fi; \
         mv tee-pager.bin.signed ${B}/bl32.bin; \
+        cp tee-pager_v2.bin bl32.bin.unsigned; \
         cp tee.elf ${B}/bl32.elf; \
     )
 }
@@ -93,6 +95,7 @@ do_compile_append_j784s4-hs-evm() {
 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
+    install -m 644 ${B}/bl32.bin.unsigned ${D}${nonarch_base_libdir}/firmware/ || true
     install -m 644 ${B}/bl32.elf ${D}${nonarch_base_libdir}/firmware/ || true
 }
 
@@ -113,6 +116,7 @@ do_deploy_append_dra7xx() {
 
 do_deploy_append_k3() {
     ln -sf optee/bl32.bin ${DEPLOYDIR}/
+    ln -sf optee/bl32.bin.unsigned ${DEPLOYDIR}/
     ln -sf optee/bl32.elf ${DEPLOYDIR}/
 }