verdin-am62: add hs-fs soc type binaries

Add HS-FS SoC type binaries (different SYSFW), GP SoC type is still
the default one and the one used in the generated tezi image,
HS-FS binaries are just deployed and not used yet.

tiboot3.bin renamed to tiboot3-gp.bin to make it clear that this is the
binary for the GP variant.

Related-to: ELB-5226
Signed-off-by: Emanuele Ghidoli <emanuele.ghidoli@toradex.com>

4 files changed, 34 insertions, 8 deletions

diff --git a/conf/machine/verdin-am62-k3r5-gp.conf b/conf/machine/verdin-am62-k3r5-gp.conf
index 29e3461..79bcdeb 100644
--- a/conf/machine/verdin-am62-k3r5-gp.conf
+++ b/conf/machine/verdin-am62-k3r5-gp.conf
@@ -15,6 +15,9 @@ SYSFW_CONFIG = "evm"
 SYSFW_SUFFIX = "gp"
 SYSFW_PREFIX:k3r5 = "fs"
 
-UBOOT_CONFIG ??= "dfu sd"
-UBOOT_CONFIG[dfu] = "verdin-am62_r5_usbdfu_defconfig,dfu,spl/u-boot-spl.bin"
-UBOOT_CONFIG[sd] = "verdin-am62_r5_defconfig,sdcard,spl/u-boot-spl.bin"
+SYSFW_TIBOOT3_SYMLINK = "tiboot3-gp.bin"
+
+UBOOT_DFU_CONFIG = "dfu-gp"
+UBOOT_CONFIG ??= "dfu-gp sd-gp"
+UBOOT_CONFIG[dfu-gp] = "verdin-am62_r5_usbdfu_defconfig,dfu,spl/u-boot-spl.bin"
+UBOOT_CONFIG[sd-gp] = "verdin-am62_r5_defconfig,sdcard,spl/u-boot-spl.bin"
diff --git a/conf/machine/verdin-am62-k3r5-hs-fs.conf b/conf/machine/verdin-am62-k3r5-hs-fs.conf
new file mode 100644
index 0000000..8f8c8e4
--- /dev/null
+++ b/conf/machine/verdin-am62-k3r5-hs-fs.conf
@@ -0,0 +1,24 @@
+#@TYPE: Machine
+#@NAME: Toradex Verdin AM62 (R5F)
+#@DESCRIPTION: Machine configuration for Toradex Verdin AM62 SoM (R5F core)
+#@MAINTAINER: Max Krummenacher <max.krummenacher@toradex.com>
+
+MACHINE_NAME = "Verdin-AM62"
+
+require conf/machine/include/k3r5.inc
+SOC_FAMILY:append = ":k3r5-hs-fs"
+
+PREFERRED_PROVIDER_virtual/bootloader = "u-boot-toradex-ti-staging"
+PREFERRED_PROVIDER_u-boot = "u-boot-toradex-ti-staging"
+
+SYSFW_SOC = "am62x"
+SYSFW_CONFIG = "evm"
+SYSFW_SUFFIX = "hs-fs"
+SYSFW_PREFIX:k3r5 = "fs"
+
+SYSFW_TIBOOT3_SYMLINK = ""
+
+UBOOT_DFU_CONFIG = "dfu-hs-fs"
+UBOOT_CONFIG ??= "dfu-hs-fs sd-hs-fs"
+UBOOT_CONFIG[dfu-hs-fs] = "verdin-am62_r5_usbdfu_defconfig,dfu,spl/u-boot-spl.bin"
+UBOOT_CONFIG[sd-hs-fs] = "verdin-am62_r5_defconfig,sdcard,spl/u-boot-spl.bin"
diff --git a/conf/machine/verdin-am62.conf b/conf/machine/verdin-am62.conf
index 4fccd14..8885315 100644
--- a/conf/machine/verdin-am62.conf
+++ b/conf/machine/verdin-am62.conf
@@ -11,9 +11,8 @@ require conf/machine/include/am62xx.inc
 
 # override what am62xx.inc sets for a hs-fs/hs-se variant so that only
 # the gp variant is built and deployed and is the default.
-BBMULTICONFIG:remove = "k3r5-hs-fs"
 BBMULTICONFIG:remove = "k3r5-hs-se"
-do_image_complete[mcdepends] = "mc::k3r5-gp:ti-sci-fw:do_deploy"
+do_image_complete[mcdepends] = "mc::k3r5-hs-fs:ti-sci-fw:do_deploy mc::k3r5-gp:ti-sci-fw:do_deploy"
 IMAGE_BOOT_FILES:remove = "tiboot3-am62x-hs-evm.bin"
 
 # Don't include kernels in standard images
@@ -64,7 +63,7 @@ IMAGE_FSTYPES:append = " teziimg"
 # The payload offsets are given in number of 512 byte blocks.
 # tiboot3.bin
 OFFSET_BOOTROM_PAYLOAD = "0"
-TPL_BINARY="tiboot3.bin"
+TPL_BINARY="tiboot3-gp.bin"
 # tispl.bin
 OFFSET_TPL_PAYLOAD = "1024"
 # u-boot.img
diff --git a/recipes-bsp/ti-sci-fw/ti-sci-fw_git.bbappend b/recipes-bsp/ti-sci-fw/ti-sci-fw_git.bbappend
index 2196e5a..8d00cce 100644
--- a/recipes-bsp/ti-sci-fw/ti-sci-fw_git.bbappend
+++ b/recipes-bsp/ti-sci-fw/ti-sci-fw_git.bbappend
@@ -2,11 +2,11 @@
 EXTRA_OEMAKE_DFU = "\
     CROSS_COMPILE=${TARGET_PREFIX} SOC=${SYSFW_SOC} SOC_TYPE=${SYSFW_SUFFIX} \
     CONFIG=${SYSFW_CONFIG} SYSFW_DIR="${S}/ti-sysfw" \
-    SBL="${STAGING_DIR_HOST}/boot/u-boot-spl.bin-dfu" \
+    SBL="${STAGING_DIR_HOST}/boot/u-boot-spl.bin-${UBOOT_DFU_CONFIG}" \
 "
 
 do_compile:prepend:k3r5 () {
-    if [ -e "${STAGING_DIR_HOST}/boot/u-boot-spl.bin-dfu" ]; then
+    if [ -e "${STAGING_DIR_HOST}/boot/u-boot-spl.bin-${UBOOT_DFU_CONFIG}" ]; then
         cd ${WORKDIR}/imggen/
         make ${EXTRA_OEMAKE_DFU} $@
         if [ -f "${WORKDIR}/imggen/${SYSFW_TIBOOT3}" ]; then