diff options
author | Chirag Shilwant <c-shilwant@ti.com> | 2023-03-20 11:24:10 +0000 |
---|---|---|
committer | Ryan Eatmon <reatmon@ti.com> | 2023-03-21 13:03:29 -0500 |
commit | 3f47f79afe1c4db945107720288969584f4ca357 (patch) | |
tree | d6ba875cce83f315e72a5da7a037ed68557ac1e2 | |
parent | 8d174266e533987556aa1dff92c19fa37ba455da (diff) | |
download | meta-ti-3f47f79afe1c4db945107720288969584f4ca357.tar.gz |
machine: Add AM62Q HS-SE evm configuration
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 <c-shilwant@ti.com>
Signed-off-by: Ryan Eatmon <reatmon@ti.com>
Signed-off-by: Denys Dmytriyenko <denys@konsulko.com>
Signed-off-by: Ryan Eatmon <reatmon@ti.com>
-rw-r--r-- | meta-ti-bsp/conf/machine/am62xx-lp-evm-k3r5-hs-se.conf | 14 | ||||
-rw-r--r-- | meta-ti-bsp/conf/machine/am62xx-lp-evm-k3r5.conf | 12 | ||||
-rw-r--r-- | meta-ti-bsp/conf/machine/am62xx-lp-evm.conf | 6 | ||||
-rw-r--r-- | meta-ti-bsp/conf/machine/include/am62xx-lp.inc | 16 | ||||
-rw-r--r-- | meta-ti-bsp/conf/multiconfig/k3r5-hs-se.conf | 3 | ||||
-rw-r--r-- | meta-ti-bsp/recipes-bsp/ti-sci-fw/ti-sci-fw_git.bb | 1 |
6 files changed, 49 insertions, 3 deletions
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 @@ | |||
1 | #@TYPE: Machine | ||
2 | #@NAME: AM62xx LPSK HS-SE EVM (R5F) | ||
3 | #@DESCRIPTION: Machine configuration for the TI AM62xx LP HS-SE EVM (R5F core) | ||
4 | |||
5 | # Booting HS-SE requires different SYSFW, the rest is handled at runtime | ||
6 | |||
7 | require conf/machine/include/k3r5.inc | ||
8 | SOC_FAMILY:append = ":k3r5-hs-se" | ||
9 | |||
10 | SYSFW_SOC = "am62x" | ||
11 | SYSFW_CONFIG = "evm" | ||
12 | SYSFW_SUFFIX = "hs" | ||
13 | |||
14 | 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 @@ | |||
1 | #@TYPE: Machine | 1 | #@TYPE: Machine |
2 | #@NAME: AM62XX LP EVM (R5F) | 2 | #@NAME: AM62XX LP GP EVM (R5F) |
3 | #@DESCRIPTION: Machine configuration for the TI AM62xx LP EVM (R5F core) | 3 | #@DESCRIPTION: Machine configuration for the TI AM62xx LP GP EVM (R5F core) |
4 | 4 | ||
5 | require conf/machine/include/k3r5.inc | 5 | require conf/machine/include/k3r5.inc |
6 | SOC_FAMILY:append = ":k3r5-gp" | ||
6 | 7 | ||
7 | SYSFW_SOC = "am62x" | 8 | SYSFW_SOC = "am62x" |
8 | SYSFW_CONFIG = "evm" | 9 | SYSFW_CONFIG = "evm" |
9 | SYSFW_SUFFIX = "gp" | 10 | SYSFW_SUFFIX = "gp" |
10 | 11 | ||
12 | SYSFW_TIBOOT3_SYMLINK = "" | ||
13 | |||
11 | UBOOT_MACHINE = "am62x_lpsk_r5_defconfig" | 14 | UBOOT_MACHINE = "am62x_lpsk_r5_defconfig" |
15 | |||
16 | SPL_BINARY = "" | ||
17 | UBOOT_BINARY = "u-boot-spl.${UBOOT_SUFFIX}" | ||
18 | UBOOT_IMAGE = "u-boot-r5spl-gp-${MAINMACHINE}-${PV}-${PR}.${UBOOT_SUFFIX}" | ||
19 | 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 @@ | |||
2 | #@NAME: AM62XX LP EVM | 2 | #@NAME: AM62XX LP EVM |
3 | #@DESCRIPTION: Machine configuration for the TI AM62XX LP EVM | 3 | #@DESCRIPTION: Machine configuration for the TI AM62XX LP EVM |
4 | 4 | ||
5 | require conf/machine/include/am62xx.inc | 5 | require conf/machine/include/am62xx-lp.inc |
6 | 6 | ||
7 | KERNEL_DEVICETREE = " \ | 7 | KERNEL_DEVICETREE = " \ |
8 | ti/k3-am62x-lp-sk.dtb \ | 8 | ti/k3-am62x-lp-sk.dtb \ |
@@ -11,4 +11,8 @@ KERNEL_DEVICETREE = " \ | |||
11 | ti/k3-am625-sk-csi2-ov5640.dtbo \ | 11 | ti/k3-am625-sk-csi2-ov5640.dtbo \ |
12 | " | 12 | " |
13 | 13 | ||
14 | SPL_BINARY = "tispl.bin_HS" | ||
15 | UBOOT_BINARY = "u-boot.img_HS" | ||
16 | UBOOT_SYMLINK = "u-boot.img" | ||
17 | |||
14 | UBOOT_MACHINE = "am62x_lpsk_a53_defconfig" | 18 | 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 @@ | |||
1 | require conf/machine/include/k3.inc | ||
2 | SOC_FAMILY:append = ":am62xx" | ||
3 | |||
4 | MACHINE_FEATURES += "screen touchscreen" | ||
5 | |||
6 | SERIAL_CONSOLES = "115200;ttyS0 115200;ttyS2" | ||
7 | SERIAL_CONSOLES_CHECK = "${SERIAL_CONSOLES}" | ||
8 | |||
9 | TFA_K3_SYSTEM_SUSPEND = "1" | ||
10 | |||
11 | # Default tiboot3.bin on AM62x LP is for HS-SE | ||
12 | BBMULTICONFIG += "k3r5-hs-se" | ||
13 | do_image_wic[mcdepends] += "mc::k3r5-hs-se:ti-sci-fw:do_deploy" | ||
14 | |||
15 | TFA_BOARD = "lite" | ||
16 | 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 @@ | |||
1 | require k3r5.conf | ||
2 | |||
3 | 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" | |||
39 | SYSFW_PREFIX:j784s4-hs-evm-k3r5 = "fs" | 39 | SYSFW_PREFIX:j784s4-hs-evm-k3r5 = "fs" |
40 | SYSFW_PREFIX:am62xx-evm-k3r5 = "fs" | 40 | SYSFW_PREFIX:am62xx-evm-k3r5 = "fs" |
41 | SYSFW_PREFIX:am62xx-lp-evm-k3r5 = "fs" | 41 | SYSFW_PREFIX:am62xx-lp-evm-k3r5 = "fs" |
42 | SYSFW_PREFIX_am62xx-lp-evm-k3r5-hs-se = "fs" | ||
42 | SYSFW_PREFIX:am62axx-evm-k3r5 = "fs" | 43 | SYSFW_PREFIX:am62axx-evm-k3r5 = "fs" |
43 | 44 | ||
44 | SYSFW_TISCI = "${S}/ti-sysfw/ti-${SYSFW_PREFIX}-firmware-${SYSFW_SOC}-*.bin" | 45 | SYSFW_TISCI = "${S}/ti-sysfw/ti-${SYSFW_PREFIX}-firmware-${SYSFW_SOC}-*.bin" |