From 21815c4665606d1010e72c864ffb211d8bfee026 Mon Sep 17 00:00:00 2001
From: Denys Dmytriyenko <denys@ti.com>
Date: Fri, 15 Jun 2018 17:55:24 +0000
Subject: [PATCH] Revert "conf/machine/*hs*.conf: drop OPTEEOUTPUTMACHINE
 variable"

This simplification causes more problems than it solves.

This reverts commit c01c7f595cadd289a94a2c9f9f863e4bbd75a3c2.
---
 conf/machine/am437x-hs-evm.conf | 1 +
 conf/machine/am57xx-hs-evm.conf | 1 +
 conf/machine/dra7xx-hs-evm.conf | 1 +
 3 files changed, 3 insertions(+)

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"
 
 OPTEEMACHINE = "ti"
 OPTEEFLAVOR = "am43xx"
+OPTEEOUTPUTMACHINE = "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"
 
 OPTEEMACHINE = "ti"
 OPTEEFLAVOR = "am57xx"
+OPTEEOUTPUTMACHINE = "ti"
 OPTEEPAGER = "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"
 
 OPTEEMACHINE = "ti"
 OPTEEFLAVOR = "dra7xx"
+OPTEEOUTPUTMACHINE = "ti"
 OPTEEPAGER = "y"