diff options
author | Andrew Davis <afd@ti.com> | 2022-09-07 11:03:15 -0500 |
---|---|---|
committer | Ryan Eatmon <reatmon@ti.com> | 2022-09-08 07:35:17 -0500 |
commit | e625b874b1f7ff5ebe1e1852ab7f7c5a20a4e7cc (patch) | |
tree | 5c7ce680130a0868355cfd4e820959af6e893c36 | |
parent | 0dcd35143270740233510bfe233e2dd3b0a450cb (diff) | |
download | meta-ti-e625b874b1f7ff5ebe1e1852ab7f7c5a20a4e7cc.tar.gz |
conf: machine: am64xx: Move multi-config targets into base SoC include
The supported device types depends on the SoC, not on any specific
board or EVM. Any board can be populated with any of the 3 supported
AM64x types. Move these into the AM64x common include.
Signed-off-by: Andrew Davis <afd@ti.com>
Signed-off-by: Ryan Eatmon <reatmon@ti.com>
-rw-r--r-- | conf/machine/am64xx-evm.conf | 12 | ||||
-rw-r--r-- | conf/machine/include/am64xx.inc | 13 |
2 files changed, 13 insertions, 12 deletions
diff --git a/conf/machine/am64xx-evm.conf b/conf/machine/am64xx-evm.conf index d9afb08e..c6ba2a87 100644 --- a/conf/machine/am64xx-evm.conf +++ b/conf/machine/am64xx-evm.conf | |||
@@ -5,15 +5,3 @@ | |||
5 | require conf/machine/include/am64xx.inc | 5 | require conf/machine/include/am64xx.inc |
6 | 6 | ||
7 | UBOOT_MACHINE = "am64x_evm_a53_defconfig" | 7 | UBOOT_MACHINE = "am64x_evm_a53_defconfig" |
8 | |||
9 | # Since default tiboot3.bin on AM64x is for SR2.0 HS-FS, add a version for GP | ||
10 | BBMULTICONFIG += "k3r5-gp" | ||
11 | IMAGE_BOOT_FILES += " tiboot3-am64x-gp-evm.bin" | ||
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" | ||
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 0b9a3e59..913d95e6 100644 --- a/conf/machine/include/am64xx.inc +++ b/conf/machine/include/am64xx.inc | |||
@@ -14,10 +14,23 @@ KERNEL_DEVICETREE = " \ | |||
14 | ti/k3-am642-evm-nand.dtbo \ | 14 | ti/k3-am642-evm-nand.dtbo \ |
15 | " | 15 | " |
16 | 16 | ||
17 | # Default tiboot3.bin on AM64x is for SR2.0 HS-FS | ||
17 | BBMULTICONFIG = "k3r5-sr2-hs-fs" | 18 | BBMULTICONFIG = "k3r5-sr2-hs-fs" |
18 | do_image_wic[mcdepends] = "mc::k3r5-sr2-hs-fs:ti-sci-fw:do_deploy" | 19 | do_image_wic[mcdepends] = "mc::k3r5-sr2-hs-fs:ti-sci-fw:do_deploy" |
19 | do_image_tar[mcdepends] = "mc::k3r5-sr2-hs-fs:ti-sci-fw:do_deploy" | 20 | do_image_tar[mcdepends] = "mc::k3r5-sr2-hs-fs:ti-sci-fw:do_deploy" |
20 | 21 | ||
22 | # Since default tiboot3.bin on AM64x is for SR2.0 HS-FS, add a version for GP | ||
23 | BBMULTICONFIG += "k3r5-gp" | ||
24 | IMAGE_BOOT_FILES += " tiboot3-am64x-gp-evm.bin" | ||
25 | do_image_wic[mcdepends] += "mc::k3r5-gp:ti-sci-fw:do_deploy" | ||
26 | do_image_tar[mcdepends] += "mc::k3r5-gp:ti-sci-fw:do_deploy" | ||
27 | |||
28 | # Since default tiboot3.bin on AM64x is for SR2.0 HS-FS, add a version for SR2.0 HS-SE | ||
29 | BBMULTICONFIG += "k3r5-sr2-hs-se" | ||
30 | IMAGE_BOOT_FILES += " tiboot3-am64x_sr2-hs-evm.bin" | ||
31 | do_image_wic[mcdepends] += "mc::k3r5-sr2-hs-se:ti-sci-fw:do_deploy" | ||
32 | do_image_tar[mcdepends] += "mc::k3r5-sr2-hs-se:ti-sci-fw:do_deploy" | ||
33 | |||
21 | TFA_BOARD = "lite" | 34 | TFA_BOARD = "lite" |
22 | OPTEEMACHINE = "k3-am64x" | 35 | OPTEEMACHINE = "k3-am64x" |
23 | OPTEEOUTPUTMACHINE = "k3" | 36 | OPTEEOUTPUTMACHINE = "k3" |