From ca662c2221e890ab856fe2ce5b232985c71af412 Mon Sep 17 00:00:00 2001
From: Chirag Shilwant <c-shilwant@ti.com>
Date: Mon, 30 Jan 2023 14:22:41 +0530
Subject: machine: Add AM62x HS-SE evm configuration

Lets add the basic AM62x HS-SE configuration.
- Add machine conf for AM62x HS-SE.
- The wic images will boot on AM62x GP devices by default. To boot on AM62x HS-SE, simply switch out the SYSFW image:
           $ cd /mnt/sd-card/boot
           $ mv tiboot3-am62x-hs-evm.bin tiboot3.bin

- Add ti-sci-firmware overrides.
- Add support to sign ATF and OPTEE.

Signed-off-by: Chirag Shilwant <c-shilwant@ti.com>
Signed-off-by: Ryan Eatmon <reatmon@ti.com>
---
 conf/machine/am62xx-evm-k3r5-gp.conf    | 14 ++++++++++++++
 conf/machine/am62xx-evm-k3r5-hs-se.conf | 21 +++++++++++++++++++++
 conf/machine/am62xx-evm-k3r5.conf       | 11 -----------
 conf/machine/am62xx-evm.conf            |  4 ++++
 conf/machine/include/am62xx.inc         | 11 +++++++++--
 5 files changed, 48 insertions(+), 13 deletions(-)
 create mode 100644 conf/machine/am62xx-evm-k3r5-gp.conf
 create mode 100644 conf/machine/am62xx-evm-k3r5-hs-se.conf
 delete mode 100644 conf/machine/am62xx-evm-k3r5.conf

(limited to 'conf')

diff --git a/conf/machine/am62xx-evm-k3r5-gp.conf b/conf/machine/am62xx-evm-k3r5-gp.conf
new file mode 100644
index 00000000..d9867bc7
--- /dev/null
+++ b/conf/machine/am62xx-evm-k3r5-gp.conf
@@ -0,0 +1,14 @@
+#@TYPE: Machine
+#@NAME: AM62XX EVM (R5F)
+#@DESCRIPTION: Machine configuration for the TI AM62xx EVM (R5F core)
+
+require conf/machine/include/k3r5.inc
+
+SYSFW_SOC = "am62x"
+SYSFW_CONFIG = "evm"
+SYSFW_SUFFIX = "gp"
+
+UBOOT_MACHINE = "am62x_evm_r5_defconfig"
+
+UBOOT_BINARY = "u-boot-spl.${UBOOT_SUFFIX}"
+UBOOT_IMAGE = "u-boot-r5spl-gp-${MAINMACHINE}-${PV}-${PR}.${UBOOT_SUFFIX}"
diff --git a/conf/machine/am62xx-evm-k3r5-hs-se.conf b/conf/machine/am62xx-evm-k3r5-hs-se.conf
new file mode 100644
index 00000000..913e69fa
--- /dev/null
+++ b/conf/machine/am62xx-evm-k3r5-hs-se.conf
@@ -0,0 +1,21 @@
+#@TYPE: Machine
+#@NAME: AM62xx HS-SE EVM (R5F)
+#@DESCRIPTION: Machine configuration for the TI AM62xx 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 = "am62x"
+SYSFW_CONFIG = "evm"
+SYSFW_SUFFIX = "hs"
+
+SYSFW_TIBOOT3_SYMLINK = ""
+
+UBOOT_MACHINE = "am62x_evm_r5_defconfig"
+
+SPL_BINARY = ""
+UBOOT_BINARY = "u-boot-spl.${UBOOT_SUFFIX}"
+UBOOT_IMAGE = "u-boot-r5spl-hs-se-${MAINMACHINE}-${PV}-${PR}.${UBOOT_SUFFIX}"
+UBOOT_SYMLINK = "u-boot-r5spl-hs-se.${UBOOT_SUFFIX}"
diff --git a/conf/machine/am62xx-evm-k3r5.conf b/conf/machine/am62xx-evm-k3r5.conf
deleted file mode 100644
index 724a8d4a..00000000
--- a/conf/machine/am62xx-evm-k3r5.conf
+++ /dev/null
@@ -1,11 +0,0 @@
-#@TYPE: Machine
-#@NAME: AM62XX EVM (R5F)
-#@DESCRIPTION: Machine configuration for the TI AM62xx EVM (R5F core)
-
-require conf/machine/include/k3r5.inc
-
-SYSFW_SOC = "am62x"
-SYSFW_CONFIG = "evm"
-SYSFW_SUFFIX = "gp"
-
-UBOOT_MACHINE = "am62x_evm_r5_defconfig"
diff --git a/conf/machine/am62xx-evm.conf b/conf/machine/am62xx-evm.conf
index 3d9e3b90..b4904eca 100644
--- a/conf/machine/am62xx-evm.conf
+++ b/conf/machine/am62xx-evm.conf
@@ -19,3 +19,7 @@ KERNEL_DEVICETREE = " \
 "
 
 UBOOT_MACHINE = "am62x_evm_a53_defconfig"
+
+SPL_BINARY = "tispl.bin_HS"
+UBOOT_BINARY = "u-boot.img_HS"
+UBOOT_SYMLINK = "u-boot.img"
diff --git a/conf/machine/include/am62xx.inc b/conf/machine/include/am62xx.inc
index 0231235f..912318e9 100644
--- a/conf/machine/include/am62xx.inc
+++ b/conf/machine/include/am62xx.inc
@@ -8,8 +8,15 @@ SERIAL_CONSOLES_CHECK = "${SERIAL_CONSOLES}"
 
 TFA_K3_SYSTEM_SUSPEND = "1"
 
-do_image_wic[mcdepends] = "mc::k3r5:ti-sci-fw:do_deploy"
-do_image_tar[mcdepends] = "mc::k3r5:ti-sci-fw:do_deploy"
+BBMULTICONFIG = "k3r5-gp"
+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 AM62x is for GP, add a version for HS-SE
+BBMULTICONFIG += "k3r5-hs-se"
+IMAGE_BOOT_FILES += " tiboot3-am62x-hs-evm.bin"
+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"
 
 TFA_BOARD = "lite"
 OPTEEMACHINE = "k3-am62x"
-- 
cgit v1.2.3-54-g00ecf