summaryrefslogtreecommitdiffstats
path: root/conf
diff options
context:
space:
mode:
authorDenys Dmytriyenko <denys@ti.com>2018-06-15 17:55:24 +0000
committerDenys Dmytriyenko <denys@ti.com>2018-06-18 15:49:29 +0000
commit9f454b18128e4907adb6e11342b1f0a08a007462 (patch)
treed45ac6c8459f1f195af8674af687065e459a3485 /conf
parent5d735cff851a08e35081e4d4c4c36123ff040e61 (diff)
downloadmeta-ti-9f454b18128e4907adb6e11342b1f0a08a007462.tar.gz
Revert "conf/machine/*hs*.conf: drop OPTEEOUTPUTMACHINE variable"
This simplification causes more problems than it solves. This reverts commit c01c7f595cadd289a94a2c9f9f863e4bbd75a3c2.
Diffstat (limited to 'conf')
-rw-r--r--conf/machine/am437x-hs-evm.conf1
-rw-r--r--conf/machine/am57xx-hs-evm.conf1
-rw-r--r--conf/machine/dra7xx-hs-evm.conf1
3 files changed, 3 insertions, 0 deletions
diff --git a/conf/machine/am437x-hs-evm.conf b/conf/machine/am437x-hs-evm.conf
index 7b151958..34c10166 100644
--- a/conf/machine/am437x-hs-evm.conf
+++ b/conf/machine/am437x-hs-evm.conf
@@ -15,3 +15,4 @@ TI_SECURE_DEV_PKG = "${TI_SECURE_DEV_PKG_CAT}/am4x"
15 15
16OPTEEMACHINE = "ti" 16OPTEEMACHINE = "ti"
17OPTEEFLAVOR = "am43xx" 17OPTEEFLAVOR = "am43xx"
18OPTEEOUTPUTMACHINE = "ti"
diff --git a/conf/machine/am57xx-hs-evm.conf b/conf/machine/am57xx-hs-evm.conf
index f6e2febb..4d3eb006 100644
--- a/conf/machine/am57xx-hs-evm.conf
+++ b/conf/machine/am57xx-hs-evm.conf
@@ -15,4 +15,5 @@ TI_SECURE_DEV_PKG = "${TI_SECURE_DEV_PKG_AUTO}/am5x"
15 15
16OPTEEMACHINE = "ti" 16OPTEEMACHINE = "ti"
17OPTEEFLAVOR = "am57xx" 17OPTEEFLAVOR = "am57xx"
18OPTEEOUTPUTMACHINE = "ti"
18OPTEEPAGER = "y" 19OPTEEPAGER = "y"
diff --git a/conf/machine/dra7xx-hs-evm.conf b/conf/machine/dra7xx-hs-evm.conf
index 7ca2521d..9b029856 100644
--- a/conf/machine/dra7xx-hs-evm.conf
+++ b/conf/machine/dra7xx-hs-evm.conf
@@ -15,4 +15,5 @@ TI_SECURE_DEV_PKG = "${TI_SECURE_DEV_PKG_AUTO}/dra7"
15 15
16OPTEEMACHINE = "ti" 16OPTEEMACHINE = "ti"
17OPTEEFLAVOR = "dra7xx" 17OPTEEFLAVOR = "dra7xx"
18OPTEEOUTPUTMACHINE = "ti"
18OPTEEPAGER = "y" 19OPTEEPAGER = "y"