From: Andrew Davis <a...@ti.com> 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 <a...@ti.com> Signed-off-by: Ryan Eatmon <reat...@ti.com> Signed-off-by: Denys Dmytriyenko <de...@konsulko.com> --- .../conf/machine/am64xx-evm-k3r5-hs-se.conf | 14 ------------- .../machine/am64xx-evm-k3r5-sr2-hs-fs.conf | 14 +++++++++++++ .../machine/am64xx-evm-k3r5-sr2-hs-se.conf | 20 +++++++++++++++++++ meta-ti-bsp/conf/machine/am64xx-evm.conf | 8 +++++++- meta-ti-bsp/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 meta-ti-bsp/conf/machine/am64xx-evm-k3r5-hs-se.conf create mode 100644 meta-ti-bsp/conf/machine/am64xx-evm-k3r5-sr2-hs-fs.conf create mode 100644 meta-ti-bsp/conf/machine/am64xx-evm-k3r5-sr2-hs-se.conf create mode 100644 meta-ti-bsp/conf/multiconfig/k3r5-sr2-hs-fs.conf rename meta-ti-bsp/conf/multiconfig/{k3r5-hs-se.conf => k3r5-sr2-hs-se.conf} (55%) diff --git a/meta-ti-bsp/conf/machine/am64xx-evm-k3r5-hs-se.conf b/meta-ti-bsp/conf/machine/am64xx-evm-k3r5-hs-se.conf deleted file mode 100644 index 7e737b12..00000000 --- a/meta-ti-bsp/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/meta-ti-bsp/conf/machine/am64xx-evm-k3r5-sr2-hs-fs.conf b/meta-ti-bsp/conf/machine/am64xx-evm-k3r5-sr2-hs-fs.conf new file mode 100644 index 00000000..42ddbb4c --- /dev/null +++ b/meta-ti-bsp/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/meta-ti-bsp/conf/machine/am64xx-evm-k3r5-sr2-hs-se.conf b/meta-ti-bsp/conf/machine/am64xx-evm-k3r5-sr2-hs-se.conf new file mode 100644 index 00000000..a1c2b3e6 --- /dev/null +++ b/meta-ti-bsp/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/meta-ti-bsp/conf/machine/am64xx-evm.conf b/meta-ti-bsp/conf/machine/am64xx-evm.conf index 6e1c87ec..67f1be5b 100644 --- a/meta-ti-bsp/conf/machine/am64xx-evm.conf +++ b/meta-ti-bsp/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/meta-ti-bsp/conf/machine/include/am64xx.inc b/meta-ti-bsp/conf/machine/include/am64xx.inc index 00ee31b8..4d26732c 100644 --- a/meta-ti-bsp/conf/machine/include/am64xx.inc +++ b/meta-ti-bsp/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/meta-ti-bsp/conf/multiconfig/k3r5-sr2-hs-fs.conf b/meta-ti-bsp/conf/multiconfig/k3r5-sr2-hs-fs.conf new file mode 100644 index 00000000..98972326 --- /dev/null +++ b/meta-ti-bsp/conf/multiconfig/k3r5-sr2-hs-fs.conf @@ -0,0 +1,3 @@ +require k3r5-sr2.conf + +MACHINE:append = "-hs-fs" diff --git a/meta-ti-bsp/conf/multiconfig/k3r5-hs-se.conf b/meta-ti-bsp/conf/multiconfig/k3r5-sr2-hs-se.conf similarity index 55% rename from meta-ti-bsp/conf/multiconfig/k3r5-hs-se.conf rename to meta-ti-bsp/conf/multiconfig/k3r5-sr2-hs-se.conf index 7e3d7dae..8b98fc0a 100644 --- a/meta-ti-bsp/conf/multiconfig/k3r5-hs-se.conf +++ b/meta-ti-bsp/conf/multiconfig/k3r5-sr2-hs-se.conf @@ -1,3 +1,3 @@ -require k3r5.conf +require k3r5-sr2.conf MACHINE:append = "-hs-se" -- 2.25.1
-=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#15288): https://lists.yoctoproject.org/g/meta-ti/message/15288 Mute This Topic: https://lists.yoctoproject.org/mt/94817238/21656 Group Owner: meta-ti+ow...@lists.yoctoproject.org Unsubscribe: https://lists.yoctoproject.org/g/meta-ti/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-