diff options
Diffstat (limited to 'meta-ti-bsp')
-rw-r--r-- | meta-ti-bsp/conf/machine/am62xx-evm-k3r5-gp.conf | 4 | ||||
-rw-r--r-- | meta-ti-bsp/conf/machine/am62xx-evm-k3r5-hs-fs.conf | 14 | ||||
-rw-r--r-- | meta-ti-bsp/conf/machine/include/am62xx.inc | 12 | ||||
-rw-r--r-- | meta-ti-bsp/conf/multiconfig/k3r5-hs-fs.conf | 3 | ||||
-rw-r--r-- | meta-ti-bsp/recipes-bsp/ti-sci-fw/ti-sci-fw_git.bb | 1 |
5 files changed, 31 insertions, 3 deletions
diff --git a/meta-ti-bsp/conf/machine/am62xx-evm-k3r5-gp.conf b/meta-ti-bsp/conf/machine/am62xx-evm-k3r5-gp.conf index d9867bc7..ab18301a 100644 --- a/meta-ti-bsp/conf/machine/am62xx-evm-k3r5-gp.conf +++ b/meta-ti-bsp/conf/machine/am62xx-evm-k3r5-gp.conf | |||
@@ -8,7 +8,11 @@ SYSFW_SOC = "am62x" | |||
8 | SYSFW_CONFIG = "evm" | 8 | SYSFW_CONFIG = "evm" |
9 | SYSFW_SUFFIX = "gp" | 9 | SYSFW_SUFFIX = "gp" |
10 | 10 | ||
11 | SYSFW_TIBOOT3_SYMLINK = "" | ||
12 | |||
11 | UBOOT_MACHINE = "am62x_evm_r5_defconfig" | 13 | UBOOT_MACHINE = "am62x_evm_r5_defconfig" |
12 | 14 | ||
15 | SPL_BINARY = "" | ||
13 | UBOOT_BINARY = "u-boot-spl.${UBOOT_SUFFIX}" | 16 | UBOOT_BINARY = "u-boot-spl.${UBOOT_SUFFIX}" |
14 | UBOOT_IMAGE = "u-boot-r5spl-gp-${MAINMACHINE}-${PV}-${PR}.${UBOOT_SUFFIX}" | 17 | UBOOT_IMAGE = "u-boot-r5spl-gp-${MAINMACHINE}-${PV}-${PR}.${UBOOT_SUFFIX}" |
18 | UBOOT_SYMLINK = "u-boot-r5spl-gp.${UBOOT_SUFFIX}" | ||
diff --git a/meta-ti-bsp/conf/machine/am62xx-evm-k3r5-hs-fs.conf b/meta-ti-bsp/conf/machine/am62xx-evm-k3r5-hs-fs.conf new file mode 100644 index 00000000..0dad1104 --- /dev/null +++ b/meta-ti-bsp/conf/machine/am62xx-evm-k3r5-hs-fs.conf | |||
@@ -0,0 +1,14 @@ | |||
1 | #@TYPE: Machine | ||
2 | #@NAME: AM62xx HS-FS EVM (R5F) | ||
3 | #@DESCRIPTION: Machine configuration for the TI AM62xx HS-FS EVM (R5F core) | ||
4 | |||
5 | # Booting HS-FS requires different SYSFW, the rest is handled at runtime | ||
6 | |||
7 | require conf/machine/include/k3r5.inc | ||
8 | SOC_FAMILY:append = ":k3r5-hs-fs" | ||
9 | |||
10 | SYSFW_SOC = "am62x" | ||
11 | SYSFW_CONFIG = "evm" | ||
12 | SYSFW_SUFFIX = "hs-fs" | ||
13 | |||
14 | UBOOT_MACHINE = "am62x_evm_r5_defconfig" | ||
diff --git a/meta-ti-bsp/conf/machine/include/am62xx.inc b/meta-ti-bsp/conf/machine/include/am62xx.inc index 53e48610..af6a6db4 100644 --- a/meta-ti-bsp/conf/machine/include/am62xx.inc +++ b/meta-ti-bsp/conf/machine/include/am62xx.inc | |||
@@ -8,10 +8,16 @@ SERIAL_CONSOLES_CHECK = "${SERIAL_CONSOLES}" | |||
8 | 8 | ||
9 | PREFERRED_PROVIDER_virtual/gpudriver ?= "ti-img-rogue-driver" | 9 | PREFERRED_PROVIDER_virtual/gpudriver ?= "ti-img-rogue-driver" |
10 | 10 | ||
11 | BBMULTICONFIG = "k3r5-gp" | 11 | # Default tiboot3.bin on AM62x is for HS-FS |
12 | do_image_wic[mcdepends] = "mc::k3r5-gp:ti-sci-fw:do_deploy" | 12 | BBMULTICONFIG = "k3r5-hs-fs" |
13 | do_image_wic[mcdepends] = "mc::k3r5-hs-fs:ti-sci-fw:do_deploy" | ||
13 | 14 | ||
14 | # Since default tiboot3.bin on AM62x is for GP, add a version for HS-SE | 15 | # Since default tiboot3.bin on AM62x is for HS-FS, add a version for GP |
16 | BBMULTICONFIG += "k3r5-gp" | ||
17 | IMAGE_BOOT_FILES += "tiboot3-am62x-gp-evm.bin" | ||
18 | do_image_wic[mcdepends] += "mc::k3r5-gp:ti-sci-fw:do_deploy" | ||
19 | |||
20 | # Since default tiboot3.bin on AM62x is for HS-FS, add a version for HS-SE | ||
15 | BBMULTICONFIG += "k3r5-hs-se" | 21 | BBMULTICONFIG += "k3r5-hs-se" |
16 | IMAGE_BOOT_FILES += "tiboot3-am62x-hs-evm.bin" | 22 | IMAGE_BOOT_FILES += "tiboot3-am62x-hs-evm.bin" |
17 | do_image_wic[mcdepends] += "mc::k3r5-hs-se:ti-sci-fw:do_deploy" | 23 | do_image_wic[mcdepends] += "mc::k3r5-hs-se:ti-sci-fw:do_deploy" |
diff --git a/meta-ti-bsp/conf/multiconfig/k3r5-hs-fs.conf b/meta-ti-bsp/conf/multiconfig/k3r5-hs-fs.conf new file mode 100644 index 00000000..e22204ee --- /dev/null +++ b/meta-ti-bsp/conf/multiconfig/k3r5-hs-fs.conf | |||
@@ -0,0 +1,3 @@ | |||
1 | require k3r5.conf | ||
2 | |||
3 | MACHINE:append = "-hs-fs" | ||
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 798131d4..8004c227 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-gp = "fs" | 40 | SYSFW_PREFIX:am62xx-evm-k3r5-gp = "fs" |
41 | SYSFW_PREFIX:am62xx-evm-k3r5-hs-se = "fs" | 41 | SYSFW_PREFIX:am62xx-evm-k3r5-hs-se = "fs" |
42 | SYSFW_PREFIX:am62xx-evm-k3r5-hs-fs = "fs" | ||
42 | SYSFW_PREFIX:am62xx-lp-evm-k3r5 = "fs" | 43 | SYSFW_PREFIX:am62xx-lp-evm-k3r5 = "fs" |
43 | SYSFW_PREFIX_am62xx-lp-evm-k3r5-hs-se = "fs" | 44 | SYSFW_PREFIX_am62xx-lp-evm-k3r5-hs-se = "fs" |
44 | SYSFW_PREFIX:am62axx-evm-k3r5 = "fs" | 45 | SYSFW_PREFIX:am62axx-evm-k3r5 = "fs" |