On Tue, Apr 11, 2023 at 05:54:20PM -0500, Ryan Eatmon via
lists.yoctoproject.org wrote:
> k3_image_gen added the suffix to the sysfw binary to differentiate
> between GP and HS binaries.
>
> Signed-off-by: Ryan Eatmon <[email protected]>
> ---
> v2: Split the IMAGE_BOOT_FILES for GP and HS. This is not the final
> form. We will be re-working a lot of the platforms to follow the am62
> model of building everything, but for LTS migration progress this is needed.
>
> meta-ti-bsp/conf/machine/include/am65xx.inc | 3 +-
> .../recipes-bsp/ti-sci-fw/ti-sci-fw_git.bb | 32 +++++++++----------
> 2 files changed, 18 insertions(+), 17 deletions(-)
>
> diff --git a/meta-ti-bsp/conf/machine/include/am65xx.inc
> b/meta-ti-bsp/conf/machine/include/am65xx.inc
> index edfc7c11..3f29076f 100644
> --- a/meta-ti-bsp/conf/machine/include/am65xx.inc
> +++ b/meta-ti-bsp/conf/machine/include/am65xx.inc
> @@ -23,7 +23,8 @@ do_image_complete[mcdepends] +=
> "mc::k3r5-sr2:ti-sci-fw:do_deploy"
> IMAGE_BOOT_FILES += "sysfw.itb"
>
> # Since default sysfw.itb on AM65x is for SR2.0, add a version for SR1.0
> -IMAGE_BOOT_FILES += "sysfw-am65x-evm.itb"
> +IMAGE_BOOT_FILES:am65xx-evm += "sysfw-am65x-gp-evm.itb"
> +IMAGE_BOOT_FILES:am65xx-hs-evm += "sysfw-am65x-hs-evm.itb"
This is problematic ^^^
1. Cannot mix override with += so should use only override, e.g.
IMAGE_BOOT_FILES:append:am65xx-evm = " blah"
2. Should there be a default that is not GP or HS EVM? E.g. a customer
board that is part of am65xx SoC family, but none of the EVM boards.
> TFA_BOARD = "generic"
>
> diff --git a/meta-ti-bsp/recipes-bsp/ti-sci-fw/ti-sci-fw_git.bb
> b/meta-ti-bsp/recipes-bsp/ti-sci-fw/ti-sci-fw_git.bb
> index cde768df..ee995fa5 100644
> --- a/meta-ti-bsp/recipes-bsp/ti-sci-fw/ti-sci-fw_git.bb
> +++ b/meta-ti-bsp/recipes-bsp/ti-sci-fw/ti-sci-fw_git.bb
> @@ -55,26 +55,26 @@ SYSFW_TISCI =
> "${S}/ti-sysfw/ti-${SYSFW_PREFIX}-firmware-${SYSFW_SOC}-*.bin"
> SYSFW_TIBOOT3 = "tiboot3-${SYSFW_SOC}-${SYSFW_SUFFIX}-${SYSFW_CONFIG}.bin"
> SYSFW_TIBOOT3_SYMLINK ?= "tiboot3.bin"
>
> -SYSFW_BINARY = "sysfw-${SYSFW_SOC}-${SYSFW_CONFIG}.itb"
> +SYSFW_BINARY = "sysfw-${SYSFW_SOC}-${SYSFW_SUFFIX}-${SYSFW_CONFIG}.itb"
> SYSFW_VBINARY =
> "sysfw-${PV}-${SYSFW_SOC}-${SYSFW_SUFFIX}-${SYSFW_CONFIG}.itb"
> SYSFW_IMAGE = "sysfw-${SYSFW_SOC}-${SYSFW_SUFFIX}-${SYSFW_CONFIG}.itb"
> SYSFW_SYMLINK ?= "sysfw.itb"
>
> -SYSFW_VBINARY:am65xx-evm-k3r5 =
> "sysfw-${PV}-${SYSFW_SOC}-${SYSFW_CONFIG}.itb"
> -SYSFW_VBINARY:am65xx-evm-k3r5-sr2 =
> "sysfw-${PV}-${SYSFW_SOC}-${SYSFW_CONFIG}.itb"
> -SYSFW_VBINARY:am65xx-hs-evm-k3r5 =
> "sysfw-${PV}-${SYSFW_SOC}-${SYSFW_CONFIG}.itb"
> -SYSFW_VBINARY:am65xx-hs-evm-k3r5-sr2 =
> "sysfw-${PV}-${SYSFW_SOC}-${SYSFW_CONFIG}.itb"
> -SYSFW_VBINARY:j721e-evm-k3r5 = "sysfw-${PV}-${SYSFW_SOC}-${SYSFW_CONFIG}.itb"
> -SYSFW_VBINARY:j721e-hs-evm-k3r5 =
> "sysfw-${PV}-${SYSFW_SOC}-${SYSFW_CONFIG}.itb"
> -SYSFW_VBINARY:j721e-hs-evm-k3r5-sr1-1 =
> "sysfw-${PV}-${SYSFW_SOC}-${SYSFW_CONFIG}.itb"
> -
> -SYSFW_IMAGE:am65xx-evm-k3r5 = "sysfw-${SYSFW_SOC}-${SYSFW_CONFIG}.itb"
> -SYSFW_IMAGE:am65xx-evm-k3r5-sr2 = "sysfw-${SYSFW_SOC}-${SYSFW_CONFIG}.itb"
> -SYSFW_IMAGE:am65xx-hs-evm-k3r5 = "sysfw-${SYSFW_SOC}-${SYSFW_CONFIG}.itb"
> -SYSFW_IMAGE:am65xx-hs-evm-k3r5-sr2 = "sysfw-${SYSFW_SOC}-${SYSFW_CONFIG}.itb"
> -SYSFW_IMAGE:j721e-evm-k3r5 = "sysfw-${SYSFW_SOC}-${SYSFW_CONFIG}.itb"
> -SYSFW_IMAGE:j721e-hs-evm-k3r5 = "sysfw-${SYSFW_SOC}-${SYSFW_CONFIG}.itb"
> -SYSFW_IMAGE:j721e-hs-evm-k3r5-sr1-1 =
> "sysfw-${SYSFW_SOC}-${SYSFW_CONFIG}.itb"
> +SYSFW_VBINARY:am65xx-evm-k3r5 =
> "sysfw-${PV}-${SYSFW_SOC}-${SYSFW_SUFFIX}-${SYSFW_CONFIG}.itb"
> +SYSFW_VBINARY:am65xx-evm-k3r5-sr2 =
> "sysfw-${PV}-${SYSFW_SOC}-${SYSFW_SUFFIX}-${SYSFW_CONFIG}.itb"
> +SYSFW_VBINARY:am65xx-hs-evm-k3r5 =
> "sysfw-${PV}-${SYSFW_SOC}-${SYSFW_SUFFIX}-${SYSFW_CONFIG}.itb"
> +SYSFW_VBINARY:am65xx-hs-evm-k3r5-sr2 =
> "sysfw-${PV}-${SYSFW_SOC}-${SYSFW_SUFFIX}-${SYSFW_CONFIG}.itb"
> +SYSFW_VBINARY:j721e-evm-k3r5 =
> "sysfw-${PV}-${SYSFW_SOC}-${SYSFW_SUFFIX}-${SYSFW_CONFIG}.itb"
> +SYSFW_VBINARY:j721e-hs-evm-k3r5 =
> "sysfw-${PV}-${SYSFW_SOC}-${SYSFW_SUFFIX}-${SYSFW_CONFIG}.itb"
> +SYSFW_VBINARY:j721e-hs-evm-k3r5-sr1-1 =
> "sysfw-${PV}-${SYSFW_SOC}-${SYSFW_SUFFIX}-${SYSFW_CONFIG}.itb"
> +
> +SYSFW_IMAGE:am65xx-evm-k3r5 =
> "sysfw-${SYSFW_SOC}-${SYSFW_SUFFIX}-${SYSFW_CONFIG}.itb"
> +SYSFW_IMAGE:am65xx-evm-k3r5-sr2 =
> "sysfw-${SYSFW_SOC}-${SYSFW_SUFFIX}-${SYSFW_CONFIG}.itb"
> +SYSFW_IMAGE:am65xx-hs-evm-k3r5 =
> "sysfw-${SYSFW_SOC}-${SYSFW_SUFFIX}-${SYSFW_CONFIG}.itb"
> +SYSFW_IMAGE:am65xx-hs-evm-k3r5-sr2 =
> "sysfw-${SYSFW_SOC}-${SYSFW_SUFFIX}-${SYSFW_CONFIG}.itb"
> +SYSFW_IMAGE:j721e-evm-k3r5 =
> "sysfw-${SYSFW_SOC}-${SYSFW_SUFFIX}-${SYSFW_CONFIG}.itb"
> +SYSFW_IMAGE:j721e-hs-evm-k3r5 =
> "sysfw-${SYSFW_SOC}-${SYSFW_SUFFIX}-${SYSFW_CONFIG}.itb"
> +SYSFW_IMAGE:j721e-hs-evm-k3r5-sr1-1 =
> "sysfw-${SYSFW_SOC}-${SYSFW_SUFFIX}-${SYSFW_CONFIG}.itb"
>
> CFLAGS[unexport] = "1"
> LDFLAGS[unexport] = "1"
> --
> 2.17.1
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#16374):
https://lists.yoctoproject.org/g/meta-ti/message/16374
Mute This Topic: https://lists.yoctoproject.org/mt/98208802/21656
Group Owner: [email protected]
Unsubscribe:
https://lists.yoctoproject.org/g/meta-ti/leave/6695321/21656/1393940836/xyzzy
[[email protected]]
-=-=-=-=-=-=-=-=-=-=-=-
