diff options
author | Denys Dmytriyenko <denys@konsulko.com> | 2023-05-11 18:43:01 +0000 |
---|---|---|
committer | Ryan Eatmon <reatmon@ti.com> | 2023-05-11 14:42:40 -0500 |
commit | 0f22b0c8a0ba5fd0b72df9cd3f65756a2f30cb5b (patch) | |
tree | b5aa4932b94e1a3633b95d1df66d547999681297 | |
parent | b5913c634442cd6035b16b43d171fb3d44f69a1f (diff) | |
download | meta-ti-0f22b0c8a0ba5fd0b72df9cd3f65756a2f30cb5b.tar.gz |
trusted-firmware-a: only activate customizations for TI platforms
Avoid inheriting ti-secdev class and adding unconditional dependency
on TI_SECURE_DEV_PKG and other variables, when meta-ti-bsp is in the
bblayers.conf stack, but not building for TI platforms. This solves
yocto-check-layer signature test for Yocto Project compliance.
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-ti.inc | 67 | ||||
-rw-r--r-- | meta-ti-bsp/recipes-bsp/trusted-firmware-a/trusted-firmware-a_%.bbappend | 69 |
2 files changed, 70 insertions, 66 deletions
diff --git a/meta-ti-bsp/recipes-bsp/trusted-firmware-a/trusted-firmware-a-ti.inc b/meta-ti-bsp/recipes-bsp/trusted-firmware-a/trusted-firmware-a-ti.inc new file mode 100644 index 00000000..c65ecd9c --- /dev/null +++ b/meta-ti-bsp/recipes-bsp/trusted-firmware-a/trusted-firmware-a-ti.inc | |||
@@ -0,0 +1,67 @@ | |||
1 | PV:k3 = "2.8+git${SRCPV}" | ||
2 | SRCREV_tfa:k3 = "2fcd408bb3a6756767a43c073c597cef06e7f2d5" | ||
3 | SRC_URI:k3 = "git://git.trustedfirmware.org/TF-A/trusted-firmware-a.git;protocol=https;name=tfa;branch=master" | ||
4 | COMPATIBLE_MACHINE:k3 = "k3" | ||
5 | TFA_BUILD_TARGET:k3 = "all" | ||
6 | TFA_INSTALL_TARGET:k3 = "bl31" | ||
7 | TFA_SPD:k3 = "opteed" | ||
8 | |||
9 | # Use TI SECDEV for signing | ||
10 | inherit ti-secdev | ||
11 | |||
12 | EXTRA_OEMAKE:append:k3 = "${@ ' K3_USART=' + d.getVar('TFA_K3_USART') if d.getVar('TFA_K3_USART') else ''}" | ||
13 | EXTRA_OEMAKE:append:k3 = "${@ ' K3_PM_SYSTEM_SUSPEND=' + d.getVar('TFA_K3_SYSTEM_SUSPEND') if d.getVar('TFA_K3_SYSTEM_SUSPEND') else ''}" | ||
14 | |||
15 | # Signing procedure for K3 HS devices | ||
16 | tfa_sign_k3hs() { | ||
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 | ||
19 | } | ||
20 | |||
21 | do_compile:append:am65xx-hs-evm() { | ||
22 | tfa_sign_k3hs | ||
23 | } | ||
24 | |||
25 | do_compile:append:am64xx-evm() { | ||
26 | tfa_sign_k3hs | ||
27 | } | ||
28 | |||
29 | do_compile:append:am62xx-evm() { | ||
30 | tfa_sign_k3hs | ||
31 | } | ||
32 | |||
33 | do_compile:append:am62xx-lp-evm() { | ||
34 | tfa_sign_k3hs | ||
35 | } | ||
36 | |||
37 | do_compile:append:am62axx-evm() { | ||
38 | tfa_sign_k3hs | ||
39 | } | ||
40 | |||
41 | do_compile:append:j721e-hs-evm() { | ||
42 | tfa_sign_k3hs | ||
43 | } | ||
44 | |||
45 | do_compile:append:j7200-hs-evm() { | ||
46 | tfa_sign_k3hs | ||
47 | } | ||
48 | |||
49 | do_compile:append:j721s2-hs-evm() { | ||
50 | tfa_sign_k3hs | ||
51 | } | ||
52 | |||
53 | do_compile:append:j784s4-hs-evm() { | ||
54 | tfa_sign_k3hs | ||
55 | } | ||
56 | |||
57 | do_install:append:k3() { | ||
58 | if [ -f ${BUILD_DIR}/bl31.bin.unsigned ]; then | ||
59 | echo "Install bl31.bin.unsigned" | ||
60 | install -m 0644 ${BUILD_DIR}/bl31.bin.unsigned \ | ||
61 | ${D}/firmware/bl31.bin.unsigned | ||
62 | else | ||
63 | echo "Install bl31.bin.unsigned" | ||
64 | install -m 0644 ${BUILD_DIR}/bl31.bin \ | ||
65 | ${D}/firmware/bl31.bin.unsigned | ||
66 | fi | ||
67 | } | ||
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 c65ecd9c..00d08a51 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 | |||
@@ -1,67 +1,4 @@ | |||
1 | PV:k3 = "2.8+git${SRCPV}" | 1 | TFA_TI = "" |
2 | SRCREV_tfa:k3 = "2fcd408bb3a6756767a43c073c597cef06e7f2d5" | 2 | TFA_TI:k3 = "trusted-firmware-a-ti.inc" |
3 | SRC_URI:k3 = "git://git.trustedfirmware.org/TF-A/trusted-firmware-a.git;protocol=https;name=tfa;branch=master" | ||
4 | COMPATIBLE_MACHINE:k3 = "k3" | ||
5 | TFA_BUILD_TARGET:k3 = "all" | ||
6 | TFA_INSTALL_TARGET:k3 = "bl31" | ||
7 | TFA_SPD:k3 = "opteed" | ||
8 | 3 | ||
9 | # Use TI SECDEV for signing | 4 | require ${TFA_TI} |
10 | inherit ti-secdev | ||
11 | |||
12 | EXTRA_OEMAKE:append:k3 = "${@ ' K3_USART=' + d.getVar('TFA_K3_USART') if d.getVar('TFA_K3_USART') else ''}" | ||
13 | EXTRA_OEMAKE:append:k3 = "${@ ' K3_PM_SYSTEM_SUSPEND=' + d.getVar('TFA_K3_SYSTEM_SUSPEND') if d.getVar('TFA_K3_SYSTEM_SUSPEND') else ''}" | ||
14 | |||
15 | # Signing procedure for K3 HS devices | ||
16 | tfa_sign_k3hs() { | ||
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 | ||
19 | } | ||
20 | |||
21 | do_compile:append:am65xx-hs-evm() { | ||
22 | tfa_sign_k3hs | ||
23 | } | ||
24 | |||
25 | do_compile:append:am64xx-evm() { | ||
26 | tfa_sign_k3hs | ||
27 | } | ||
28 | |||
29 | do_compile:append:am62xx-evm() { | ||
30 | tfa_sign_k3hs | ||
31 | } | ||
32 | |||
33 | do_compile:append:am62xx-lp-evm() { | ||
34 | tfa_sign_k3hs | ||
35 | } | ||
36 | |||
37 | do_compile:append:am62axx-evm() { | ||
38 | tfa_sign_k3hs | ||
39 | } | ||
40 | |||
41 | do_compile:append:j721e-hs-evm() { | ||
42 | tfa_sign_k3hs | ||
43 | } | ||
44 | |||
45 | do_compile:append:j7200-hs-evm() { | ||
46 | tfa_sign_k3hs | ||
47 | } | ||
48 | |||
49 | do_compile:append:j721s2-hs-evm() { | ||
50 | tfa_sign_k3hs | ||
51 | } | ||
52 | |||
53 | do_compile:append:j784s4-hs-evm() { | ||
54 | tfa_sign_k3hs | ||
55 | } | ||
56 | |||
57 | do_install:append:k3() { | ||
58 | if [ -f ${BUILD_DIR}/bl31.bin.unsigned ]; then | ||
59 | echo "Install bl31.bin.unsigned" | ||
60 | install -m 0644 ${BUILD_DIR}/bl31.bin.unsigned \ | ||
61 | ${D}/firmware/bl31.bin.unsigned | ||
62 | else | ||
63 | echo "Install bl31.bin.unsigned" | ||
64 | install -m 0644 ${BUILD_DIR}/bl31.bin \ | ||
65 | ${D}/firmware/bl31.bin.unsigned | ||
66 | fi | ||
67 | } | ||