summaryrefslogtreecommitdiffstats
path: root/conf
diff options
context:
space:
mode:
authorDenys Dmytriyenko <denys@ti.com>2020-10-10 02:11:48 +0000
committerDan Murphy <dmurphy@ti.com>2020-10-10 11:46:38 -0500
commit8ac0c7576834b515f3d3f3af1211524c0189082c (patch)
tree23af2e3f1e90b19ebbee1041df3e51af654fff82 /conf
parent896afdb67dc12544ae7367fe675f5858349dfc10 (diff)
downloadmeta-ti-8ac0c7576834b515f3d3f3af1211524c0189082c.tar.gz
conf/machine: pass OPTEEFLAVOR via OPTEEMACHINE as <mach>-<flavor>
Recipe in meta-arm doesn't use OPTEEFLAVOR, but optee-os Makefile can extract it from OPTEEMACHINE. Keep OPTEEFLAVOR for legacy platforms - used for HS signing in the output name. Signed-off-by: Denys Dmytriyenko <denys@ti.com> Signed-off-by: Dan Murphy <dmurphy@ti.com>
Diffstat (limited to 'conf')
-rw-r--r--conf/machine/am437x-hs-evm.conf2
-rw-r--r--conf/machine/am57xx-hs-evm.conf2
-rw-r--r--conf/machine/dra7xx-hs-evm.conf2
-rw-r--r--conf/machine/include/am65xx.inc3
-rw-r--r--conf/machine/include/j7.inc3
5 files changed, 5 insertions, 7 deletions
diff --git a/conf/machine/am437x-hs-evm.conf b/conf/machine/am437x-hs-evm.conf
index 34c10166..0a8ca06d 100644
--- a/conf/machine/am437x-hs-evm.conf
+++ b/conf/machine/am437x-hs-evm.conf
@@ -13,6 +13,6 @@ UBOOT_RD_ENTRYPOINT = "0x84000000"
13 13
14TI_SECURE_DEV_PKG = "${TI_SECURE_DEV_PKG_CAT}/am4x" 14TI_SECURE_DEV_PKG = "${TI_SECURE_DEV_PKG_CAT}/am4x"
15 15
16OPTEEMACHINE = "ti" 16OPTEEMACHINE = "ti-am43xx"
17OPTEEFLAVOR = "am43xx" 17OPTEEFLAVOR = "am43xx"
18OPTEEOUTPUTMACHINE = "ti" 18OPTEEOUTPUTMACHINE = "ti"
diff --git a/conf/machine/am57xx-hs-evm.conf b/conf/machine/am57xx-hs-evm.conf
index 4d3eb006..d4f6e098 100644
--- a/conf/machine/am57xx-hs-evm.conf
+++ b/conf/machine/am57xx-hs-evm.conf
@@ -13,7 +13,7 @@ UBOOT_RD_ENTRYPOINT = "0x84000000"
13 13
14TI_SECURE_DEV_PKG = "${TI_SECURE_DEV_PKG_AUTO}/am5x" 14TI_SECURE_DEV_PKG = "${TI_SECURE_DEV_PKG_AUTO}/am5x"
15 15
16OPTEEMACHINE = "ti" 16OPTEEMACHINE = "ti-am57xx"
17OPTEEFLAVOR = "am57xx" 17OPTEEFLAVOR = "am57xx"
18OPTEEOUTPUTMACHINE = "ti" 18OPTEEOUTPUTMACHINE = "ti"
19OPTEEPAGER = "y" 19OPTEEPAGER = "y"
diff --git a/conf/machine/dra7xx-hs-evm.conf b/conf/machine/dra7xx-hs-evm.conf
index 9b029856..da4000f2 100644
--- a/conf/machine/dra7xx-hs-evm.conf
+++ b/conf/machine/dra7xx-hs-evm.conf
@@ -13,7 +13,7 @@ UBOOT_RD_ENTRYPOINT = "0x84000000"
13 13
14TI_SECURE_DEV_PKG = "${TI_SECURE_DEV_PKG_AUTO}/dra7" 14TI_SECURE_DEV_PKG = "${TI_SECURE_DEV_PKG_AUTO}/dra7"
15 15
16OPTEEMACHINE = "ti" 16OPTEEMACHINE = "ti-dra7xx"
17OPTEEFLAVOR = "dra7xx" 17OPTEEFLAVOR = "dra7xx"
18OPTEEOUTPUTMACHINE = "ti" 18OPTEEOUTPUTMACHINE = "ti"
19OPTEEPAGER = "y" 19OPTEEPAGER = "y"
diff --git a/conf/machine/include/am65xx.inc b/conf/machine/include/am65xx.inc
index 1acb205b..67cfabed 100644
--- a/conf/machine/include/am65xx.inc
+++ b/conf/machine/include/am65xx.inc
@@ -21,8 +21,7 @@ KERNEL_DEVICETREE = " \
21 ti/k3-am654-evm-prupwm.dtbo \ 21 ti/k3-am654-evm-prupwm.dtbo \
22" 22"
23 23
24OPTEEMACHINE = "k3" 24OPTEEMACHINE = "k3-am65x"
25OPTEEFLAVOR = "am65x"
26OPTEEOUTPUTMACHINE = "k3" 25OPTEEOUTPUTMACHINE = "k3"
27 26
28# Set the list of device targets for ti-pdk class recipes 27# Set the list of device targets for ti-pdk class recipes
diff --git a/conf/machine/include/j7.inc b/conf/machine/include/j7.inc
index f6d91615..7d326f4a 100644
--- a/conf/machine/include/j7.inc
+++ b/conf/machine/include/j7.inc
@@ -1,8 +1,7 @@
1require conf/machine/include/k3.inc 1require conf/machine/include/k3.inc
2SOC_FAMILY_append = ":j7" 2SOC_FAMILY_append = ":j7"
3 3
4OPTEEMACHINE = "k3" 4OPTEEMACHINE = "k3-j7"
5OPTEEFLAVOR = "j7"
6OPTEEOUTPUTMACHINE = "k3" 5OPTEEOUTPUTMACHINE = "k3"
7 6
8# Set the list of device targets for ti-pdk class recipes 7# Set the list of device targets for ti-pdk class recipes