[meta-ti][dunfell][PATCH 1/2] conf: machine: am64xx-evm: Switch to SR2.0 HS-FS build by default

[meta-ti][dunfell][PATCH 1/2] conf: machine: am64xx-evm: Switch to SR2.0 HS-FS build by default

[Andrew Davis]

AM64x devices will only be available as SR2.0 HS-FS. Set this as the
default type provided by the SDK. To allow SR2.0 HS-SE to continue to
boot, like we did with GP, we add an extra machine to build SR2.0 HS-SE
SYSFW. To use on SR2.0 HS-SE boards simply switch out the SYSFW image:

$ cd /mnt/sd-card/boot
$ mv tiboot3-am64x_sr2-hs-evm.bin tiboot3.bin

Signed-off-by: Andrew Davis <afd@ti.com>
---
 conf/machine/am64xx-evm-k3r5-hs-se.conf       | 14 -------------
 conf/machine/am64xx-evm-k3r5-sr2-hs-fs.conf   | 14 +++++++++++++
 conf/machine/am64xx-evm-k3r5-sr2-hs-se.conf   | 20 +++++++++++++++++++
 conf/machine/am64xx-evm.conf                  |  8 +++++++-
 conf/machine/include/am64xx.inc               |  6 +++---
 conf/multiconfig/k3r5-sr2-hs-fs.conf          |  3 +++
 .../{k3r5-hs-se.conf => k3r5-sr2-hs-se.conf}  |  2 +-
 7 files changed, 48 insertions(+), 19 deletions(-)
 delete mode 100644 conf/machine/am64xx-evm-k3r5-hs-se.conf
 create mode 100644 conf/machine/am64xx-evm-k3r5-sr2-hs-fs.conf
 create mode 100644 conf/machine/am64xx-evm-k3r5-sr2-hs-se.conf
 create mode 100644 conf/multiconfig/k3r5-sr2-hs-fs.conf
 rename conf/multiconfig/{k3r5-hs-se.conf => k3r5-sr2-hs-se.conf} (55%)

diff --git a/conf/machine/am64xx-evm-k3r5-hs-se.conf b/conf/machine/am64xx-evm-k3r5-hs-se.conf
deleted file mode 100644
index 7cab7d15..00000000
--- a/conf/machine/am64xx-evm-k3r5-hs-se.conf
+++ /dev/null
@@ -1,14 +0,0 @@
-#@TYPE: Machine
-#@NAME: AM64xx HS-SE EVM (R5F)
-#@DESCRIPTION: Machine configuration for the TI AM64xx HS-SE EVM (R5F core)
-
-# Booting HS-SE requires different SYSFW, the rest is handled at runtime
-
-require conf/machine/include/k3r5.inc
-SOC_FAMILY_append = ":k3r5-hs-se"
-
-SYSFW_SOC = "am64x"
-SYSFW_CONFIG = "evm"
-SYSFW_SUFFIX = "hs"
-
-UBOOT_MACHINE = "am64x_evm_r5_defconfig"
diff --git a/conf/machine/am64xx-evm-k3r5-sr2-hs-fs.conf b/conf/machine/am64xx-evm-k3r5-sr2-hs-fs.conf
new file mode 100644
index 00000000..1139fe4a
--- /dev/null
+++ b/conf/machine/am64xx-evm-k3r5-sr2-hs-fs.conf
@@ -0,0 +1,14 @@
+#@TYPE: Machine
+#@NAME: AM64xx SR2.0 HS-FS EVM (R5F)
+#@DESCRIPTION: Machine configuration for the TI AM64xx SR2.0 HS-FS EVM (R5F core)
+
+# Booting SR2.0 HS-FS requires different SYSFW, the rest is handled at runtime
+
+require conf/machine/include/k3r5.inc
+SOC_FAMILY_append = ":k3r5-sr2-hs-fs"
+
+SYSFW_SOC = "am64x_sr2"
+SYSFW_CONFIG = "evm"
+SYSFW_SUFFIX = "hs-fs"
+
+UBOOT_MACHINE = "am64x_evm_r5_defconfig"
diff --git a/conf/machine/am64xx-evm-k3r5-sr2-hs-se.conf b/conf/machine/am64xx-evm-k3r5-sr2-hs-se.conf
new file mode 100644
index 00000000..f2aeca6d
--- /dev/null
+++ b/conf/machine/am64xx-evm-k3r5-sr2-hs-se.conf
@@ -0,0 +1,20 @@
+#@TYPE: Machine
+#@NAME: AM64xx SR2.0 HS-SE EVM (R5F)
+#@DESCRIPTION: Machine configuration for the TI AM64xx SR2.0 HS-SE EVM (R5F core)
+
+# Booting SR2.0 HS-SE requires different SYSFW, the rest is handled at runtime
+
+require conf/machine/include/k3r5.inc
+SOC_FAMILY_append = ":k3r5-sr2-hs-se"
+
+SYSFW_SOC = "am64x_sr2"
+SYSFW_CONFIG = "evm"
+SYSFW_SUFFIX = "hs"
+SYSFW_TIBOOT3_SYMLINK = ""
+
+UBOOT_MACHINE = "am64x_evm_r5_defconfig"
+
+SPL_BINARY = ""
+UBOOT_BINARY = "u-boot-spl.${UBOOT_SUFFIX}"
+UBOOT_IMAGE = "u-boot-r5spl-sr2-hs-se-${MAINMACHINE}-${PV}-${PR}.${UBOOT_SUFFIX}"
+UBOOT_SYMLINK = "u-boot-r5spl-sr2-hs-se.${UBOOT_SUFFIX}"
diff --git a/conf/machine/am64xx-evm.conf b/conf/machine/am64xx-evm.conf
index f150f532..d9afb08e 100644
--- a/conf/machine/am64xx-evm.conf
+++ b/conf/machine/am64xx-evm.conf
@@ -6,8 +6,14 @@ require conf/machine/include/am64xx.inc
 
 UBOOT_MACHINE = "am64x_evm_a53_defconfig"
 
-# Since default tiboot3.bin on AM64x is for HS-SE, add a version for GP
+# 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"
diff --git a/conf/machine/include/am64xx.inc b/conf/machine/include/am64xx.inc
index becc79d4..0b9a3e59 100644
--- a/conf/machine/include/am64xx.inc
+++ b/conf/machine/include/am64xx.inc
@@ -14,9 +14,9 @@ KERNEL_DEVICETREE = " \
     ti/k3-am642-evm-nand.dtbo \
 "
 
-BBMULTICONFIG = "k3r5-hs-se"
-do_image_wic[mcdepends] = "mc::k3r5-hs-se:ti-sci-fw:do_deploy"
-do_image_tar[mcdepends] = "mc::k3r5-hs-se:ti-sci-fw:do_deploy"
+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"
 
 TFA_BOARD = "lite"
 OPTEEMACHINE = "k3-am64x"
diff --git a/conf/multiconfig/k3r5-sr2-hs-fs.conf b/conf/multiconfig/k3r5-sr2-hs-fs.conf
new file mode 100644
index 00000000..8e6b5c68
--- /dev/null
+++ b/conf/multiconfig/k3r5-sr2-hs-fs.conf
@@ -0,0 +1,3 @@
+require k3r5-sr2.conf
+
+MACHINE_append = "-hs-fs"
diff --git a/conf/multiconfig/k3r5-hs-se.conf b/conf/multiconfig/k3r5-sr2-hs-se.conf
similarity index 55%
rename from conf/multiconfig/k3r5-hs-se.conf
rename to conf/multiconfig/k3r5-sr2-hs-se.conf
index 701f8e88..69e6d0c8 100644
--- a/conf/multiconfig/k3r5-hs-se.conf
+++ b/conf/multiconfig/k3r5-sr2-hs-se.conf
@@ -1,3 +1,3 @@
-require k3r5.conf
+require k3r5-sr2.conf
 
 MACHINE_append = "-hs-se"
-- 
2.36.1

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

[Andrew Davis]

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.

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"
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

Re: [meta-ti][dunfell][PATCH 1/2] conf: machine: am64xx-evm: Switch to SR2.0 HS-FS build by default

[Andrew Davis]

On 9/6/22 6:11 PM, Andrew Davis wrote:
> AM64x devices will only be available as SR2.0 HS-FS. Set this as the
> default type provided by the SDK. To allow SR2.0 HS-SE to continue to
> boot, like we did with GP, we add an extra machine to build SR2.0 HS-SE
> SYSFW. To use on SR2.0 HS-SE boards simply switch out the SYSFW image:
> 
> $ cd /mnt/sd-card/boot
> $ mv tiboot3-am64x_sr2-hs-evm.bin tiboot3.bin
> 
> Signed-off-by: Andrew Davis <afd@ti.com>
> ---


This has a dependency on updated ti-linux-fw, when the HS-FS SYSFW is
applied and the auto-merger grabs the latest tonight, then this can go in.

This completes the AM64x HS-FS work on meta-ti, after this the SDK will
produce images that boot on AM64x HS-FS boards without any modifications.

Andrew


>   conf/machine/am64xx-evm-k3r5-hs-se.conf       | 14 -------------
>   conf/machine/am64xx-evm-k3r5-sr2-hs-fs.conf   | 14 +++++++++++++
>   conf/machine/am64xx-evm-k3r5-sr2-hs-se.conf   | 20 +++++++++++++++++++
>   conf/machine/am64xx-evm.conf                  |  8 +++++++-
>   conf/machine/include/am64xx.inc               |  6 +++---
>   conf/multiconfig/k3r5-sr2-hs-fs.conf          |  3 +++
>   .../{k3r5-hs-se.conf => k3r5-sr2-hs-se.conf}  |  2 +-
>   7 files changed, 48 insertions(+), 19 deletions(-)
>   delete mode 100644 conf/machine/am64xx-evm-k3r5-hs-se.conf
>   create mode 100644 conf/machine/am64xx-evm-k3r5-sr2-hs-fs.conf
>   create mode 100644 conf/machine/am64xx-evm-k3r5-sr2-hs-se.conf
>   create mode 100644 conf/multiconfig/k3r5-sr2-hs-fs.conf
>   rename conf/multiconfig/{k3r5-hs-se.conf => k3r5-sr2-hs-se.conf} (55%)
> 
> diff --git a/conf/machine/am64xx-evm-k3r5-hs-se.conf b/conf/machine/am64xx-evm-k3r5-hs-se.conf
> deleted file mode 100644
> index 7cab7d15..00000000
> --- a/conf/machine/am64xx-evm-k3r5-hs-se.conf
> +++ /dev/null
> @@ -1,14 +0,0 @@
> -#@TYPE: Machine
> -#@NAME: AM64xx HS-SE EVM (R5F)
> -#@DESCRIPTION: Machine configuration for the TI AM64xx HS-SE EVM (R5F core)
> -
> -# Booting HS-SE requires different SYSFW, the rest is handled at runtime
> -
> -require conf/machine/include/k3r5.inc
> -SOC_FAMILY_append = ":k3r5-hs-se"
> -
> -SYSFW_SOC = "am64x"
> -SYSFW_CONFIG = "evm"
> -SYSFW_SUFFIX = "hs"
> -
> -UBOOT_MACHINE = "am64x_evm_r5_defconfig"
> diff --git a/conf/machine/am64xx-evm-k3r5-sr2-hs-fs.conf b/conf/machine/am64xx-evm-k3r5-sr2-hs-fs.conf
> new file mode 100644
> index 00000000..1139fe4a
> --- /dev/null
> +++ b/conf/machine/am64xx-evm-k3r5-sr2-hs-fs.conf
> @@ -0,0 +1,14 @@
> +#@TYPE: Machine
> +#@NAME: AM64xx SR2.0 HS-FS EVM (R5F)
> +#@DESCRIPTION: Machine configuration for the TI AM64xx SR2.0 HS-FS EVM (R5F core)
> +
> +# Booting SR2.0 HS-FS requires different SYSFW, the rest is handled at runtime
> +
> +require conf/machine/include/k3r5.inc
> +SOC_FAMILY_append = ":k3r5-sr2-hs-fs"
> +
> +SYSFW_SOC = "am64x_sr2"
> +SYSFW_CONFIG = "evm"
> +SYSFW_SUFFIX = "hs-fs"
> +
> +UBOOT_MACHINE = "am64x_evm_r5_defconfig"
> diff --git a/conf/machine/am64xx-evm-k3r5-sr2-hs-se.conf b/conf/machine/am64xx-evm-k3r5-sr2-hs-se.conf
> new file mode 100644
> index 00000000..f2aeca6d
> --- /dev/null
> +++ b/conf/machine/am64xx-evm-k3r5-sr2-hs-se.conf
> @@ -0,0 +1,20 @@
> +#@TYPE: Machine
> +#@NAME: AM64xx SR2.0 HS-SE EVM (R5F)
> +#@DESCRIPTION: Machine configuration for the TI AM64xx SR2.0 HS-SE EVM (R5F core)
> +
> +# Booting SR2.0 HS-SE requires different SYSFW, the rest is handled at runtime
> +
> +require conf/machine/include/k3r5.inc
> +SOC_FAMILY_append = ":k3r5-sr2-hs-se"
> +
> +SYSFW_SOC = "am64x_sr2"
> +SYSFW_CONFIG = "evm"
> +SYSFW_SUFFIX = "hs"
> +SYSFW_TIBOOT3_SYMLINK = ""
> +
> +UBOOT_MACHINE = "am64x_evm_r5_defconfig"
> +
> +SPL_BINARY = ""
> +UBOOT_BINARY = "u-boot-spl.${UBOOT_SUFFIX}"
> +UBOOT_IMAGE = "u-boot-r5spl-sr2-hs-se-${MAINMACHINE}-${PV}-${PR}.${UBOOT_SUFFIX}"
> +UBOOT_SYMLINK = "u-boot-r5spl-sr2-hs-se.${UBOOT_SUFFIX}"
> diff --git a/conf/machine/am64xx-evm.conf b/conf/machine/am64xx-evm.conf
> index f150f532..d9afb08e 100644
> --- a/conf/machine/am64xx-evm.conf
> +++ b/conf/machine/am64xx-evm.conf
> @@ -6,8 +6,14 @@ require conf/machine/include/am64xx.inc
>   
>   UBOOT_MACHINE = "am64x_evm_a53_defconfig"
>   
> -# Since default tiboot3.bin on AM64x is for HS-SE, add a version for GP
> +# 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"
> diff --git a/conf/machine/include/am64xx.inc b/conf/machine/include/am64xx.inc
> index becc79d4..0b9a3e59 100644
> --- a/conf/machine/include/am64xx.inc
> +++ b/conf/machine/include/am64xx.inc
> @@ -14,9 +14,9 @@ KERNEL_DEVICETREE = " \
>       ti/k3-am642-evm-nand.dtbo \
>   "
>   
> -BBMULTICONFIG = "k3r5-hs-se"
> -do_image_wic[mcdepends] = "mc::k3r5-hs-se:ti-sci-fw:do_deploy"
> -do_image_tar[mcdepends] = "mc::k3r5-hs-se:ti-sci-fw:do_deploy"
> +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"
>   
>   TFA_BOARD = "lite"
>   OPTEEMACHINE = "k3-am64x"
> diff --git a/conf/multiconfig/k3r5-sr2-hs-fs.conf b/conf/multiconfig/k3r5-sr2-hs-fs.conf
> new file mode 100644
> index 00000000..8e6b5c68
> --- /dev/null
> +++ b/conf/multiconfig/k3r5-sr2-hs-fs.conf
> @@ -0,0 +1,3 @@
> +require k3r5-sr2.conf
> +
> +MACHINE_append = "-hs-fs"
> diff --git a/conf/multiconfig/k3r5-hs-se.conf b/conf/multiconfig/k3r5-sr2-hs-se.conf
> similarity index 55%
> rename from conf/multiconfig/k3r5-hs-se.conf
> rename to conf/multiconfig/k3r5-sr2-hs-se.conf
> index 701f8e88..69e6d0c8 100644
> --- a/conf/multiconfig/k3r5-hs-se.conf
> +++ b/conf/multiconfig/k3r5-sr2-hs-se.conf
> @@ -1,3 +1,3 @@
> -require k3r5.conf
> +require k3r5-sr2.conf
>   
>   MACHINE_append = "-hs-se"

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

[Denys Dmytriyenko]

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

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

[Andrew Davis]

On 9/6/22 7:10 PM, Denys Dmytriyenko wrote:
> 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.
> 

Ah, good to know. Okay, so if that has resolved I can go move the others
over too.

I'd like to get to the point where we can add machines with
much less effort than needed today. Users adding their own board I'm
guessing just modify the existing TI EVM machines due to that, instead
of adding their own machine definition, which would be more correct.

> 
>> 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?
> 

Hmm, that is odd, I'm guessing git considered this a full file re-write..
I'll go mess with my format-patch settings and send again.

Thanks,
Andrew

> 
>> 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