diff options
author | Sai Sree Kartheek Adivi <s-adivi@ti.com> | 2023-02-14 17:18:24 +0530 |
---|---|---|
committer | Ryan Eatmon <reatmon@ti.com> | 2023-02-14 07:45:02 -0600 |
commit | 2bf12f5449405c6e1600775dee7e3a08f3ab623b (patch) | |
tree | ce24c9e6efd851544aa8df996110c3b23a71f042 | |
parent | 937b57b6d63a4267b96f25ec15c2809f7f288f76 (diff) | |
download | meta-ti-2bf12f5449405c6e1600775dee7e3a08f3ab623b.tar.gz |
am62axx-evm: Add AM62A HS-FS evm configuration
Lets add the basic AM62A configuration
- Add machine conf for AM62A.
- The wic images will boot on AM62A HS-FS devices by default. The sysfw image for GP and HS-SE will be packaged in the wic image as tiboot3-am62ax-gp-evm.bin and tiboot3-am62ax-hs-evm.bin respectively.
- Add ti-sci-firmware overrides.
- Sign ATF, OPTEE and RTOS Firmware.
Signed-off-by: Chirag Shilwant <c-shilwant@ti.com>
Signed-off-by: Ryan Eatmon <reatmon@ti.com>
-rw-r--r-- | conf/machine/am62axx-evm-k3r5-gp.conf | 19 | ||||
-rw-r--r-- | conf/machine/am62axx-evm-k3r5-hs-fs.conf | 14 | ||||
-rw-r--r-- | conf/machine/am62axx-evm-k3r5-hs-se.conf | 22 | ||||
-rw-r--r-- | conf/machine/am62axx-evm-k3r5.conf | 11 | ||||
-rw-r--r-- | conf/machine/am62axx-evm.conf | 4 | ||||
-rw-r--r-- | conf/machine/include/am62axx.inc | 18 | ||||
-rw-r--r-- | recipes-bsp/ti-sci-fw/ti-sci-fw_git.bb | 4 | ||||
-rw-r--r-- | recipes-bsp/trusted-firmware-a/trusted-firmware-a_%.bbappend | 4 | ||||
-rw-r--r-- | recipes-security/optee/optee-os_%.bbappend | 4 | ||||
-rw-r--r-- | recipes-ti/ti-rtos-bin/ti-rtos-firmware.bb | 16 |
10 files changed, 102 insertions, 14 deletions
diff --git a/conf/machine/am62axx-evm-k3r5-gp.conf b/conf/machine/am62axx-evm-k3r5-gp.conf new file mode 100644 index 00000000..962413c3 --- /dev/null +++ b/conf/machine/am62axx-evm-k3r5-gp.conf | |||
@@ -0,0 +1,19 @@ | |||
1 | #@TYPE: Machine | ||
2 | #@NAME: AM62A GP EVM (R5F) | ||
3 | #@DESCRIPTION: Machine configuration for the TI AM62A GP EVM (R5F core) | ||
4 | |||
5 | require conf/machine/include/k3r5.inc | ||
6 | |||
7 | SYSFW_SOC = "am62ax" | ||
8 | SYSFW_CONFIG = "evm" | ||
9 | SYSFW_SUFFIX = "gp" | ||
10 | |||
11 | SYSFW_TIBOOT3_SYMLINK = "" | ||
12 | SYSFW_SYMLINK = "" | ||
13 | |||
14 | UBOOT_MACHINE = "am62ax_evm_r5_defconfig" | ||
15 | |||
16 | SPL_BINARY = "" | ||
17 | UBOOT_BINARY = "u-boot-spl.${UBOOT_SUFFIX}" | ||
18 | UBOOT_IMAGE = "u-boot-r5spl-gp-${MAINMACHINE}-${PV}-${PR}.${UBOOT_SUFFIX}" | ||
19 | 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..2d69d06c --- /dev/null +++ b/conf/machine/am62axx-evm-k3r5-hs-fs.conf | |||
@@ -0,0 +1,14 @@ | |||
1 | #@TYPE: Machine | ||
2 | #@NAME: AM62A HS-FS EVM (R5F) | ||
3 | #@DESCRIPTION: Machine configuration for the TI AM62A HS-FS EVM (R5F core) | ||
4 | |||
5 | # Booting HS-FS requires different SYSFW, the rest is handled at runtime | ||
6 | |||
7 | require conf/machine/include/k3r5.inc | ||
8 | SOC_FAMILY_append = ":k3r5-hs-fs" | ||
9 | |||
10 | SYSFW_SOC = "am62ax" | ||
11 | SYSFW_CONFIG = "evm" | ||
12 | SYSFW_SUFFIX = "hs-fs" | ||
13 | |||
14 | 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..c828606c --- /dev/null +++ b/conf/machine/am62axx-evm-k3r5-hs-se.conf | |||
@@ -0,0 +1,22 @@ | |||
1 | #@TYPE: Machine | ||
2 | #@NAME: AM62A HS-SE EVM (R5F) | ||
3 | #@DESCRIPTION: Machine configuration for the TI AM62A HS-SE EVM (R5F core) | ||
4 | |||
5 | # Booting HS-SE requires different SYSFW, the rest is handled at runtime | ||
6 | |||
7 | require conf/machine/include/k3r5.inc | ||
8 | SOC_FAMILY_append = ":k3r5-hs-se" | ||
9 | |||
10 | SYSFW_SOC = "am62ax" | ||
11 | SYSFW_CONFIG = "evm" | ||
12 | SYSFW_SUFFIX = "hs" | ||
13 | |||
14 | SYSFW_TIBOOT3_SYMLINK = "" | ||
15 | SYSFW_SYMLINK = "" | ||
16 | |||
17 | UBOOT_MACHINE = "am62ax_evm_r5_defconfig" | ||
18 | |||
19 | SPL_BINARY = "" | ||
20 | UBOOT_BINARY = "u-boot-spl.${UBOOT_SUFFIX}" | ||
21 | UBOOT_IMAGE = "u-boot-r5spl-hs-se-${MAINMACHINE}-${PV}-${PR}.${UBOOT_SUFFIX}" | ||
22 | 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 @@ | |||
1 | #@TYPE: Machine | ||
2 | #@NAME: AM62AXX EVM (R5F) | ||
3 | #@DESCRIPTION: Machine configuration for the TI AM62Axx EVM (R5F core) | ||
4 | |||
5 | require conf/machine/include/k3r5.inc | ||
6 | |||
7 | SYSFW_SOC = "am62ax" | ||
8 | SYSFW_CONFIG = "evm" | ||
9 | SYSFW_SUFFIX = "gp" | ||
10 | |||
11 | UBOOT_MACHINE = "am62ax_evm_r5_defconfig" | ||
diff --git a/conf/machine/am62axx-evm.conf b/conf/machine/am62axx-evm.conf index e7a59d2e..9dcb6e55 100644 --- a/conf/machine/am62axx-evm.conf +++ b/conf/machine/am62axx-evm.conf | |||
@@ -23,3 +23,7 @@ KERNEL_DEVICETREE = " \ | |||
23 | " | 23 | " |
24 | 24 | ||
25 | UBOOT_MACHINE = "am62ax_evm_a53_defconfig" | 25 | UBOOT_MACHINE = "am62ax_evm_a53_defconfig" |
26 | |||
27 | SPL_BINARY = "tispl.bin_HS" | ||
28 | UBOOT_BINARY = "u-boot.img_HS" | ||
29 | UBOOT_SYMLINK = "u-boot.img" | ||
diff --git a/conf/machine/include/am62axx.inc b/conf/machine/include/am62axx.inc index 383d1c3f..6ee3accc 100644 --- a/conf/machine/include/am62axx.inc +++ b/conf/machine/include/am62axx.inc | |||
@@ -8,8 +8,22 @@ SERIAL_CONSOLES_CHECK = "${SERIAL_CONSOLES}" | |||
8 | 8 | ||
9 | TFA_K3_SYSTEM_SUSPEND = "1" | 9 | TFA_K3_SYSTEM_SUSPEND = "1" |
10 | 10 | ||
11 | do_image_wic[mcdepends] = "mc::k3r5:ti-sci-fw:do_deploy" | 11 | # Default tiboot3.bin on AM62A is for HS-FS |
12 | do_image_tar[mcdepends] = "mc::k3r5:ti-sci-fw:do_deploy" | 12 | BBMULTICONFIG = "k3r5-hs-fs" |
13 | do_image_wic[mcdepends] = "mc::k3r5-hs-fs:ti-sci-fw:do_deploy" | ||
14 | do_image_tar[mcdepends] = "mc::k3r5-hs-fs:ti-sci-fw:do_deploy" | ||
15 | |||
16 | # Since default tiboot3.bin on AM62A is for HS-FS, add a version for GP | ||
17 | BBMULTICONFIG += "k3r5-gp" | ||
18 | IMAGE_BOOT_FILES += " tiboot3-am62ax-gp-evm.bin" | ||
19 | do_image_wic[mcdepends] += "mc::k3r5-gp:ti-sci-fw:do_deploy" | ||
20 | do_image_tar[mcdepends] += "mc::k3r5-gp:ti-sci-fw:do_deploy" | ||
21 | |||
22 | # Since default tiboot3.bin on AM62A is for HS-FS, add a version for HS-SE | ||
23 | BBMULTICONFIG += "k3r5-hs-se" | ||
24 | IMAGE_BOOT_FILES += " tiboot3-am62ax-hs-evm.bin" | ||
25 | do_image_wic[mcdepends] += "mc::k3r5-hs-se:ti-sci-fw:do_deploy" | ||
26 | do_image_tar[mcdepends] += "mc::k3r5-hs-se:ti-sci-fw:do_deploy" | ||
13 | 27 | ||
14 | TFA_BOARD = "lite" | 28 | TFA_BOARD = "lite" |
15 | OPTEEMACHINE = "k3-am62x" | 29 | OPTEEMACHINE = "k3-am62x" |
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 e3ffef37..96929286 100644 --- a/recipes-bsp/ti-sci-fw/ti-sci-fw_git.bb +++ b/recipes-bsp/ti-sci-fw/ti-sci-fw_git.bb | |||
@@ -44,7 +44,9 @@ SYSFW_PREFIX_am62xx-evm-k3r5-hs-fs = "fs" | |||
44 | SYSFW_PREFIX_am62xx-lp-evm-k3r5 = "fs" | 44 | SYSFW_PREFIX_am62xx-lp-evm-k3r5 = "fs" |
45 | SYSFW_PREFIX_am62xx-lp-evm-k3r5-hs-se = "fs" | 45 | SYSFW_PREFIX_am62xx-lp-evm-k3r5-hs-se = "fs" |
46 | SYSFW_PREFIX_am62xx-lp-evm-k3r5-hs-fs = "fs" | 46 | SYSFW_PREFIX_am62xx-lp-evm-k3r5-hs-fs = "fs" |
47 | SYSFW_PREFIX_am62axx-evm-k3r5 = "fs" | 47 | SYSFW_PREFIX_am62axx-evm-k3r5-gp = "fs" |
48 | SYSFW_PREFIX_am62axx-evm-k3r5-hs-fs = "fs" | ||
49 | SYSFW_PREFIX_am62axx-evm-k3r5-hs-se = "fs" | ||
48 | 50 | ||
49 | SYSFW_TISCI = "${S}/ti-sysfw/ti-${SYSFW_PREFIX}-firmware-${SYSFW_SOC}-*.bin" | 51 | SYSFW_TISCI = "${S}/ti-sysfw/ti-${SYSFW_PREFIX}-firmware-${SYSFW_SOC}-*.bin" |
50 | 52 | ||
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() { | |||
39 | tfa_sign_k3hs | 39 | tfa_sign_k3hs |
40 | } | 40 | } |
41 | 41 | ||
42 | do_compile_append_am62axx-evm() { | ||
43 | tfa_sign_k3hs | ||
44 | } | ||
45 | |||
42 | do_compile_append_j7-hs-evm() { | 46 | do_compile_append_j7-hs-evm() { |
43 | tfa_sign_k3hs | 47 | tfa_sign_k3hs |
44 | } | 48 | } |
diff --git a/recipes-security/optee/optee-os_%.bbappend b/recipes-security/optee/optee-os_%.bbappend index 5c6c9d4a..7a22b1d7 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() { | |||
80 | optee_sign_k3hs | 80 | optee_sign_k3hs |
81 | } | 81 | } |
82 | 82 | ||
83 | do_compile_append_am62axx-evm() { | ||
84 | optee_sign_k3hs | ||
85 | } | ||
86 | |||
83 | do_compile_append_j7-hs-evm() { | 87 | do_compile_append_j7-hs-evm() { |
84 | optee_sign_k3hs | 88 | optee_sign_k3hs |
85 | } | 89 | } |
diff --git a/recipes-ti/ti-rtos-bin/ti-rtos-firmware.bb b/recipes-ti/ti-rtos-bin/ti-rtos-firmware.bb index 982171e6..e2703070 100644 --- a/recipes-ti/ti-rtos-bin/ti-rtos-firmware.bb +++ b/recipes-ti/ti-rtos-bin/ti-rtos-firmware.bb | |||
@@ -186,6 +186,20 @@ do_install_prepend_am62xx() { | |||
186 | ) | 186 | ) |
187 | } | 187 | } |
188 | 188 | ||
189 | do_install_prepend_am62axx-evm() { | ||
190 | export TI_SECURE_DEV_PKG=${TI_SECURE_DEV_PKG} | ||
191 | ( cd ${RTOS_DM_FW_DIR}; \ | ||
192 | mv ${DM_FIRMWARE} ${DM_FIRMWARE}.unsigned; \ | ||
193 | ${TI_SECURE_DEV_PKG}/scripts/secure-binary-image.sh ${DM_FIRMWARE}.unsigned ${DM_FIRMWARE}; \ | ||
194 | ) | ||
195 | ( cd ${RTOS_IPC_FW_DIR}; \ | ||
196 | ${TI_SECURE_DEV_PKG}/scripts/secure-binary-image.sh am62a-mcu-r5f0_0-fw \ | ||
197 | am62a-mcu-r5f0_0-fw.signed; \ | ||
198 | ${TI_SECURE_DEV_PKG}/scripts/secure-binary-image.sh ipc_echo_test_c7x_1_release_strip.xe71 \ | ||
199 | ipc_echo_test_c7x_1_release_strip.xe71.signed; \ | ||
200 | ) | ||
201 | } | ||
202 | |||
189 | #Install all R5 & DSP ipc echo test binaries in lib/firmware/pdk-ipc, with softlinks up a level | 203 | #Install all R5 & DSP ipc echo test binaries in lib/firmware/pdk-ipc, with softlinks up a level |
190 | do_install() { | 204 | do_install() { |
191 | 205 | ||
@@ -367,8 +381,10 @@ do_install_am62axx() { | |||
367 | install -d ${LEGACY_IPC_FW_DIR} | 381 | install -d ${LEGACY_IPC_FW_DIR} |
368 | # DM+IPC Firmware | 382 | # DM+IPC Firmware |
369 | install -m 0644 ${RTOS_IPC_FW_DIR}/am62a-mcu-r5f0_0-fw ${LEGACY_IPC_FW_DIR} | 383 | install -m 0644 ${RTOS_IPC_FW_DIR}/am62a-mcu-r5f0_0-fw ${LEGACY_IPC_FW_DIR} |
384 | install -m 0644 ${RTOS_IPC_FW_DIR}/am62a-mcu-r5f0_0-fw.signed ${LEGACY_IPC_FW_DIR} | ||
370 | install -m 0644 ${RTOS_DM_FW_DIR}/ipc_echo_testb_mcu1_0_release_strip.xer5f ${LEGACY_DM_FW_DIR} | 385 | install -m 0644 ${RTOS_DM_FW_DIR}/ipc_echo_testb_mcu1_0_release_strip.xer5f ${LEGACY_DM_FW_DIR} |
371 | install -m 0644 ${RTOS_IPC_FW_DIR}/ipc_echo_test_c7x_1_release_strip.xe71 ${LEGACY_IPC_FW_DIR} | 386 | install -m 0644 ${RTOS_IPC_FW_DIR}/ipc_echo_test_c7x_1_release_strip.xe71 ${LEGACY_IPC_FW_DIR} |
387 | install -m 0644 ${RTOS_IPC_FW_DIR}/ipc_echo_test_c7x_1_release_strip.xe71.signed ${LEGACY_IPC_FW_DIR} | ||
372 | } | 388 | } |
373 | 389 | ||
374 | do_deploy() { | 390 | do_deploy() { |