diff mbox series

[master,23/53] conf: machine: j721s2-evm: Add support for J721S2 HS-FS

Message ID 20230320112452.2813505-24-denis@denix.org
State Accepted
Delegated to: Ryan Eatmon
Headers show
Series 2023.03 sync up with Dunfell | expand

Commit Message

Denys Dmytriyenko March 20, 2023, 11:24 a.m. UTC 
From: Sinthu Raja <sinthu.raja@ti.com>

Add the basic J721S2 HS-FS configuration.
    - Add configurations to support both HS-FS and GP keeping GP
      as default.
    - Add ti-sci-firmware overrides for HS-FS.
    - Remove evm conf file inclusion in hs-evm conf.
    - Add j721s2 hs-evm specific config to hs-evm conf.

Signed-off-by: Aniket Limaye <a-limaye@ti.com>
Signed-off-by: Sinthu Raja <sinthu.raja@ti.com>
Signed-off-by: Ryan Eatmon <reatmon@ti.com>
Signed-off-by: Denys Dmytriyenko <denys@konsulko.com>
---
 .../conf/machine/j721s2-evm-k3r5-gp.conf      | 20 +++++++++++++++++++
 .../machine/j721s2-evm-k3r5-sr1-hs-fs.conf    | 15 ++++++++++++++
 meta-ti-bsp/conf/machine/j721s2-evm.conf      |  9 +++++++++
 meta-ti-bsp/conf/machine/j721s2-hs-evm.conf   | 15 +++++++++++++-
 .../conf/multiconfig/k3r5-sr1-hs-fs.conf      |  3 +++
 meta-ti-bsp/conf/multiconfig/k3r5-sr1.conf    |  3 +++
 .../recipes-bsp/ti-sci-fw/ti-sci-fw_git.bb    |  3 ++-
 7 files changed, 66 insertions(+), 2 deletions(-)
 create mode 100644 meta-ti-bsp/conf/machine/j721s2-evm-k3r5-gp.conf
 create mode 100644 meta-ti-bsp/conf/machine/j721s2-evm-k3r5-sr1-hs-fs.conf
 create mode 100644 meta-ti-bsp/conf/multiconfig/k3r5-sr1-hs-fs.conf
 create mode 100644 meta-ti-bsp/conf/multiconfig/k3r5-sr1.conf
diff mbox series

Patch

diff --git a/meta-ti-bsp/conf/machine/j721s2-evm-k3r5-gp.conf b/meta-ti-bsp/conf/machine/j721s2-evm-k3r5-gp.conf
new file mode 100644
index 00000000..95771139
--- /dev/null
+++ b/meta-ti-bsp/conf/machine/j721s2-evm-k3r5-gp.conf
@@ -0,0 +1,20 @@ 
+#@TYPE: Machine
+#@NAME: J721S2 GP EVM (R5F)
+#@DESCRIPTION: Machine configuration for the TI J721S2 GP EVM (R5F core)
+
+# Booting GP requires different SYSFW, the rest is handled at runtime
+
+require conf/machine/include/k3r5.inc
+SOC_FAMILY:append = ":k3r5-gp"
+
+SYSFW_SOC = "j721s2"
+SYSFW_CONFIG = "evm"
+SYSFW_SUFFIX = "gp"
+SYSFW_TIBOOT3_SYMLINK = "tiboot3.bin"
+
+UBOOT_MACHINE = "j721s2_evm_r5_defconfig"
+
+SPL_BINARY = ""
+UBOOT_BINARY = "u-boot-spl.${UBOOT_SUFFIX}"
+UBOOT_IMAGE = "u-boot-r5spl-gp-${MAINMACHINE}-${PV}-${PR}.${UBOOT_SUFFIX}"
+UBOOT_SYMLINK = "u-boot-r5spl-gp.${UBOOT_SUFFIX}"
diff --git a/meta-ti-bsp/conf/machine/j721s2-evm-k3r5-sr1-hs-fs.conf b/meta-ti-bsp/conf/machine/j721s2-evm-k3r5-sr1-hs-fs.conf
new file mode 100644
index 00000000..1a77830d
--- /dev/null
+++ b/meta-ti-bsp/conf/machine/j721s2-evm-k3r5-sr1-hs-fs.conf
@@ -0,0 +1,15 @@ 
+#@TYPE: Machine
+#@NAME: J721S2 HS-FS EVM (R5F)
+#@DESCRIPTION: Machine configuration for the TI J721S2 HS-FS EVM (R5F core)
+
+# Booting HS-FS requires different SYSFW, the rest is handled at runtime
+
+require conf/machine/include/k3r5.inc
+SOC_FAMILY:append = ":k3r5-sr1-hs-fs"
+
+SYSFW_SOC = "j721s2"
+SYSFW_CONFIG = "evm"
+SYSFW_SUFFIX = "hs-fs"
+SYSFW_TIBOOT3_SYMLINK = ""
+
+UBOOT_MACHINE = "j721s2_evm_r5_defconfig"
diff --git a/meta-ti-bsp/conf/machine/j721s2-evm.conf b/meta-ti-bsp/conf/machine/j721s2-evm.conf
index 3576414d..93efbb70 100644
--- a/meta-ti-bsp/conf/machine/j721s2-evm.conf
+++ b/meta-ti-bsp/conf/machine/j721s2-evm.conf
@@ -15,3 +15,12 @@  KERNEL_DEVICETREE = " \
 "
 
 UBOOT_MACHINE = "j721s2_evm_a72_defconfig"
+
+# Default tiboot3.bin on J721S2 is for GP
+BBMULTICONFIG = "k3r5-gp"
+do_image_wic[mcdepends] = "mc::k3r5-gp:ti-sci-fw:do_deploy"
+
+# Since default tiboot3.bin on J721S2 is for GP, add a version for SR1.0 HS-FS
+BBMULTICONFIG += "k3r5-sr1-hs-fs"
+IMAGE_BOOT_FILES += "tiboot3-j721s2-hs-fs-evm.bin"
+do_image_wic[mcdepends] += "mc::k3r5-sr1-hs-fs:ti-sci-fw:do_deploy"
diff --git a/meta-ti-bsp/conf/machine/j721s2-hs-evm.conf b/meta-ti-bsp/conf/machine/j721s2-hs-evm.conf
index 3d737f44..8fa98440 100644
--- a/meta-ti-bsp/conf/machine/j721s2-hs-evm.conf
+++ b/meta-ti-bsp/conf/machine/j721s2-hs-evm.conf
@@ -2,10 +2,23 @@ 
 #@NAME: J721S2 HS EVM
 #@DESCRIPTION: Machine configuration for the TI J721S2 HS EVM
 
-require conf/machine/j721s2-evm.conf
+require conf/machine/include/j721s2.inc
+
+SERIAL_CONSOLES = "115200;ttyS2"
+SERIAL_CONSOLES_CHECK = "${SERIAL_CONSOLES}"
+
+TFA_K3_USART = "0x8"
+OPTEE_K3_USART = "0x8"
+
+KERNEL_DEVICETREE = " \
+    ti/k3-j721s2-common-proc-board.dtb \
+    ti/k3-j721s2-gesi-exp-board.dtbo \
+"
 
 UBOOT_MACHINE = "j721s2_hs_evm_a72_defconfig"
 
+do_image_wic[mcdepends] = "mc::k3r5:ti-sci-fw:do_deploy"
+
 SPL_BINARY = "tispl.bin_HS"
 UBOOT_BINARY = "u-boot.img_HS"
 UBOOT_SYMLINK = "u-boot.img"
diff --git a/meta-ti-bsp/conf/multiconfig/k3r5-sr1-hs-fs.conf b/meta-ti-bsp/conf/multiconfig/k3r5-sr1-hs-fs.conf
new file mode 100644
index 00000000..505f08d5
--- /dev/null
+++ b/meta-ti-bsp/conf/multiconfig/k3r5-sr1-hs-fs.conf
@@ -0,0 +1,3 @@ 
+require k3r5-sr1.conf
+
+MACHINE:append = "-hs-fs"
diff --git a/meta-ti-bsp/conf/multiconfig/k3r5-sr1.conf b/meta-ti-bsp/conf/multiconfig/k3r5-sr1.conf
new file mode 100644
index 00000000..1c8098cd
--- /dev/null
+++ b/meta-ti-bsp/conf/multiconfig/k3r5-sr1.conf
@@ -0,0 +1,3 @@ 
+require k3r5.conf
+
+MACHINE:append = "-sr1"
diff --git a/meta-ti-bsp/recipes-bsp/ti-sci-fw/ti-sci-fw_git.bb b/meta-ti-bsp/recipes-bsp/ti-sci-fw/ti-sci-fw_git.bb
index b65d8502..18153d37 100644
--- a/meta-ti-bsp/recipes-bsp/ti-sci-fw/ti-sci-fw_git.bb
+++ b/meta-ti-bsp/recipes-bsp/ti-sci-fw/ti-sci-fw_git.bb
@@ -33,7 +33,8 @@  SYSFW_PREFIX:j721e-hs-evm-k3r5-sr1-1 = "fs"
 SYSFW_PREFIX:beaglebone-ai64-k3r5 = "fs"
 SYSFW_PREFIX:j7200-evm-k3r5 = "fs"
 SYSFW_PREFIX:j7200-hs-evm-k3r5 = "fs"
-SYSFW_PREFIX:j721s2-evm-k3r5 = "fs"
+SYSFW_PREFIX:j721s2-evm-k3r5-gp = "fs"
+SYSFW_PREFIX:j721s2-evm-k3r5-sr1-hs-fs = "fs"
 SYSFW_PREFIX:j721s2-hs-evm-k3r5 = "fs"
 SYSFW_PREFIX:j784s4-evm-k3r5 = "fs"
 SYSFW_PREFIX:j784s4-hs-evm-k3r5 = "fs"