On 3/19/2023 22:37, Denys Dmytriyenko wrote:
From: Chirag Shilwant <[email protected]>
Lets add the basic AM62Q HS-SE configuration.
- Add configurations.
- Add ti-sci-firmware overrides.
- Add u-boot overrides.
- Add optee overrides.
- Add ti-rtos-firmware overrides.
Signed-off-by: Chirag Shilwant <[email protected]>
Signed-off-by: Ryan Eatmon <[email protected]>
Signed-off-by: Denys Dmytriyenko <[email protected]>
---
.../conf/machine/am62xx-lp-evm-k3r5-hs-se.conf | 14 ++++++++++++++
meta-ti-bsp/conf/machine/am62xx-lp-evm-k3r5.conf | 12 ++++++++++--
meta-ti-bsp/conf/machine/am62xx-lp-evm.conf | 6 +++++-
meta-ti-bsp/conf/machine/include/am62xx-lp.inc | 16 ++++++++++++++++
meta-ti-bsp/conf/multiconfig/k3r5-hs-se.conf | 3 +++
.../recipes-bsp/ti-sci-fw/ti-sci-fw_git.bb | 1 +
6 files changed, 49 insertions(+), 3 deletions(-)
create mode 100644 meta-ti-bsp/conf/machine/am62xx-lp-evm-k3r5-hs-se.conf
create mode 100644 meta-ti-bsp/conf/machine/include/am62xx-lp.inc
create mode 100644 meta-ti-bsp/conf/multiconfig/k3r5-hs-se.conf
diff --git a/meta-ti-bsp/conf/machine/am62xx-lp-evm-k3r5-hs-se.conf
b/meta-ti-bsp/conf/machine/am62xx-lp-evm-k3r5-hs-se.conf
new file mode 100644
index 00000000..11e70342
--- /dev/null
+++ b/meta-ti-bsp/conf/machine/am62xx-lp-evm-k3r5-hs-se.conf
@@ -0,0 +1,14 @@
+#@TYPE: Machine
+#@NAME: AM62xx LPSK HS-SE EVM (R5F)
+#@DESCRIPTION: Machine configuration for the TI AM62xx LP 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"
+
+UBOOT_MACHINE = "am62x_lpsk_r5_defconfig"
diff --git a/meta-ti-bsp/conf/machine/am62xx-lp-evm-k3r5.conf
b/meta-ti-bsp/conf/machine/am62xx-lp-evm-k3r5.conf
index ca4ced5a..15ecc677 100644
--- a/meta-ti-bsp/conf/machine/am62xx-lp-evm-k3r5.conf
+++ b/meta-ti-bsp/conf/machine/am62xx-lp-evm-k3r5.conf
@@ -1,11 +1,19 @@
#@TYPE: Machine
-#@NAME: AM62XX LP EVM (R5F)
-#@DESCRIPTION: Machine configuration for the TI AM62xx LP EVM (R5F core)
+#@NAME: AM62XX LP GP EVM (R5F)
+#@DESCRIPTION: Machine configuration for the TI AM62xx LP GP EVM (R5F core)
require conf/machine/include/k3r5.inc
+SOC_FAMILY:append = ":k3r5-gp"
SYSFW_SOC = "am62x"
SYSFW_CONFIG = "evm"
SYSFW_SUFFIX = "gp"
+SYSFW_TIBOOT3_SYMLINK = ""
+
UBOOT_MACHINE = "am62x_lpsk_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/am62xx-lp-evm.conf
b/meta-ti-bsp/conf/machine/am62xx-lp-evm.conf
index ec9ce596..be95f33a 100644
--- a/meta-ti-bsp/conf/machine/am62xx-lp-evm.conf
+++ b/meta-ti-bsp/conf/machine/am62xx-lp-evm.conf
@@ -2,7 +2,7 @@
#@NAME: AM62XX LP EVM
#@DESCRIPTION: Machine configuration for the TI AM62XX LP EVM
-require conf/machine/include/am62xx.inc
+require conf/machine/include/am62xx-lp.inc
KERNEL_DEVICETREE = " \
ti/k3-am62x-lp-sk.dtb \
@@ -11,4 +11,8 @@ KERNEL_DEVICETREE = " \
ti/k3-am625-sk-csi2-ov5640.dtbo \
"
+SPL_BINARY = "tispl.bin_HS"
+UBOOT_BINARY = "u-boot.img_HS"
+UBOOT_SYMLINK = "u-boot.img"
+
UBOOT_MACHINE = "am62x_lpsk_a53_defconfig"
diff --git a/meta-ti-bsp/conf/machine/include/am62xx-lp.inc
b/meta-ti-bsp/conf/machine/include/am62xx-lp.inc
new file mode 100644
index 00000000..df113003
--- /dev/null
+++ b/meta-ti-bsp/conf/machine/include/am62xx-lp.inc
@@ -0,0 +1,16 @@
+require conf/machine/include/k3.inc
+SOC_FAMILY:append = ":am62xx"
+
+MACHINE_FEATURES += "screen touchscreen"
+
+SERIAL_CONSOLES = "115200;ttyS0 115200;ttyS2"
+SERIAL_CONSOLES_CHECK = "${SERIAL_CONSOLES}"
+
+TFA_K3_SYSTEM_SUSPEND = "1"
+
+# Default tiboot3.bin on AM62x LP is for HS-SE
+BBMULTICONFIG += "k3r5-hs-se"
+do_image_wic[mcdepends] += "mc::k3r5-hs-se:ti-sci-fw:do_deploy"
+
+TFA_BOARD = "lite"
+OPTEEMACHINE = "k3-am62x"
diff --git a/meta-ti-bsp/conf/multiconfig/k3r5-hs-se.conf
b/meta-ti-bsp/conf/multiconfig/k3r5-hs-se.conf
new file mode 100644
index 00000000..7e3d7dae
--- /dev/null
+++ b/meta-ti-bsp/conf/multiconfig/k3r5-hs-se.conf
@@ -0,0 +1,3 @@
+require k3r5.conf
+
+MACHINE:append = "-hs-se"
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 37d022e9..77709689 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
@@ -39,6 +39,7 @@ SYSFW_PREFIX:j784s4-evm-k3r5 = "fs"
SYSFW_PREFIX:j784s4-hs-evm-k3r5 = "fs"
SYSFW_PREFIX:am62xx-evm-k3r5 = "fs"
SYSFW_PREFIX:am62xx-lp-evm-k3r5 = "fs"
+SYSFW_PREFIX_am62xx-lp-evm-k3r5-hs-se = "fs"
Ooops. We missed a dunfell to kirkstone syntax change. No need to send
an updated patch, I will just do a git fixup and address it.
Thanks for your hard work on these patch sync ups, Denys. It is very
much appreciated.
> SYSFW_PREFIX:am62axx-evm-k3r5 = "fs"
>
SYSFW_TISCI = "${S}/ti-sysfw/ti-${SYSFW_PREFIX}-firmware-${SYSFW_SOC}-*.bin"
--
Ryan Eatmon [email protected]
-----------------------------------------
Texas Instruments, Inc. - LCPD - MGTS
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#16219):
https://lists.yoctoproject.org/g/meta-ti/message/16219
Mute This Topic: https://lists.yoctoproject.org/mt/97724610/21656
Group Owner: [email protected]
Unsubscribe:
https://lists.yoctoproject.org/g/meta-ti/leave/6695321/21656/1393940836/xyzzy
[[email protected]]
-=-=-=-=-=-=-=-=-=-=-=-
