Re: [meta-ti][dunfell][PATCH 2/2] conf: machine: am64xx: Move multi-config targets into base SoC include

[Denys Dmytriyenko <denis@denix.org>]

On Tue, Sep 06, 2022 at 06:11:19PM -0500, Andrew Davis via lists.yoctoproject.org wrote:
> The supported device types depends on the SoC, not on any specific
> board or EVM. Any board can be populated with any of the 3 supported
> AM64x types. Move these into the AM64x common include.

The reason multiconfigs were originally added in the machine config, instead 
of a base SoC include, is because SR2.0 was initially only available for GP 
and not HS variant of AM65x.


> Signed-off-by: Andrew Davis <afd@ti.com>
> ---
>  conf/machine/am64xx-evm.conf    | 26 +++++++-------------------
>  conf/machine/include/am64xx.inc | 13 +++++++++++++
>  2 files changed, 20 insertions(+), 19 deletions(-)
>  rewrite conf/machine/am64xx-evm.conf (76%)
> 
> diff --git a/conf/machine/am64xx-evm.conf b/conf/machine/am64xx-evm.conf
> dissimilarity index 76%
> index d9afb08e..c6ba2a87 100644
> --- a/conf/machine/am64xx-evm.conf
> +++ b/conf/machine/am64xx-evm.conf
> @@ -1,19 +1,7 @@
> -#@TYPE: Machine
> -#@NAME: AM64xx EVM
> -#@DESCRIPTION: Machine configuration for the TI AM64xx EVM
> -
> -require conf/machine/include/am64xx.inc
> -
> -UBOOT_MACHINE = "am64x_evm_a53_defconfig"
> -
> -# Since default tiboot3.bin on AM64x is for SR2.0 HS-FS, add a version for GP
> -BBMULTICONFIG += "k3r5-gp"
> -IMAGE_BOOT_FILES += " tiboot3-am64x-gp-evm.bin"
> -do_image_wic[mcdepends] += "mc::k3r5-gp:ti-sci-fw:do_deploy"
> -do_image_tar[mcdepends] += "mc::k3r5-gp:ti-sci-fw:do_deploy"
> -
> -# Since default tiboot3.bin on AM64x is for SR2.0 HS-FS, add a version for SR2.0 HS-SE
> -BBMULTICONFIG += "k3r5-sr2-hs-se"
> -IMAGE_BOOT_FILES += " tiboot3-am64x_sr2-hs-evm.bin"
> -do_image_wic[mcdepends] += "mc::k3r5-sr2-hs-se:ti-sci-fw:do_deploy"
> -do_image_tar[mcdepends] += "mc::k3r5-sr2-hs-se:ti-sci-fw:do_deploy"
> +#@TYPE: Machine
> +#@NAME: AM64xx EVM
> +#@DESCRIPTION: Machine configuration for the TI AM64xx EVM
> +
> +require conf/machine/include/am64xx.inc
> +
> +UBOOT_MACHINE = "am64x_evm_a53_defconfig"

This diff is very weird - the first 7 lines aren't changing, yet they are 
removed and then added back. Can you please check what went wrong and 
resubmit?


> diff --git a/conf/machine/include/am64xx.inc b/conf/machine/include/am64xx.inc
> index 0b9a3e59..913d95e6 100644
> --- a/conf/machine/include/am64xx.inc
> +++ b/conf/machine/include/am64xx.inc
> @@ -14,10 +14,23 @@ KERNEL_DEVICETREE = " \
>      ti/k3-am642-evm-nand.dtbo \
>  "
>  
> +# Default tiboot3.bin on AM64x is for SR2.0 HS-FS
>  BBMULTICONFIG = "k3r5-sr2-hs-fs"
>  do_image_wic[mcdepends] = "mc::k3r5-sr2-hs-fs:ti-sci-fw:do_deploy"
>  do_image_tar[mcdepends] = "mc::k3r5-sr2-hs-fs:ti-sci-fw:do_deploy"
>  
> +# Since default tiboot3.bin on AM64x is for SR2.0 HS-FS, add a version for GP
> +BBMULTICONFIG += "k3r5-gp"
> +IMAGE_BOOT_FILES += " tiboot3-am64x-gp-evm.bin"
> +do_image_wic[mcdepends] += "mc::k3r5-gp:ti-sci-fw:do_deploy"
> +do_image_tar[mcdepends] += "mc::k3r5-gp:ti-sci-fw:do_deploy"
> +
> +# Since default tiboot3.bin on AM64x is for SR2.0 HS-FS, add a version for SR2.0 HS-SE
> +BBMULTICONFIG += "k3r5-sr2-hs-se"
> +IMAGE_BOOT_FILES += " tiboot3-am64x_sr2-hs-evm.bin"
> +do_image_wic[mcdepends] += "mc::k3r5-sr2-hs-se:ti-sci-fw:do_deploy"
> +do_image_tar[mcdepends] += "mc::k3r5-sr2-hs-se:ti-sci-fw:do_deploy"
> +
>  TFA_BOARD = "lite"
>  OPTEEMACHINE = "k3-am64x"
>  OPTEEOUTPUTMACHINE = "k3"
> -- 
> 2.36.1