diff options
Diffstat (limited to 'conf')
-rw-r--r-- | conf/machine/am64xx-evm-k3r5-hs-se.conf | 14 | ||||
-rw-r--r-- | conf/machine/am64xx-evm-k3r5-sr2-hs-fs.conf | 14 | ||||
-rw-r--r-- | conf/machine/am64xx-evm-k3r5-sr2-hs-se.conf | 20 | ||||
-rw-r--r-- | conf/machine/am64xx-evm.conf | 8 | ||||
-rw-r--r-- | conf/machine/include/am64xx.inc | 6 | ||||
-rw-r--r-- | conf/multiconfig/k3r5-sr2-hs-fs.conf | 3 | ||||
-rw-r--r-- | conf/multiconfig/k3r5-sr2-hs-se.conf (renamed from conf/multiconfig/k3r5-hs-se.conf) | 2 |
7 files changed, 48 insertions, 19 deletions
diff --git a/conf/machine/am64xx-evm-k3r5-hs-se.conf b/conf/machine/am64xx-evm-k3r5-hs-se.conf deleted file mode 100644 index 7cab7d15..00000000 --- a/conf/machine/am64xx-evm-k3r5-hs-se.conf +++ /dev/null | |||
@@ -1,14 +0,0 @@ | |||
1 | #@TYPE: Machine | ||
2 | #@NAME: AM64xx HS-SE EVM (R5F) | ||
3 | #@DESCRIPTION: Machine configuration for the TI AM64xx 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 = "am64x" | ||
11 | SYSFW_CONFIG = "evm" | ||
12 | SYSFW_SUFFIX = "hs" | ||
13 | |||
14 | UBOOT_MACHINE = "am64x_evm_r5_defconfig" | ||
diff --git a/conf/machine/am64xx-evm-k3r5-sr2-hs-fs.conf b/conf/machine/am64xx-evm-k3r5-sr2-hs-fs.conf new file mode 100644 index 00000000..1139fe4a --- /dev/null +++ b/conf/machine/am64xx-evm-k3r5-sr2-hs-fs.conf | |||
@@ -0,0 +1,14 @@ | |||
1 | #@TYPE: Machine | ||
2 | #@NAME: AM64xx SR2.0 HS-FS EVM (R5F) | ||
3 | #@DESCRIPTION: Machine configuration for the TI AM64xx SR2.0 HS-FS EVM (R5F core) | ||
4 | |||
5 | # Booting SR2.0 HS-FS requires different SYSFW, the rest is handled at runtime | ||
6 | |||
7 | require conf/machine/include/k3r5.inc | ||
8 | SOC_FAMILY_append = ":k3r5-sr2-hs-fs" | ||
9 | |||
10 | SYSFW_SOC = "am64x_sr2" | ||
11 | SYSFW_CONFIG = "evm" | ||
12 | SYSFW_SUFFIX = "hs-fs" | ||
13 | |||
14 | UBOOT_MACHINE = "am64x_evm_r5_defconfig" | ||
diff --git a/conf/machine/am64xx-evm-k3r5-sr2-hs-se.conf b/conf/machine/am64xx-evm-k3r5-sr2-hs-se.conf new file mode 100644 index 00000000..f2aeca6d --- /dev/null +++ b/conf/machine/am64xx-evm-k3r5-sr2-hs-se.conf | |||
@@ -0,0 +1,20 @@ | |||
1 | #@TYPE: Machine | ||
2 | #@NAME: AM64xx SR2.0 HS-SE EVM (R5F) | ||
3 | #@DESCRIPTION: Machine configuration for the TI AM64xx SR2.0 HS-SE EVM (R5F core) | ||
4 | |||
5 | # Booting SR2.0 HS-SE requires different SYSFW, the rest is handled at runtime | ||
6 | |||
7 | require conf/machine/include/k3r5.inc | ||
8 | SOC_FAMILY_append = ":k3r5-sr2-hs-se" | ||
9 | |||
10 | SYSFW_SOC = "am64x_sr2" | ||
11 | SYSFW_CONFIG = "evm" | ||
12 | SYSFW_SUFFIX = "hs" | ||
13 | SYSFW_TIBOOT3_SYMLINK = "" | ||
14 | |||
15 | UBOOT_MACHINE = "am64x_evm_r5_defconfig" | ||
16 | |||
17 | SPL_BINARY = "" | ||
18 | UBOOT_BINARY = "u-boot-spl.${UBOOT_SUFFIX}" | ||
19 | UBOOT_IMAGE = "u-boot-r5spl-sr2-hs-se-${MAINMACHINE}-${PV}-${PR}.${UBOOT_SUFFIX}" | ||
20 | UBOOT_SYMLINK = "u-boot-r5spl-sr2-hs-se.${UBOOT_SUFFIX}" | ||
diff --git a/conf/machine/am64xx-evm.conf b/conf/machine/am64xx-evm.conf index f150f532..d9afb08e 100644 --- a/conf/machine/am64xx-evm.conf +++ b/conf/machine/am64xx-evm.conf | |||
@@ -6,8 +6,14 @@ require conf/machine/include/am64xx.inc | |||
6 | 6 | ||
7 | UBOOT_MACHINE = "am64x_evm_a53_defconfig" | 7 | UBOOT_MACHINE = "am64x_evm_a53_defconfig" |
8 | 8 | ||
9 | # Since default tiboot3.bin on AM64x is for HS-SE, add a version for GP | 9 | # Since default tiboot3.bin on AM64x is for SR2.0 HS-FS, add a version for GP |
10 | BBMULTICONFIG += "k3r5-gp" | 10 | BBMULTICONFIG += "k3r5-gp" |
11 | IMAGE_BOOT_FILES += " tiboot3-am64x-gp-evm.bin" | 11 | IMAGE_BOOT_FILES += " tiboot3-am64x-gp-evm.bin" |
12 | do_image_wic[mcdepends] += "mc::k3r5-gp:ti-sci-fw:do_deploy" | 12 | do_image_wic[mcdepends] += "mc::k3r5-gp:ti-sci-fw:do_deploy" |
13 | do_image_tar[mcdepends] += "mc::k3r5-gp:ti-sci-fw:do_deploy" | 13 | do_image_tar[mcdepends] += "mc::k3r5-gp:ti-sci-fw:do_deploy" |
14 | |||
15 | # Since default tiboot3.bin on AM64x is for SR2.0 HS-FS, add a version for SR2.0 HS-SE | ||
16 | BBMULTICONFIG += "k3r5-sr2-hs-se" | ||
17 | IMAGE_BOOT_FILES += " tiboot3-am64x_sr2-hs-evm.bin" | ||
18 | do_image_wic[mcdepends] += "mc::k3r5-sr2-hs-se:ti-sci-fw:do_deploy" | ||
19 | do_image_tar[mcdepends] += "mc::k3r5-sr2-hs-se:ti-sci-fw:do_deploy" | ||
diff --git a/conf/machine/include/am64xx.inc b/conf/machine/include/am64xx.inc index becc79d4..0b9a3e59 100644 --- a/conf/machine/include/am64xx.inc +++ b/conf/machine/include/am64xx.inc | |||
@@ -14,9 +14,9 @@ KERNEL_DEVICETREE = " \ | |||
14 | ti/k3-am642-evm-nand.dtbo \ | 14 | ti/k3-am642-evm-nand.dtbo \ |
15 | " | 15 | " |
16 | 16 | ||
17 | BBMULTICONFIG = "k3r5-hs-se" | 17 | BBMULTICONFIG = "k3r5-sr2-hs-fs" |
18 | do_image_wic[mcdepends] = "mc::k3r5-hs-se:ti-sci-fw:do_deploy" | 18 | do_image_wic[mcdepends] = "mc::k3r5-sr2-hs-fs:ti-sci-fw:do_deploy" |
19 | do_image_tar[mcdepends] = "mc::k3r5-hs-se:ti-sci-fw:do_deploy" | 19 | do_image_tar[mcdepends] = "mc::k3r5-sr2-hs-fs:ti-sci-fw:do_deploy" |
20 | 20 | ||
21 | TFA_BOARD = "lite" | 21 | TFA_BOARD = "lite" |
22 | OPTEEMACHINE = "k3-am64x" | 22 | OPTEEMACHINE = "k3-am64x" |
diff --git a/conf/multiconfig/k3r5-sr2-hs-fs.conf b/conf/multiconfig/k3r5-sr2-hs-fs.conf new file mode 100644 index 00000000..8e6b5c68 --- /dev/null +++ b/conf/multiconfig/k3r5-sr2-hs-fs.conf | |||
@@ -0,0 +1,3 @@ | |||
1 | require k3r5-sr2.conf | ||
2 | |||
3 | MACHINE_append = "-hs-fs" | ||
diff --git a/conf/multiconfig/k3r5-hs-se.conf b/conf/multiconfig/k3r5-sr2-hs-se.conf index 701f8e88..69e6d0c8 100644 --- a/conf/multiconfig/k3r5-hs-se.conf +++ b/conf/multiconfig/k3r5-sr2-hs-se.conf | |||
@@ -1,3 +1,3 @@ | |||
1 | require k3r5.conf | 1 | require k3r5-sr2.conf |
2 | 2 | ||
3 | MACHINE_append = "-hs-se" | 3 | MACHINE_append = "-hs-se" |