deleted file mode 100644
@@ -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"
new file mode 100644
@@ -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"
new file mode 100644
@@ -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}"
@@ -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"
@@ -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"
new file mode 100644
@@ -0,0 +1,3 @@
+require k3r5-sr2.conf
+
+MACHINE:append = "-hs-fs"
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
@@ -1,3 +1,3 @@
-require k3r5.conf
+require k3r5-sr2.conf
MACHINE:append = "-hs-se"