diff options
author | Ryan Eatmon <reatmon@ti.com> | 2023-03-20 04:11:59 +0000 |
---|---|---|
committer | Ryan Eatmon <reatmon@ti.com> | 2023-03-20 16:45:07 -0500 |
commit | 3c129b81a4d38c7b032f26b9354e686f234cf026 (patch) | |
tree | 381bdec73418a3eafd577d6db6e2efe7fbf2922b | |
parent | 5f9be228390bc55b7e26b3e1ede7378ac689decb (diff) | |
download | meta-ti-3c129b81a4d38c7b032f26b9354e686f234cf026.tar.gz |
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>
Signed-off-by: Denys Dmytriyenko <denys@konsulko.com>
Signed-off-by: Ryan Eatmon <reatmon@ti.com>
-rw-r--r-- | meta-ti-bsp/recipes-bsp/trusted-firmware-a/trusted-firmware-a_%.bbappend | 12 | ||||
-rw-r--r-- | meta-ti-bsp/recipes-security/optee/optee-os_3.16%.bbappend | 10 |
2 files changed, 15 insertions, 7 deletions
diff --git a/meta-ti-bsp/recipes-bsp/trusted-firmware-a/trusted-firmware-a_%.bbappend b/meta-ti-bsp/recipes-bsp/trusted-firmware-a/trusted-firmware-a_%.bbappend index be601e62..60f0496c 100644 --- a/meta-ti-bsp/recipes-bsp/trusted-firmware-a/trusted-firmware-a_%.bbappend +++ b/meta-ti-bsp/recipes-bsp/trusted-firmware-a/trusted-firmware-a_%.bbappend | |||
@@ -17,3 +17,15 @@ do_compile:append:k3() { | |||
17 | mv ${BUILD_DIR}/bl31.bin ${BUILD_DIR}/bl31.bin.unsigned | 17 | mv ${BUILD_DIR}/bl31.bin ${BUILD_DIR}/bl31.bin.unsigned |
18 | ${TI_SECURE_DEV_PKG}/scripts/secure-binary-image.sh ${BUILD_DIR}/bl31.bin.unsigned ${BUILD_DIR}/bl31.bin | 18 | ${TI_SECURE_DEV_PKG}/scripts/secure-binary-image.sh ${BUILD_DIR}/bl31.bin.unsigned ${BUILD_DIR}/bl31.bin |
19 | } | 19 | } |
20 | |||
21 | do_install:append:k3() { | ||
22 | if [ -f ${BUILD_DIR}/bl31.bin.unsigned ]; then | ||
23 | echo "Install bl31.bin.unsigned" | ||
24 | install -m 0644 ${BUILD_DIR}/bl31.bin.unsigned \ | ||
25 | ${D}/firmware/bl31.bin.unsigned | ||
26 | else | ||
27 | echo "Install bl31.bin.unsigned" | ||
28 | install -m 0644 ${BUILD_DIR}/bl31.bin \ | ||
29 | ${D}/firmware/bl31.bin.unsigned | ||
30 | fi | ||
31 | } | ||
diff --git a/meta-ti-bsp/recipes-security/optee/optee-os_3.16%.bbappend b/meta-ti-bsp/recipes-security/optee/optee-os_3.16%.bbappend index 2aa34530..7772c58e 100644 --- a/meta-ti-bsp/recipes-security/optee/optee-os_3.16%.bbappend +++ b/meta-ti-bsp/recipes-security/optee/optee-os_3.16%.bbappend | |||
@@ -9,13 +9,6 @@ EXTRA_OEMAKE:append:k3 = "${@ ' CFG_CONSOLE_UART='+ d.getVar('OPTEE_K3_USART') i | |||
9 | EXTRA_OEMAKE:append:am62xx = " CFG_TEE_CORE_LOG_LEVEL=1" | 9 | EXTRA_OEMAKE:append:am62xx = " CFG_TEE_CORE_LOG_LEVEL=1" |
10 | EXTRA_OEMAKE:append:am62axx = " CFG_TEE_CORE_LOG_LEVEL=1" | 10 | EXTRA_OEMAKE:append:am62axx = " CFG_TEE_CORE_LOG_LEVEL=1" |
11 | 11 | ||
12 | do_compile:append:k3() { | ||
13 | ( cd ${B}/core/; \ | ||
14 | cp tee-pager_v2.bin ${B}/bl32.bin; \ | ||
15 | cp tee.elf ${B}/bl32.elf; \ | ||
16 | ) | ||
17 | } | ||
18 | |||
19 | # Signing procedure for legacy HS devices | 12 | # Signing procedure for legacy HS devices |
20 | optee_sign_legacyhs() { | 13 | optee_sign_legacyhs() { |
21 | ( cd ${B}/core/; \ | 14 | ( cd ${B}/core/; \ |
@@ -46,12 +39,14 @@ do_compile:append:dra7xx() { | |||
46 | # Signing procedure for K3 devices | 39 | # Signing procedure for K3 devices |
47 | do_compile:append:k3() { | 40 | do_compile:append:k3() { |
48 | ${TI_SECURE_DEV_PKG}/scripts/secure-binary-image.sh ${B}/core/tee-pager_v2.bin ${B}/bl32.bin | 41 | ${TI_SECURE_DEV_PKG}/scripts/secure-binary-image.sh ${B}/core/tee-pager_v2.bin ${B}/bl32.bin |
42 | cp ${B}/core/tee-pager_v2.bin ${B}/bl32.bin.unsigned | ||
49 | cp ${B}/core/tee.elf ${B}/bl32.elf | 43 | cp ${B}/core/tee.elf ${B}/bl32.elf |
50 | } | 44 | } |
51 | 45 | ||
52 | do_install:append:ti-soc() { | 46 | do_install:append:ti-soc() { |
53 | install -m 644 ${B}/*.optee ${D}${nonarch_base_libdir}/firmware/ || true | 47 | install -m 644 ${B}/*.optee ${D}${nonarch_base_libdir}/firmware/ || true |
54 | install -m 644 ${B}/bl32.bin ${D}${nonarch_base_libdir}/firmware/ || true | 48 | install -m 644 ${B}/bl32.bin ${D}${nonarch_base_libdir}/firmware/ || true |
49 | install -m 644 ${B}/bl32.bin.unsigned ${D}${nonarch_base_libdir}/firmware/ || true | ||
55 | install -m 644 ${B}/bl32.elf ${D}${nonarch_base_libdir}/firmware/ || true | 50 | install -m 644 ${B}/bl32.elf ${D}${nonarch_base_libdir}/firmware/ || true |
56 | } | 51 | } |
57 | 52 | ||
@@ -72,6 +67,7 @@ do_deploy:append:dra7xx() { | |||
72 | 67 | ||
73 | do_deploy:append:k3() { | 68 | do_deploy:append:k3() { |
74 | ln -sf optee/bl32.bin ${DEPLOYDIR}/ | 69 | ln -sf optee/bl32.bin ${DEPLOYDIR}/ |
70 | ln -sf optee/bl32.bin.unsigned ${DEPLOYDIR}/ | ||
75 | ln -sf optee/bl32.elf ${DEPLOYDIR}/ | 71 | ln -sf optee/bl32.elf ${DEPLOYDIR}/ |
76 | } | 72 | } |
77 | 73 | ||