* [meta-ti][dunfell][PATCH 0/3] Add AM64x HS platform support
@ 2021-11-12 23:17 Yogesh Siraswar
2021-11-12 23:17 ` [meta-ti][dunfell][PATCH 1/3] conf: machine: add new am64x hs platform Yogesh Siraswar
` (2 more replies)
0 siblings, 3 replies; 9+ messages in thread
From: Yogesh Siraswar @ 2021-11-12 23:17 UTC (permalink / raw)
To: Praneeth Bajjuri, Denys Dmytriyenko, meta-ti
This series adds AM64x HS support for HS-SE devices
Yogesh Siraswar (3):
conf: machine: add new am64x hs platform
ti-sci-fw: changes to build combined boot image for hs build
am64xx-hs: changes to support new hs platform
conf/machine/am64xx-hs-evm-k3r5.conf | 14 ++++++++++++
conf/machine/am64xx-hs-evm.conf | 22 +++++++++++++++++++
recipes-bsp/ti-sci-fw/ti-sci-fw_git.bb | 20 +++++++++++++++--
.../trusted-firmware-a_%.bbappend | 8 +++++++
recipes-bsp/u-boot/u-boot-ti.inc | 6 +++++
recipes-security/optee/optee-os_%.bbappend | 4 ++++
6 files changed, 72 insertions(+), 2 deletions(-)
create mode 100644 conf/machine/am64xx-hs-evm-k3r5.conf
create mode 100644 conf/machine/am64xx-hs-evm.conf
--
2.17.1
^ permalink raw reply [flat|nested] 9+ messages in thread* [meta-ti][dunfell][PATCH 1/3] conf: machine: add new am64x hs platform
2021-11-12 23:17 [meta-ti][dunfell][PATCH 0/3] Add AM64x HS platform support Yogesh Siraswar
@ 2021-11-12 23:17 ` Yogesh Siraswar
2021-11-12 23:26 ` Denys Dmytriyenko
2021-11-12 23:17 ` [meta-ti][dunfell][PATCH 2/3] ti-sci-fw: changes to build combined boot image for hs build Yogesh Siraswar
2021-11-12 23:18 ` [meta-ti][dunfell][PATCH 3/3] am64xx-hs: changes to support new hs platform Yogesh Siraswar
2 siblings, 1 reply; 9+ messages in thread
From: Yogesh Siraswar @ 2021-11-12 23:17 UTC (permalink / raw)
To: Praneeth Bajjuri, Denys Dmytriyenko, meta-ti
Add new am64x hs platform. This requires two files to be created.
Used am65x and j7 hs platform for reference.
Signed-off-by: Yogesh Siraswar <yogeshs@ti.com>
---
conf/machine/am64xx-hs-evm-k3r5.conf | 14 ++++++++++++++
conf/machine/am64xx-hs-evm.conf | 22 ++++++++++++++++++++++
2 files changed, 36 insertions(+)
create mode 100644 conf/machine/am64xx-hs-evm-k3r5.conf
create mode 100644 conf/machine/am64xx-hs-evm.conf
diff --git a/conf/machine/am64xx-hs-evm-k3r5.conf b/conf/machine/am64xx-hs-evm-k3r5.conf
new file mode 100644
index 00000000..69c6cada
--- /dev/null
+++ b/conf/machine/am64xx-hs-evm-k3r5.conf
@@ -0,0 +1,14 @@
+#@TYPE: Machine
+#@NAME: AM65xx HS EVM (R5F)
+#@DESCRIPTION: Machine configuration for the TI AM65xx HS EVM (R5F core)
+
+require conf/machine/include/k3r5.inc
+
+SYSFW_SOC = "am64x"
+SYSFW_CONFIG = "evm"
+SYSFW_SUFFIX = "hs"
+SYSFW_SYMLINK = ""
+
+UBOOT_MACHINE = "am64x_hs_evm_r5_defconfig"
+
+TI_SECURE_DEV_PKG = "${TI_SECURE_DEV_PKG_K3}"
diff --git a/conf/machine/am64xx-hs-evm.conf b/conf/machine/am64xx-hs-evm.conf
new file mode 100644
index 00000000..44e81463
--- /dev/null
+++ b/conf/machine/am64xx-hs-evm.conf
@@ -0,0 +1,22 @@
+#@TYPE: Machine
+#@NAME: AM64xx HS EVM
+#@DESCRIPTION: Machine configuration for the TI AM64xx HS EVM
+
+require conf/machine/include/am64xx.inc
+
+UBOOT_MACHINE = "am64x_hs_evm_a53_defconfig"
+
+UBOOT_ENTRYPOINT = "0x80080000"
+UBOOT_LOADADDRESS = "0x80080000"
+UBOOT_RD_LOADADDRESS = "0x84000000"
+UBOOT_RD_ENTRYPOINT = "0x84000000"
+UBOOT_DTB_LOADADDRESS = "0x83000000"
+UBOOT_DTBO_LOADADDRESS = "0x83080000"
+UBOOT_DTBO_OFFSET = "0x00010000"
+
+SPL_BINARY = "tispl.bin_HS"
+SPL_BINARYNAME = "tispl.bin"
+UBOOT_BINARY = "u-boot.img_HS"
+IMAGE_BOOT_FILES = "${UBOOT_BINARY}"
+
+TI_SECURE_DEV_PKG = "${TI_SECURE_DEV_PKG_K3}"
--
2.17.1
^ permalink raw reply related [flat|nested] 9+ messages in thread* Re: [meta-ti][dunfell][PATCH 1/3] conf: machine: add new am64x hs platform
2021-11-12 23:17 ` [meta-ti][dunfell][PATCH 1/3] conf: machine: add new am64x hs platform Yogesh Siraswar
@ 2021-11-12 23:26 ` Denys Dmytriyenko
2021-11-15 20:53 ` Yogesh Siraswar
0 siblings, 1 reply; 9+ messages in thread
From: Denys Dmytriyenko @ 2021-11-12 23:26 UTC (permalink / raw)
To: yogeshs; +Cc: Praneeth Bajjuri, Denys Dmytriyenko, meta-ti
On Fri, Nov 12, 2021 at 11:17:58PM +0000, Yogesh Siraswar via lists.yoctoproject.org wrote:
> Add new am64x hs platform. This requires two files to be created.
> Used am65x and j7 hs platform for reference.
>
> Signed-off-by: Yogesh Siraswar <yogeshs@ti.com>
> ---
> conf/machine/am64xx-hs-evm-k3r5.conf | 14 ++++++++++++++
> conf/machine/am64xx-hs-evm.conf | 22 ++++++++++++++++++++++
> 2 files changed, 36 insertions(+)
> create mode 100644 conf/machine/am64xx-hs-evm-k3r5.conf
> create mode 100644 conf/machine/am64xx-hs-evm.conf
>
> diff --git a/conf/machine/am64xx-hs-evm-k3r5.conf b/conf/machine/am64xx-hs-evm-k3r5.conf
> new file mode 100644
> index 00000000..69c6cada
> --- /dev/null
> +++ b/conf/machine/am64xx-hs-evm-k3r5.conf
> @@ -0,0 +1,14 @@
> +#@TYPE: Machine
> +#@NAME: AM65xx HS EVM (R5F)
AM64?
> +#@DESCRIPTION: Machine configuration for the TI AM65xx HS EVM (R5F core)
AM64?
Both are just comments, so not a functional issue.
> +require conf/machine/include/k3r5.inc
> +
> +SYSFW_SOC = "am64x"
> +SYSFW_CONFIG = "evm"
> +SYSFW_SUFFIX = "hs"
> +SYSFW_SYMLINK = ""
> +
> +UBOOT_MACHINE = "am64x_hs_evm_r5_defconfig"
> +
> +TI_SECURE_DEV_PKG = "${TI_SECURE_DEV_PKG_K3}"
> diff --git a/conf/machine/am64xx-hs-evm.conf b/conf/machine/am64xx-hs-evm.conf
> new file mode 100644
> index 00000000..44e81463
> --- /dev/null
> +++ b/conf/machine/am64xx-hs-evm.conf
> @@ -0,0 +1,22 @@
> +#@TYPE: Machine
> +#@NAME: AM64xx HS EVM
> +#@DESCRIPTION: Machine configuration for the TI AM64xx HS EVM
> +
> +require conf/machine/include/am64xx.inc
> +
> +UBOOT_MACHINE = "am64x_hs_evm_a53_defconfig"
> +
> +UBOOT_ENTRYPOINT = "0x80080000"
> +UBOOT_LOADADDRESS = "0x80080000"
> +UBOOT_RD_LOADADDRESS = "0x84000000"
> +UBOOT_RD_ENTRYPOINT = "0x84000000"
> +UBOOT_DTB_LOADADDRESS = "0x83000000"
> +UBOOT_DTBO_LOADADDRESS = "0x83080000"
> +UBOOT_DTBO_OFFSET = "0x00010000"
> +
> +SPL_BINARY = "tispl.bin_HS"
> +SPL_BINARYNAME = "tispl.bin"
> +UBOOT_BINARY = "u-boot.img_HS"
> +IMAGE_BOOT_FILES = "${UBOOT_BINARY}"
> +
> +TI_SECURE_DEV_PKG = "${TI_SECURE_DEV_PKG_K3}"
> --
> 2.17.1
>
>
>
>
--
Regards,
Denys Dmytriyenko <denis@denix.org>
PGP: 0x420902729A92C964 - https://denix.org/0x420902729A92C964
Fingerprint: 25FC E4A5 8A72 2F69 1186 6D76 4209 0272 9A92 C964
^ permalink raw reply [flat|nested] 9+ messages in thread* Re: [meta-ti][dunfell][PATCH 1/3] conf: machine: add new am64x hs platform
2021-11-12 23:26 ` Denys Dmytriyenko
@ 2021-11-15 20:53 ` Yogesh Siraswar
0 siblings, 0 replies; 9+ messages in thread
From: Yogesh Siraswar @ 2021-11-15 20:53 UTC (permalink / raw)
To: Denys Dmytriyenko; +Cc: Praneeth Bajjuri, Denys Dmytriyenko, meta-ti
On 11/12/2021 5:26 PM, Denys Dmytriyenko wrote:
> On Fri, Nov 12, 2021 at 11:17:58PM +0000, Yogesh Siraswar via lists.yoctoproject.org wrote:
>> Add new am64x hs platform. This requires two files to be created.
>> Used am65x and j7 hs platform for reference.
>>
>> Signed-off-by: Yogesh Siraswar <yogeshs@ti.com>
>> ---
>> conf/machine/am64xx-hs-evm-k3r5.conf | 14 ++++++++++++++
>> conf/machine/am64xx-hs-evm.conf | 22 ++++++++++++++++++++++
>> 2 files changed, 36 insertions(+)
>> create mode 100644 conf/machine/am64xx-hs-evm-k3r5.conf
>> create mode 100644 conf/machine/am64xx-hs-evm.conf
>>
>> diff --git a/conf/machine/am64xx-hs-evm-k3r5.conf b/conf/machine/am64xx-hs-evm-k3r5.conf
>> new file mode 100644
>> index 00000000..69c6cada
>> --- /dev/null
>> +++ b/conf/machine/am64xx-hs-evm-k3r5.conf
>> @@ -0,0 +1,14 @@
>> +#@TYPE: Machine
>> +#@NAME: AM65xx HS EVM (R5F)
>
> AM64?
Will fix it while merging
>
>> +#@DESCRIPTION: Machine configuration for the TI AM65xx HS EVM (R5F core)
>
> AM64?
Same will fix while merging
>
> Both are just comments, so not a functional issue.
>
>
>> +require conf/machine/include/k3r5.inc
>> +
>> +SYSFW_SOC = "am64x"
>> +SYSFW_CONFIG = "evm"
>> +SYSFW_SUFFIX = "hs"
>> +SYSFW_SYMLINK = ""
>> +
>> +UBOOT_MACHINE = "am64x_hs_evm_r5_defconfig"
>> +
>> +TI_SECURE_DEV_PKG = "${TI_SECURE_DEV_PKG_K3}"
>> diff --git a/conf/machine/am64xx-hs-evm.conf b/conf/machine/am64xx-hs-evm.conf
>> new file mode 100644
>> index 00000000..44e81463
>> --- /dev/null
>> +++ b/conf/machine/am64xx-hs-evm.conf
>> @@ -0,0 +1,22 @@
>> +#@TYPE: Machine
>> +#@NAME: AM64xx HS EVM
>> +#@DESCRIPTION: Machine configuration for the TI AM64xx HS EVM
>> +
>> +require conf/machine/include/am64xx.inc
>> +
>> +UBOOT_MACHINE = "am64x_hs_evm_a53_defconfig"
>> +
>> +UBOOT_ENTRYPOINT = "0x80080000"
>> +UBOOT_LOADADDRESS = "0x80080000"
>> +UBOOT_RD_LOADADDRESS = "0x84000000"
>> +UBOOT_RD_ENTRYPOINT = "0x84000000"
>> +UBOOT_DTB_LOADADDRESS = "0x83000000"
>> +UBOOT_DTBO_LOADADDRESS = "0x83080000"
>> +UBOOT_DTBO_OFFSET = "0x00010000"
>> +
>> +SPL_BINARY = "tispl.bin_HS"
>> +SPL_BINARYNAME = "tispl.bin"
>> +UBOOT_BINARY = "u-boot.img_HS"
>> +IMAGE_BOOT_FILES = "${UBOOT_BINARY}"
>> +
>> +TI_SECURE_DEV_PKG = "${TI_SECURE_DEV_PKG_K3}"
>> --
>> 2.17.1
>>
>
>>
>>
>>
>
>
^ permalink raw reply [flat|nested] 9+ messages in thread
* [meta-ti][dunfell][PATCH 2/3] ti-sci-fw: changes to build combined boot image for hs build
2021-11-12 23:17 [meta-ti][dunfell][PATCH 0/3] Add AM64x HS platform support Yogesh Siraswar
2021-11-12 23:17 ` [meta-ti][dunfell][PATCH 1/3] conf: machine: add new am64x hs platform Yogesh Siraswar
@ 2021-11-12 23:17 ` Yogesh Siraswar
2021-11-19 18:57 ` Denys Dmytriyenko
2021-11-12 23:18 ` [meta-ti][dunfell][PATCH 3/3] am64xx-hs: changes to support new hs platform Yogesh Siraswar
2 siblings, 1 reply; 9+ messages in thread
From: Yogesh Siraswar @ 2021-11-12 23:17 UTC (permalink / raw)
To: Praneeth Bajjuri, Denys Dmytriyenko, meta-ti
Added support to build combined boot image for hs build.
This required k3 image gen patch that is already merged.
Signed-off-by: Yogesh Siraswar <yogeshs@ti.com>
---
recipes-bsp/ti-sci-fw/ti-sci-fw_git.bb | 20 ++++++++++++++++++--
1 file changed, 18 insertions(+), 2 deletions(-)
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 a1a7446b..9c70120c 100644
--- a/recipes-bsp/ti-sci-fw/ti-sci-fw_git.bb
+++ b/recipes-bsp/ti-sci-fw/ti-sci-fw_git.bb
@@ -3,9 +3,10 @@ require recipes-bsp/ti-linux-fw/ti-linux-fw.inc
DEPENDS = "openssl-native u-boot-mkimage-native dtc-native"
DEPENDS_append_j7200-evm-k3r5 = " virtual/bootloader"
DEPENDS_append_am64xx-evm-k3r5 = " virtual/bootloader"
+DEPENDS_append_am64xx-hs-evm-k3r5 = " virtual/bootloader"
CLEANBROKEN = "1"
-PR = "${INC_PR}.0"
+PR = "${INC_PR}.1"
# Loaded by R5F core
COMPATIBLE_MACHINE = "k3r5"
@@ -48,12 +49,13 @@ EXTRA_OEMAKE = "\
SYSFW_PATH="${SYSFW_TISCI}" SOC=${SYSFW_SOC} CONFIG=${SYSFW_CONFIG} \
"
EXTRA_OEMAKE_HS = " \
- HS=1 SYSFW_HS_PATH="${S}/ti-sysfw/${SYSFW_BASE}-enc.bin" SYSFW_HS_INNER_CERT_PATH="${S}/ti-sysfw/${SYSFW_BASE}-cert.bin" \
+ HS=1 SW_REV=1 SYSFW_HS_PATH="${S}/ti-sysfw/${SYSFW_BASE}-enc.bin" SYSFW_HS_INNER_CERT_PATH="${S}/ti-sysfw/${SYSFW_BASE}-cert.bin" \
"
EXTRA_OEMAKE_append = "${@['',' ${EXTRA_OEMAKE_HS}']['${SYSFW_SUFFIX}' == 'hs']}"
EXTRA_OEMAKE_append_j7200-evm-k3r5 = " SBL="${STAGING_DIR_HOST}/boot/u-boot-spl.bin""
EXTRA_OEMAKE_append_am64xx-evm-k3r5 = " SBL="${STAGING_DIR_HOST}/boot/u-boot-spl.bin""
+EXTRA_OEMAKE_append_am64xx-hs-evm-k3r5 = " SBL="${STAGING_DIR_HOST}/boot/u-boot-spl.bin""
do_compile() {
cd ${WORKDIR}/imggen/
@@ -116,4 +118,18 @@ do_deploy_am64xx-evm-k3r5() {
install -m 644 ${SYSFW_TISCI} ${DEPLOYDIR}/
}
+do_install_am64xx-hs-evm-k3r5() {
+ install -d ${D}/boot
+ install -m 644 ${WORKDIR}/imggen/${UBOOT_BINARY} ${D}/boot/${UBOOT_IMAGE}
+ ln -sf ${UBOOT_IMAGE} ${D}/boot/${UBOOT_SYMLINK}
+ ln -sf ${UBOOT_IMAGE} ${D}/boot/${UBOOT_BINARY}
+}
+
+do_deploy_am64xx-hs-evm-k3r5() {
+ install -d ${DEPLOYDIR}
+ install -m 644 ${WORKDIR}/imggen/${UBOOT_BINARY} ${DEPLOYDIR}/${UBOOT_IMAGE}
+ ln -sf ${UBOOT_IMAGE} ${DEPLOYDIR}/${UBOOT_SYMLINK}
+ ln -sf ${UBOOT_IMAGE} ${DEPLOYDIR}/${UBOOT_BINARY}
+ install -m 644 ${SYSFW_TISCI} ${DEPLOYDIR}/
+}
addtask deploy before do_build after do_compile
--
2.17.1
^ permalink raw reply related [flat|nested] 9+ messages in thread* Re: [meta-ti][dunfell][PATCH 2/3] ti-sci-fw: changes to build combined boot image for hs build
2021-11-12 23:17 ` [meta-ti][dunfell][PATCH 2/3] ti-sci-fw: changes to build combined boot image for hs build Yogesh Siraswar
@ 2021-11-19 18:57 ` Denys Dmytriyenko
2021-11-19 21:35 ` Yogesh Siraswar
0 siblings, 1 reply; 9+ messages in thread
From: Denys Dmytriyenko @ 2021-11-19 18:57 UTC (permalink / raw)
To: yogeshs; +Cc: Praneeth Bajjuri, meta-ti
Yogesh,
Is this still the correct SECDEV to use with am64xx HS?
https://git.ti.com/cgit/security-development-tools/core-secdev-k3/
I'm getting this error in ti-sci-fw do_compile():
| NOTE: make -j 56 CROSS_COMPILE=arm-none-linux-gnueabihf- SYSFW_DL_URL= SYSFW_HS_DL_URL= SYSFW_HS_INNER_CERT_DL_URL= SYSFW_PATH=/OE/arago-dunfell/build/arago-tmp-external-arm-glibc/work/am64xx_hs_evm_k3r5-linux-gnueabi/ti-sci-fw/2021.09a-r1.1/git/ti-sysfw/ti-sci-firmware-am64x-hs*.bin SOC=am64x CONFIG=evm HS=1 SW_REV=1 SYSFW_HS_PATH=/OE/arago-dunfell/build/arago-tmp-external-arm-glibc/work/am64xx_hs_evm_k3r5-linux-gnueabi/ti-sci-fw/2021.09a-r1.1/git/ti-sysfw/ti-sci-firmware-am64x-hs*-enc.bin SYSFW_HS_INNER_CERT_PATH=/OE/arago-dunfell/build/arago-tmp-external-arm-glibc/work/am64xx_hs_evm_k3r5-linux-gnueabi/ti-sci-fw/2021.09a-r1.1/git/ti-sysfw/ti-sci-firmware-am64x-hs*-cert.bin SBL=/OE/arago-dunfell/build/arago-tmp-external-arm-glibc/work/am64xx_hs_evm_k3r5-linux-gnueabi/ti-sci-fw/2021.09a-r1.1/recipe-sysroot/boot/u-boot-spl.bin
| Makefile:139: warning: overriding recipe for target '/OE/arago-dunfell/build/arago-tmp-external-arm-glibc/work/am64xx_hs_evm_k3r5-linux-gnueabi/ti-sci-fw/2021.09a-r1.1/git/ti-sysfw/ti-sci-firmware-am64x-hs-enc.bin'
| Makefile:134: warning: ignoring old recipe for target '/OE/arago-dunfell/build/arago-tmp-external-arm-glibc/work/am64xx_hs_evm_k3r5-linux-gnueabi/ti-sci-fw/2021.09a-r1.1/git/ti-sysfw/ti-sci-firmware-am64x-hs-enc.bin'
| Makefile:144: warning: overriding recipe for target '/OE/arago-dunfell/build/arago-tmp-external-arm-glibc/work/am64xx_hs_evm_k3r5-linux-gnueabi/ti-sci-fw/2021.09a-r1.1/git/ti-sysfw/ti-sci-firmware-am64x-hs-cert.bin'
| Makefile:134: warning: ignoring old recipe for target '/OE/arago-dunfell/build/arago-tmp-external-arm-glibc/work/am64xx_hs_evm_k3r5-linux-gnueabi/ti-sci-fw/2021.09a-r1.1/git/ti-sysfw/ti-sci-firmware-am64x-hs-cert.bin'
| ./gen_its.sh am64x evm sysfw.bin board-cfg.bin pm-cfg.bin rm-cfg.bin sec-cfg.bin > out/soc/am64x/evm/sysfw-am64x-evm.its
| ./scripts/gen_x509_combined_cert.sh -b /OE/arago-dunfell/build/arago-tmp-external-arm-glibc/work/am64xx_hs_evm_k3r5-linux-gnueabi/ti-sci-fw/2021.09a-r1.1/recipe-sysroot/boot/u-boot-spl.bin -l 0x70000000 -s /OE/arago-dunfell/build/arago-tmp-external-arm-glibc/work/am64xx_hs_evm_k3r5-linux-gnueabi/ti-sci-fw/2021.09a-r1.1/git/ti-sysfw/ti-sci-firmware-am64x-hs*.bin -m 0x44000 -d out/soc/am64x/evm/combined-sysfw-cfg.bin -n 0x7b000 -k /opt/secdev-k3//keys/custMpk.pem -o tiboot3.bin
| ERROR: SYSFW and its loadaddr are compulsory
| Usage: ./scripts/gen_x509_combined_cert.sh [-b Boot Loader] [-d SYSFW_DATA] [-k key_file] [-l SBL loadaddress] [-m SYSFW loadaddress] [-n SYSFW_DATA loadaddr] [-s SYSFW] [-t DM_DATA] [-y DM_DATA loadaddr]
Any pointers?
--
Denys
On Fri, Nov 12, 2021 at 11:17:59PM +0000, Yogesh Siraswar via lists.yoctoproject.org wrote:
> Added support to build combined boot image for hs build.
> This required k3 image gen patch that is already merged.
>
> Signed-off-by: Yogesh Siraswar <yogeshs@ti.com>
> ---
> recipes-bsp/ti-sci-fw/ti-sci-fw_git.bb | 20 ++++++++++++++++++--
> 1 file changed, 18 insertions(+), 2 deletions(-)
>
> 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 a1a7446b..9c70120c 100644
> --- a/recipes-bsp/ti-sci-fw/ti-sci-fw_git.bb
> +++ b/recipes-bsp/ti-sci-fw/ti-sci-fw_git.bb
> @@ -3,9 +3,10 @@ require recipes-bsp/ti-linux-fw/ti-linux-fw.inc
> DEPENDS = "openssl-native u-boot-mkimage-native dtc-native"
> DEPENDS_append_j7200-evm-k3r5 = " virtual/bootloader"
> DEPENDS_append_am64xx-evm-k3r5 = " virtual/bootloader"
> +DEPENDS_append_am64xx-hs-evm-k3r5 = " virtual/bootloader"
>
> CLEANBROKEN = "1"
> -PR = "${INC_PR}.0"
> +PR = "${INC_PR}.1"
>
> # Loaded by R5F core
> COMPATIBLE_MACHINE = "k3r5"
> @@ -48,12 +49,13 @@ EXTRA_OEMAKE = "\
> SYSFW_PATH="${SYSFW_TISCI}" SOC=${SYSFW_SOC} CONFIG=${SYSFW_CONFIG} \
> "
> EXTRA_OEMAKE_HS = " \
> - HS=1 SYSFW_HS_PATH="${S}/ti-sysfw/${SYSFW_BASE}-enc.bin" SYSFW_HS_INNER_CERT_PATH="${S}/ti-sysfw/${SYSFW_BASE}-cert.bin" \
> + HS=1 SW_REV=1 SYSFW_HS_PATH="${S}/ti-sysfw/${SYSFW_BASE}-enc.bin" SYSFW_HS_INNER_CERT_PATH="${S}/ti-sysfw/${SYSFW_BASE}-cert.bin" \
> "
> EXTRA_OEMAKE_append = "${@['',' ${EXTRA_OEMAKE_HS}']['${SYSFW_SUFFIX}' == 'hs']}"
>
> EXTRA_OEMAKE_append_j7200-evm-k3r5 = " SBL="${STAGING_DIR_HOST}/boot/u-boot-spl.bin""
> EXTRA_OEMAKE_append_am64xx-evm-k3r5 = " SBL="${STAGING_DIR_HOST}/boot/u-boot-spl.bin""
> +EXTRA_OEMAKE_append_am64xx-hs-evm-k3r5 = " SBL="${STAGING_DIR_HOST}/boot/u-boot-spl.bin""
>
> do_compile() {
> cd ${WORKDIR}/imggen/
> @@ -116,4 +118,18 @@ do_deploy_am64xx-evm-k3r5() {
> install -m 644 ${SYSFW_TISCI} ${DEPLOYDIR}/
> }
>
> +do_install_am64xx-hs-evm-k3r5() {
> + install -d ${D}/boot
> + install -m 644 ${WORKDIR}/imggen/${UBOOT_BINARY} ${D}/boot/${UBOOT_IMAGE}
> + ln -sf ${UBOOT_IMAGE} ${D}/boot/${UBOOT_SYMLINK}
> + ln -sf ${UBOOT_IMAGE} ${D}/boot/${UBOOT_BINARY}
> +}
> +
> +do_deploy_am64xx-hs-evm-k3r5() {
> + install -d ${DEPLOYDIR}
> + install -m 644 ${WORKDIR}/imggen/${UBOOT_BINARY} ${DEPLOYDIR}/${UBOOT_IMAGE}
> + ln -sf ${UBOOT_IMAGE} ${DEPLOYDIR}/${UBOOT_SYMLINK}
> + ln -sf ${UBOOT_IMAGE} ${DEPLOYDIR}/${UBOOT_BINARY}
> + install -m 644 ${SYSFW_TISCI} ${DEPLOYDIR}/
> +}
> addtask deploy before do_build after do_compile
> --
> 2.17.1
>
^ permalink raw reply [flat|nested] 9+ messages in thread* Re: [meta-ti][dunfell][PATCH 2/3] ti-sci-fw: changes to build combined boot image for hs build
2021-11-19 18:57 ` Denys Dmytriyenko
@ 2021-11-19 21:35 ` Yogesh Siraswar
2021-11-19 23:25 ` Denys Dmytriyenko
0 siblings, 1 reply; 9+ messages in thread
From: Yogesh Siraswar @ 2021-11-19 21:35 UTC (permalink / raw)
To: Denys Dmytriyenko; +Cc: Praneeth Bajjuri, meta-ti
On 11/19/2021 12:57 PM, Denys Dmytriyenko wrote:
> Yogesh,
>
> Is this still the correct SECDEV to use with am64xx HS?
> https://git.ti.com/cgit/security-development-tools/core-secdev-k3/
Yes.
>
> I'm getting this error in ti-sci-fw do_compile():
>
> | NOTE: make -j 56 CROSS_COMPILE=arm-none-linux-gnueabihf- SYSFW_DL_URL= SYSFW_HS_DL_URL= SYSFW_HS_INNER_CERT_DL_URL= SYSFW_PATH=/OE/arago-dunfell/build/arago-tmp-external-arm-glibc/work/am64xx_hs_evm_k3r5-linux-gnueabi/ti-sci-fw/2021.09a-r1.1/git/ti-sysfw/ti-sci-firmware-am64x-hs*.bin SOC=am64x CONFIG=evm HS=1 SW_REV=1 SYSFW_HS_PATH=/OE/arago-dunfell/build/arago-tmp-external-arm-glibc/work/am64xx_hs_evm_k3r5-linux-gnueabi/ti-sci-fw/2021.09a-r1.1/git/ti-sysfw/ti-sci-firmware-am64x-hs*-enc.bin SYSFW_HS_INNER_CERT_PATH=/OE/arago-dunfell/build/arago-tmp-external-arm-glibc/work/am64xx_hs_evm_k3r5-linux-gnueabi/ti-sci-fw/2021.09a-r1.1/git/ti-sysfw/ti-sci-firmware-am64x-hs*-cert.bin SBL=/OE/arago-dunfell/build/arago-tmp-external-arm-glibc/work/am64xx_hs_evm_k3r5-linux-gnueabi/ti-sci-fw/2021.09a-r1.1/recipe-sysroot/boot/u-boot-spl.bin
> | Makefile:139: warning: overriding recipe for target '/OE/arago-dunfell/build/arago-tmp-external-arm-glibc/work/am64xx_hs_evm_k3r5-linux-gnueabi/ti-sci-fw/2021.09a-r1.1/git/ti-sysfw/ti-sci-firmware-am64x-hs-enc.bin'
> | Makefile:134: warning: ignoring old recipe for target '/OE/arago-dunfell/build/arago-tmp-external-arm-glibc/work/am64xx_hs_evm_k3r5-linux-gnueabi/ti-sci-fw/2021.09a-r1.1/git/ti-sysfw/ti-sci-firmware-am64x-hs-enc.bin'
> | Makefile:144: warning: overriding recipe for target '/OE/arago-dunfell/build/arago-tmp-external-arm-glibc/work/am64xx_hs_evm_k3r5-linux-gnueabi/ti-sci-fw/2021.09a-r1.1/git/ti-sysfw/ti-sci-firmware-am64x-hs-cert.bin'
> | Makefile:134: warning: ignoring old recipe for target '/OE/arago-dunfell/build/arago-tmp-external-arm-glibc/work/am64xx_hs_evm_k3r5-linux-gnueabi/ti-sci-fw/2021.09a-r1.1/git/ti-sysfw/ti-sci-firmware-am64x-hs-cert.bin'
> | ./gen_its.sh am64x evm sysfw.bin board-cfg.bin pm-cfg.bin rm-cfg.bin sec-cfg.bin > out/soc/am64x/evm/sysfw-am64x-evm.its
> | ./scripts/gen_x509_combined_cert.sh -b /OE/arago-dunfell/build/arago-tmp-external-arm-glibc/work/am64xx_hs_evm_k3r5-linux-gnueabi/ti-sci-fw/2021.09a-r1.1/recipe-sysroot/boot/u-boot-spl.bin -l 0x70000000 -s /OE/arago-dunfell/build/arago-tmp-external-arm-glibc/work/am64xx_hs_evm_k3r5-linux-gnueabi/ti-sci-fw/2021.09a-r1.1/git/ti-sysfw/ti-sci-firmware-am64x-hs*.bin -m 0x44000 -d out/soc/am64x/evm/combined-sysfw-cfg.bin -n 0x7b000 -k /opt/secdev-k3//keys/custMpk.pem -o tiboot3.bin
> | ERROR: SYSFW and its loadaddr are compulsory
> | Usage: ./scripts/gen_x509_combined_cert.sh [-b Boot Loader] [-d SYSFW_DATA] [-k key_file] [-l SBL loadaddress] [-m SYSFW loadaddress] [-n SYSFW_DATA loadaddr] [-s SYSFW] [-t DM_DATA] [-y DM_DATA loadaddr]
>
> Any pointers?
Check the k3-image-gen.
>
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [meta-ti][dunfell][PATCH 2/3] ti-sci-fw: changes to build combined boot image for hs build
2021-11-19 21:35 ` Yogesh Siraswar
@ 2021-11-19 23:25 ` Denys Dmytriyenko
0 siblings, 0 replies; 9+ messages in thread
From: Denys Dmytriyenko @ 2021-11-19 23:25 UTC (permalink / raw)
To: Siraswar, Yogesh; +Cc: Praneeth Bajjuri, meta-ti
On Fri, Nov 19, 2021 at 03:35:24PM -0600, Siraswar, Yogesh wrote:
> On 11/19/2021 12:57 PM, Denys Dmytriyenko wrote:
> >Yogesh,
> >
> >Is this still the correct SECDEV to use with am64xx HS?
> >https://git.ti.com/cgit/security-development-tools/core-secdev-k3/
>
> Yes.
> >
> >I'm getting this error in ti-sci-fw do_compile():
> >
> >| NOTE: make -j 56 CROSS_COMPILE=arm-none-linux-gnueabihf- SYSFW_DL_URL= SYSFW_HS_DL_URL= SYSFW_HS_INNER_CERT_DL_URL= SYSFW_PATH=/OE/arago-dunfell/build/arago-tmp-external-arm-glibc/work/am64xx_hs_evm_k3r5-linux-gnueabi/ti-sci-fw/2021.09a-r1.1/git/ti-sysfw/ti-sci-firmware-am64x-hs*.bin SOC=am64x CONFIG=evm HS=1 SW_REV=1 SYSFW_HS_PATH=/OE/arago-dunfell/build/arago-tmp-external-arm-glibc/work/am64xx_hs_evm_k3r5-linux-gnueabi/ti-sci-fw/2021.09a-r1.1/git/ti-sysfw/ti-sci-firmware-am64x-hs*-enc.bin SYSFW_HS_INNER_CERT_PATH=/OE/arago-dunfell/build/arago-tmp-external-arm-glibc/work/am64xx_hs_evm_k3r5-linux-gnueabi/ti-sci-fw/2021.09a-r1.1/git/ti-sysfw/ti-sci-firmware-am64x-hs*-cert.bin SBL=/OE/arago-dunfell/build/arago-tmp-external-arm-glibc/work/am64xx_hs_evm_k3r5-linux-gnueabi/ti-sci-fw/2021.09a-r1.1/recipe-sysroot/boot/u-boot-spl.bin
> >| Makefile:139: warning: overriding recipe for target '/OE/arago-dunfell/build/arago-tmp-external-arm-glibc/work/am64xx_hs_evm_k3r5-linux-gnueabi/ti-sci-fw/2021.09a-r1.1/git/ti-sysfw/ti-sci-firmware-am64x-hs-enc.bin'
> >| Makefile:134: warning: ignoring old recipe for target '/OE/arago-dunfell/build/arago-tmp-external-arm-glibc/work/am64xx_hs_evm_k3r5-linux-gnueabi/ti-sci-fw/2021.09a-r1.1/git/ti-sysfw/ti-sci-firmware-am64x-hs-enc.bin'
> >| Makefile:144: warning: overriding recipe for target '/OE/arago-dunfell/build/arago-tmp-external-arm-glibc/work/am64xx_hs_evm_k3r5-linux-gnueabi/ti-sci-fw/2021.09a-r1.1/git/ti-sysfw/ti-sci-firmware-am64x-hs-cert.bin'
> >| Makefile:134: warning: ignoring old recipe for target '/OE/arago-dunfell/build/arago-tmp-external-arm-glibc/work/am64xx_hs_evm_k3r5-linux-gnueabi/ti-sci-fw/2021.09a-r1.1/git/ti-sysfw/ti-sci-firmware-am64x-hs-cert.bin'
> >| ./gen_its.sh am64x evm sysfw.bin board-cfg.bin pm-cfg.bin rm-cfg.bin sec-cfg.bin > out/soc/am64x/evm/sysfw-am64x-evm.its
> >| ./scripts/gen_x509_combined_cert.sh -b /OE/arago-dunfell/build/arago-tmp-external-arm-glibc/work/am64xx_hs_evm_k3r5-linux-gnueabi/ti-sci-fw/2021.09a-r1.1/recipe-sysroot/boot/u-boot-spl.bin -l 0x70000000 -s /OE/arago-dunfell/build/arago-tmp-external-arm-glibc/work/am64xx_hs_evm_k3r5-linux-gnueabi/ti-sci-fw/2021.09a-r1.1/git/ti-sysfw/ti-sci-firmware-am64x-hs*.bin -m 0x44000 -d out/soc/am64x/evm/combined-sysfw-cfg.bin -n 0x7b000 -k /opt/secdev-k3//keys/custMpk.pem -o tiboot3.bin
> >| ERROR: SYSFW and its loadaddr are compulsory
> >| Usage: ./scripts/gen_x509_combined_cert.sh [-b Boot Loader] [-d SYSFW_DATA] [-k key_file] [-l SBL loadaddress] [-m SYSFW loadaddress] [-n SYSFW_DATA loadaddr] [-s SYSFW] [-t DM_DATA] [-y DM_DATA loadaddr]
> >
> >Any pointers?
> Check the k3-image-gen.
Was the fix part of this later commit to update K3_IMAGE_GEN_SRCREV?
https://git.yoctoproject.org/cgit/cgit.cgi/meta-ti/commit/?h=dunfell&id=f438a091c319250eed33fe058706e93c9fbefd1c
This was merged earlier today for J721e HS SR1.1 and seems unrelated to
AM64 HS changes submitted a week ago... Was that just an oversight updating
the SRCREV, or was there another problem I'm missing? Thanks.
--
Regards,
Denys Dmytriyenko <denis@denix.org>
PGP: 0x420902729A92C964 - https://denix.org/0x420902729A92C964
Fingerprint: 25FC E4A5 8A72 2F69 1186 6D76 4209 0272 9A92 C964
^ permalink raw reply [flat|nested] 9+ messages in thread
* [meta-ti][dunfell][PATCH 3/3] am64xx-hs: changes to support new hs platform
2021-11-12 23:17 [meta-ti][dunfell][PATCH 0/3] Add AM64x HS platform support Yogesh Siraswar
2021-11-12 23:17 ` [meta-ti][dunfell][PATCH 1/3] conf: machine: add new am64x hs platform Yogesh Siraswar
2021-11-12 23:17 ` [meta-ti][dunfell][PATCH 2/3] ti-sci-fw: changes to build combined boot image for hs build Yogesh Siraswar
@ 2021-11-12 23:18 ` Yogesh Siraswar
2 siblings, 0 replies; 9+ messages in thread
From: Yogesh Siraswar @ 2021-11-12 23:18 UTC (permalink / raw)
To: Praneeth Bajjuri, Denys Dmytriyenko, meta-ti
Changes to support new am64x hs platform in:
1) optee: sign the image
2) atf: sign the image
3) u-boot: Add u-boot-spl image for combined boot image
Signed-off-by: Yogesh Siraswar <yogeshs@ti.com>
---
.../trusted-firmware-a/trusted-firmware-a_%.bbappend | 8 ++++++++
recipes-bsp/u-boot/u-boot-ti.inc | 6 ++++++
recipes-security/optee/optee-os_%.bbappend | 4 ++++
3 files changed, 18 insertions(+)
diff --git a/recipes-bsp/trusted-firmware-a/trusted-firmware-a_%.bbappend b/recipes-bsp/trusted-firmware-a/trusted-firmware-a_%.bbappend
index eb6f2fd1..90fa0333 100644
--- a/recipes-bsp/trusted-firmware-a/trusted-firmware-a_%.bbappend
+++ b/recipes-bsp/trusted-firmware-a/trusted-firmware-a_%.bbappend
@@ -16,6 +16,14 @@ do_compile_append_am65xx-hs-evm() {
)
}
+do_compile_append_am64xx-hs-evm() {
+ export TI_SECURE_DEV_PKG=${TI_SECURE_DEV_PKG}
+ ( cd ${B}/${BUILD_DIR}/release/; \
+ mv bl31.bin bl31.bin.unsigned; \
+ ${TI_SECURE_DEV_PKG}/scripts/secure-binary-image.sh bl31.bin.unsigned bl31.bin; \
+ )
+}
+
do_compile_append_j7-hs-evm() {
export TI_SECURE_DEV_PKG=${TI_SECURE_DEV_PKG}
( cd ${B}/${BUILD_DIR}/release/; \
diff --git a/recipes-bsp/u-boot/u-boot-ti.inc b/recipes-bsp/u-boot/u-boot-ti.inc
index dc8d6b06..131c03e8 100644
--- a/recipes-bsp/u-boot/u-boot-ti.inc
+++ b/recipes-bsp/u-boot/u-boot-ti.inc
@@ -66,6 +66,7 @@ SPL_UART_BINARY_k3r5 = ""
SPL_UART_BINARY_lego-ev3 = ""
SPL_UART_BINARY_j7200-evm-k3r5 = "u-boot-spl.bin"
SPL_UART_BINARY_am64xx-evm-k3r5 = "u-boot-spl.bin"
+SPL_UART_BINARY_am64xx-hs-evm-k3r5 = "u-boot-spl.bin"
SPL_UART_IMAGE ?= "${SPL_UART_BINARY}-${MACHINE}-${PV}-${PR}"
SPL_UART_SYMLINK ?= "${SPL_UART_BINARY}-${MACHINE}"
@@ -401,4 +402,9 @@ do_deploy_append_am64xx-evm-k3r5 () {
mv ${DEPLOYDIR}/u-boot-spl.bin ${DEPLOYDIR}/u-boot-spl-r5spl.bin || true
}
+do_deploy_append_am64xx-hs-evm-k3r5 () {
+ mv ${DEPLOYDIR}/tiboot3.bin ${DEPLOYDIR}/tiboot3-r5spl.bin || true
+ mv ${DEPLOYDIR}/u-boot-spl.bin ${DEPLOYDIR}/u-boot-spl-r5spl.bin || true
+}
+
TOOLCHAIN = "gcc"
diff --git a/recipes-security/optee/optee-os_%.bbappend b/recipes-security/optee/optee-os_%.bbappend
index c90d85ea..401ac534 100644
--- a/recipes-security/optee/optee-os_%.bbappend
+++ b/recipes-security/optee/optee-os_%.bbappend
@@ -61,6 +61,10 @@ do_compile_append_am65xx-hs-evm() {
optee_sign_k3hs
}
+do_compile_append_am64xx-hs-evm() {
+ optee_sign_k3hs
+}
+
do_compile_append_j7-hs-evm() {
optee_sign_k3hs
}
--
2.17.1
^ permalink raw reply related [flat|nested] 9+ messages in thread
end of thread, other threads:[~2021-11-19 23:25 UTC | newest]
Thread overview: 9+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2021-11-12 23:17 [meta-ti][dunfell][PATCH 0/3] Add AM64x HS platform support Yogesh Siraswar
2021-11-12 23:17 ` [meta-ti][dunfell][PATCH 1/3] conf: machine: add new am64x hs platform Yogesh Siraswar
2021-11-12 23:26 ` Denys Dmytriyenko
2021-11-15 20:53 ` Yogesh Siraswar
2021-11-12 23:17 ` [meta-ti][dunfell][PATCH 2/3] ti-sci-fw: changes to build combined boot image for hs build Yogesh Siraswar
2021-11-19 18:57 ` Denys Dmytriyenko
2021-11-19 21:35 ` Yogesh Siraswar
2021-11-19 23:25 ` Denys Dmytriyenko
2021-11-12 23:18 ` [meta-ti][dunfell][PATCH 3/3] am64xx-hs: changes to support new hs platform Yogesh Siraswar
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.