diff options
-rw-r--r-- | meta-ti-bsp/conf/machine/am437x-hs-evm.conf | 1 | ||||
-rw-r--r-- | meta-ti-bsp/conf/machine/am57xx-hs-evm.conf | 1 | ||||
-rw-r--r-- | meta-ti-bsp/conf/machine/dra7xx-hs-evm.conf | 1 | ||||
-rw-r--r-- | meta-ti-bsp/conf/machine/include/am62xx.inc | 1 | ||||
-rw-r--r-- | meta-ti-bsp/conf/machine/include/am64xx.inc | 1 | ||||
-rw-r--r-- | meta-ti-bsp/conf/machine/include/am65xx.inc | 1 | ||||
-rw-r--r-- | meta-ti-bsp/conf/machine/include/j7200.inc | 1 | ||||
-rw-r--r-- | meta-ti-bsp/conf/machine/include/j721e.inc | 1 | ||||
-rw-r--r-- | meta-ti-bsp/conf/machine/include/j721s2.inc | 1 | ||||
-rw-r--r-- | meta-ti-bsp/conf/machine/include/j784s4.inc | 1 |
10 files changed, 0 insertions, 10 deletions
diff --git a/meta-ti-bsp/conf/machine/am437x-hs-evm.conf b/meta-ti-bsp/conf/machine/am437x-hs-evm.conf index c3c347e3..bcea9acb 100644 --- a/meta-ti-bsp/conf/machine/am437x-hs-evm.conf +++ b/meta-ti-bsp/conf/machine/am437x-hs-evm.conf | |||
@@ -15,7 +15,6 @@ TI_SECURE_DEV_PKG = "${TI_SECURE_DEV_PKG_CAT}/am4x" | |||
15 | 15 | ||
16 | OPTEEMACHINE = "ti-am43xx" | 16 | OPTEEMACHINE = "ti-am43xx" |
17 | OPTEEFLAVOR = "am43xx" | 17 | OPTEEFLAVOR = "am43xx" |
18 | OPTEEOUTPUTMACHINE = "ti" | ||
19 | 18 | ||
20 | EXTRA_IMAGEDEPENDS += "optee-os" | 19 | EXTRA_IMAGEDEPENDS += "optee-os" |
21 | 20 | ||
diff --git a/meta-ti-bsp/conf/machine/am57xx-hs-evm.conf b/meta-ti-bsp/conf/machine/am57xx-hs-evm.conf index 63b0c052..0f157829 100644 --- a/meta-ti-bsp/conf/machine/am57xx-hs-evm.conf +++ b/meta-ti-bsp/conf/machine/am57xx-hs-evm.conf | |||
@@ -15,7 +15,6 @@ TI_SECURE_DEV_PKG = "${TI_SECURE_DEV_PKG_AUTO}/am5x" | |||
15 | 15 | ||
16 | OPTEEMACHINE = "ti-am57xx" | 16 | OPTEEMACHINE = "ti-am57xx" |
17 | OPTEEFLAVOR = "am57xx" | 17 | OPTEEFLAVOR = "am57xx" |
18 | OPTEEOUTPUTMACHINE = "ti" | ||
19 | OPTEEPAGER = "y" | 18 | OPTEEPAGER = "y" |
20 | 19 | ||
21 | EXTRA_IMAGEDEPENDS += "optee-os" | 20 | EXTRA_IMAGEDEPENDS += "optee-os" |
diff --git a/meta-ti-bsp/conf/machine/dra7xx-hs-evm.conf b/meta-ti-bsp/conf/machine/dra7xx-hs-evm.conf index c80ac13c..02eaf9ee 100644 --- a/meta-ti-bsp/conf/machine/dra7xx-hs-evm.conf +++ b/meta-ti-bsp/conf/machine/dra7xx-hs-evm.conf | |||
@@ -15,7 +15,6 @@ TI_SECURE_DEV_PKG = "${TI_SECURE_DEV_PKG_AUTO}/dra7" | |||
15 | 15 | ||
16 | OPTEEMACHINE = "ti-dra7xx" | 16 | OPTEEMACHINE = "ti-dra7xx" |
17 | OPTEEFLAVOR = "dra7xx" | 17 | OPTEEFLAVOR = "dra7xx" |
18 | OPTEEOUTPUTMACHINE = "ti" | ||
19 | OPTEEPAGER = "y" | 18 | OPTEEPAGER = "y" |
20 | 19 | ||
21 | EXTRA_IMAGEDEPENDS += "optee-os" | 20 | EXTRA_IMAGEDEPENDS += "optee-os" |
diff --git a/meta-ti-bsp/conf/machine/include/am62xx.inc b/meta-ti-bsp/conf/machine/include/am62xx.inc index a5aad994..9d8bc87c 100644 --- a/meta-ti-bsp/conf/machine/include/am62xx.inc +++ b/meta-ti-bsp/conf/machine/include/am62xx.inc | |||
@@ -19,4 +19,3 @@ TFA_BOARD = "lite" | |||
19 | TFA_K3_SYSTEM_SUSPEND = "1" | 19 | TFA_K3_SYSTEM_SUSPEND = "1" |
20 | 20 | ||
21 | OPTEEMACHINE = "k3-am62x" | 21 | OPTEEMACHINE = "k3-am62x" |
22 | OPTEEOUTPUTMACHINE = "k3" | ||
diff --git a/meta-ti-bsp/conf/machine/include/am64xx.inc b/meta-ti-bsp/conf/machine/include/am64xx.inc index 055f6036..7c46b630 100644 --- a/meta-ti-bsp/conf/machine/include/am64xx.inc +++ b/meta-ti-bsp/conf/machine/include/am64xx.inc | |||
@@ -33,4 +33,3 @@ do_image_tar[mcdepends] += "mc::k3r5-sr2-hs-se:ti-sci-fw:do_deploy" | |||
33 | 33 | ||
34 | TFA_BOARD = "lite" | 34 | TFA_BOARD = "lite" |
35 | OPTEEMACHINE = "k3-am64x" | 35 | OPTEEMACHINE = "k3-am64x" |
36 | OPTEEOUTPUTMACHINE = "k3" | ||
diff --git a/meta-ti-bsp/conf/machine/include/am65xx.inc b/meta-ti-bsp/conf/machine/include/am65xx.inc index 80aa6d27..14e0d07f 100644 --- a/meta-ti-bsp/conf/machine/include/am65xx.inc +++ b/meta-ti-bsp/conf/machine/include/am65xx.inc | |||
@@ -38,4 +38,3 @@ do_image_wic[mcdepends] += "mc::k3r5-sr2:ti-sci-fw:do_deploy" | |||
38 | do_image_tar[mcdepends] += "mc::k3r5-sr2:ti-sci-fw:do_deploy" | 38 | do_image_tar[mcdepends] += "mc::k3r5-sr2:ti-sci-fw:do_deploy" |
39 | 39 | ||
40 | OPTEEMACHINE = "k3-am65x" | 40 | OPTEEMACHINE = "k3-am65x" |
41 | OPTEEOUTPUTMACHINE = "k3" | ||
diff --git a/meta-ti-bsp/conf/machine/include/j7200.inc b/meta-ti-bsp/conf/machine/include/j7200.inc index 3aedb3f8..1eaf7806 100644 --- a/meta-ti-bsp/conf/machine/include/j7200.inc +++ b/meta-ti-bsp/conf/machine/include/j7200.inc | |||
@@ -2,4 +2,3 @@ require conf/machine/include/k3.inc | |||
2 | SOC_FAMILY:append = ":j7200" | 2 | SOC_FAMILY:append = ":j7200" |
3 | 3 | ||
4 | OPTEEMACHINE = "k3-j721e" | 4 | OPTEEMACHINE = "k3-j721e" |
5 | OPTEEOUTPUTMACHINE = "k3" | ||
diff --git a/meta-ti-bsp/conf/machine/include/j721e.inc b/meta-ti-bsp/conf/machine/include/j721e.inc index 8a6c2bec..34569a01 100644 --- a/meta-ti-bsp/conf/machine/include/j721e.inc +++ b/meta-ti-bsp/conf/machine/include/j721e.inc | |||
@@ -2,7 +2,6 @@ require conf/machine/include/k3.inc | |||
2 | SOC_FAMILY:append = ":j721e" | 2 | SOC_FAMILY:append = ":j721e" |
3 | 3 | ||
4 | OPTEEMACHINE = "k3-j721e" | 4 | OPTEEMACHINE = "k3-j721e" |
5 | OPTEEOUTPUTMACHINE = "k3" | ||
6 | 5 | ||
7 | MACHINE_FEATURES += "gpu" | 6 | MACHINE_FEATURES += "gpu" |
8 | 7 | ||
diff --git a/meta-ti-bsp/conf/machine/include/j721s2.inc b/meta-ti-bsp/conf/machine/include/j721s2.inc index 4959ad8f..2a60458e 100644 --- a/meta-ti-bsp/conf/machine/include/j721s2.inc +++ b/meta-ti-bsp/conf/machine/include/j721s2.inc | |||
@@ -2,7 +2,6 @@ require conf/machine/include/k3.inc | |||
2 | SOC_FAMILY:append = ":j721s2" | 2 | SOC_FAMILY:append = ":j721s2" |
3 | 3 | ||
4 | OPTEEMACHINE = "k3-j721e" | 4 | OPTEEMACHINE = "k3-j721e" |
5 | OPTEEOUTPUTMACHINE = "k3" | ||
6 | 5 | ||
7 | MACHINE_FEATURES += "gpu" | 6 | MACHINE_FEATURES += "gpu" |
8 | 7 | ||
diff --git a/meta-ti-bsp/conf/machine/include/j784s4.inc b/meta-ti-bsp/conf/machine/include/j784s4.inc index 83d7c760..e2f053ac 100644 --- a/meta-ti-bsp/conf/machine/include/j784s4.inc +++ b/meta-ti-bsp/conf/machine/include/j784s4.inc | |||
@@ -2,7 +2,6 @@ require conf/machine/include/k3.inc | |||
2 | SOC_FAMILY:append = ":j784s4" | 2 | SOC_FAMILY:append = ":j784s4" |
3 | 3 | ||
4 | OPTEEMACHINE = "k3-j721e" | 4 | OPTEEMACHINE = "k3-j721e" |
5 | OPTEEOUTPUTMACHINE = "k3" | ||
6 | 5 | ||
7 | MACHINE_FEATURES += "gpu" | 6 | MACHINE_FEATURES += "gpu" |
8 | 7 | ||