Hi Dan,
On 1/7/21 7:24 AM, Dan Murphy via lists.yoctoproject.org wrote:
> Add combined boot flow support for the AM64XX device.
>
> From: Dan Murphy <[email protected]>
> Signed-off-by: Dan Murphy <[email protected]>
> ---
> conf/machine/am64xx-evm-k3r5.conf | 4 +++-
> conf/machine/am64xx-evm.conf | 4 ++++
> recipes-bsp/ti-sci-fw/ti-sci-fw_git.bb | 16 ++++++++++++++++
> recipes-bsp/u-boot/u-boot-ti.inc | 6 ++++++
> 4 files changed, 29 insertions(+), 1 deletion(-)
>
> diff --git a/conf/machine/am64xx-evm-k3r5.conf
> b/conf/machine/am64xx-evm-k3r5.conf
> index b788e634699d..dfeaeb570a55 100644
> --- a/conf/machine/am64xx-evm-k3r5.conf
> +++ b/conf/machine/am64xx-evm-k3r5.conf
> @@ -7,6 +7,8 @@ require conf/machine/include/k3r5.inc
> SYSFW_SOC = "am64x"
> SYSFW_CONFIG = "evm"
> SYSFW_SUFFIX = "gp"
> -SYSFW_SYMLINK = "sysfw.itb"
>
> UBOOT_MACHINE = "am64x_evm_r5_defconfig"
> +UBOOT_BINARY = "tiboot3.${UBOOT_SUFFIX}"
> +UBOOT_IMAGE = "tiboot3-${MAINMACHINE}-${PV}-${PR}.${UBOOT_SUFFIX}"
> +UBOOT_SYMLINK = "tiboot3-${MAINMACHINE}.${UBOOT_SUFFIX}"
> diff --git a/conf/machine/am64xx-evm.conf b/conf/machine/am64xx-evm.conf
> index c6ba2a8735f3..9336d4ae4c54 100644
> --- a/conf/machine/am64xx-evm.conf
> +++ b/conf/machine/am64xx-evm.conf
> @@ -4,4 +4,8 @@
>
> require conf/machine/include/am64xx.inc
>
> +IMAGE_BOOT_FILES = "tispl.bin u-boot.img"
> +
> UBOOT_MACHINE = "am64x_evm_a53_defconfig"
> +do_image_wic[mcdepends] = "mc::k3r5:ti-sci-fw:do_deploy"
> +do_image_tar[mcdepends] = "mc::k3r5:ti-sci-fw:do_deploy"
I see J7200 has two additional lines w.r.t trusted-firmware-a:do_deploy, do we
not need those lines for AM64xx or are they in error even on J7200?
> 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 310c7d544030..4d4a9a349c70 100644
> --- a/recipes-bsp/ti-sci-fw/ti-sci-fw_git.bb
> +++ b/recipes-bsp/ti-sci-fw/ti-sci-fw_git.bb
> @@ -2,6 +2,7 @@ require recipes-bsp/ti-sci-fw/ti-sci-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"
>
> CLEANBROKEN = "1"
> PR = "r1"
> @@ -52,6 +53,7 @@ EXTRA_OEMAKE_HS = " \
> 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""
>
> do_compile() {
> cd ${WORKDIR}/imggen/
> @@ -98,4 +100,18 @@ do_deploy_j7200-evm-k3r5() {
> ln -sf ${UBOOT_IMAGE} ${DEPLOYDIR}/${UBOOT_BINARY}
> }
>
> +do_install_am64xx-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-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}
> +}
> +
> addtask deploy before do_build after do_compile
> diff --git a/recipes-bsp/u-boot/u-boot-ti.inc
> b/recipes-bsp/u-boot/u-boot-ti.inc
> index b7fd246aca6c..7ce3d7019431 100644
> --- a/recipes-bsp/u-boot/u-boot-ti.inc
> +++ b/recipes-bsp/u-boot/u-boot-ti.inc
> @@ -41,6 +41,7 @@ PACKAGECONFIG[dm] =
> "DM=${STAGING_DIR_HOST}${nonarch_base_libdir}/firmware/pdk-i
>
> PACKAGECONFIG_append_aarch64 = " atf optee"
> PACKAGECONFIG_append_j7 = " dm"
> +PACKAGECONFIG_append_am64xx = " dm"
This looks wrong, AM64xx doesn't have Split SYSFW architecture, and there is no
DM firmware.
>
> COMPATIBLE_MACHINE = "(ti-soc)"
>
> @@ -65,6 +66,7 @@ SPL_UART_BINARY_keystone = ""
> 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_IMAGE ?= "${SPL_UART_BINARY}-${MACHINE}-${PV}-${PR}"
> SPL_UART_SYMLINK ?= "${SPL_UART_BINARY}-${MACHINE}"
> @@ -395,4 +397,8 @@ do_deploy_append_j7200-evm-k3r5 () {
> mv ${DEPLOYDIR}/u-boot-spl.bin ${DEPLOYDIR}/u-boot-spl-r5spl.bin || true
> }
>
> +do_deploy_append_am64xx-evm-k3r5 () {
> + mv ${DEPLOYDIR}/tiboot3.bin ${DEPLOYDIR}/tiboot3-r5spl.bin || true
> + mv ${DEPLOYDIR}/u-boot-spl.bin ${DEPLOYDIR}/u-boot-spl-r5spl.bin || true
> +}
nit, please add a blank line after this blob.
regards
Suman
> TOOLCHAIN = "gcc"
>
>
>
>
>
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#13407):
https://lists.yoctoproject.org/g/meta-ti/message/13407
Mute This Topic: https://lists.yoctoproject.org/mt/79498363/21656
Group Owner: [email protected]
Unsubscribe: https://lists.yoctoproject.org/g/meta-ti/unsub
[[email protected]]
-=-=-=-=-=-=-=-=-=-=-=-
