The following revision refers to this bug:
  https://chromium.googlesource.com/chromiumos/overlays/chromiumos-overlay/+/63846893ff1fbbae342c70950ea1973fa25a5e46

commit 63846893ff1fbbae342c70950ea1973fa25a5e46
Author: Darren Krahn <dkrahn@google.com>
Date: Thu Jun 23 20:24:45 2016

tpm2,trunks: Get the TPM2 simulator working for trunks.

BUG= chromium:622829 
TEST=manual

Change-Id: I1ebb0b61be8fdbf24ef7c7996c4ebdabbc6fed51
Reviewed-on: https://chromium-review.googlesource.com/355661
Commit-Ready: Darren Krahn <dkrahn@chromium.org>
Tested-by: Darren Krahn <dkrahn@chromium.org>
Reviewed-by: Andrey Pronin <apronin@chromium.org>

[modify] https://crrev.com/63846893ff1fbbae342c70950ea1973fa25a5e46/chromeos-base/trunks/trunks-9999.ebuild
[modify] https://crrev.com/63846893ff1fbbae342c70950ea1973fa25a5e46/chromeos-base/tpm2/tpm2-9999.ebuild

The following revision refers to this bug:
  https://chromium.googlesource.com/aosp/platform/system/tpm/+/74bf1c9a3a45994780b1d86d2da0015c8f0807e8

commit 74bf1c9a3a45994780b1d86d2da0015c8f0807e8
Author: Darren Krahn <dkrahn@google.com>
Date: Thu Jun 23 19:47:54 2016

trunks: Get the simulator working on Chrome OS.

BUG= chromium:622829 
TEST=manual

Change-Id: Ia11e18d83b83c92d7b34c57033d9d4e3cc885bcd
Reviewed-on: https://chromium-review.googlesource.com/355700
Commit-Ready: Darren Krahn <dkrahn@chromium.org>
Tested-by: Darren Krahn <dkrahn@chromium.org>
Reviewed-by: Andrey Pronin <apronin@chromium.org>

[modify] https://crrev.com/74bf1c9a3a45994780b1d86d2da0015c8f0807e8/trunks/trunksd-seccomp-mips.policy
[modify] https://crrev.com/74bf1c9a3a45994780b1d86d2da0015c8f0807e8/trunks/tpm_simulator_handle.cc
[modify] https://crrev.com/74bf1c9a3a45994780b1d86d2da0015c8f0807e8/trunks/trunksd-seccomp-arm64.policy
[modify] https://crrev.com/74bf1c9a3a45994780b1d86d2da0015c8f0807e8/trunks/trunksd-seccomp-amd64.policy
[modify] https://crrev.com/74bf1c9a3a45994780b1d86d2da0015c8f0807e8/trunks/trunksd-seccomp-x86.policy
[modify] https://crrev.com/74bf1c9a3a45994780b1d86d2da0015c8f0807e8/trunks/trunksd-seccomp-arm.policy
[modify] https://crrev.com/74bf1c9a3a45994780b1d86d2da0015c8f0807e8/trunks/trunksd.cc
[modify] https://crrev.com/74bf1c9a3a45994780b1d86d2da0015c8f0807e8/trunks/trunksd-seccomp-x86_64.policy
[modify] https://crrev.com/74bf1c9a3a45994780b1d86d2da0015c8f0807e8/trunks/tpm_simulator_handle.h
[modify] https://crrev.com/74bf1c9a3a45994780b1d86d2da0015c8f0807e8/trunks/trunks.gyp

The following revision refers to this bug:
  https://chromium.googlesource.com/chromiumos/platform2/+/0f16f667487a09a373ef4e3d02db43610e3fb237

commit 0f16f667487a09a373ef4e3d02db43610e3fb237
Author: Darren Krahn <dkrahn@google.com>
Date: Thu Jun 23 20:59:32 2016

common-mk: Add a variable for the TPM2 simulator.

BUG= chromium:622829 
TEST=build

Change-Id: Iebe74267e05250164afec6d52ecd0197ed619bea
Reviewed-on: https://chromium-review.googlesource.com/355730
Commit-Ready: Darren Krahn <dkrahn@chromium.org>
Tested-by: Darren Krahn <dkrahn@chromium.org>
Reviewed-by: Andrey Pronin <apronin@chromium.org>

[modify] https://crrev.com/0f16f667487a09a373ef4e3d02db43610e3fb237/common-mk/common.gypi

The following revision refers to this bug:
  https://chromium.googlesource.com/chromiumos/overlays/chromiumos-overlay/+/a673044b209b32cf96c375f3c93418dc829f92a3

commit a673044b209b32cf96c375f3c93418dc829f92a3
Author: Andrey Pronin <apronin@google.com>
Date: Fri Jun 24 19:11:25 2016

trunks: Start trunksd in simulator mode if built with simulator

Start trunksd with --simulator flag if USE includes tpm2_simulator

BUG= chromium:622829 
TEST=build with USE="-tpm tpm2 tpm2_simulator", boot, see what starts

CL-DEPEND=CL:356216

Change-Id: I5d49466af0af94a3d42c796d76f473922f0c818e
Reviewed-on: https://chromium-review.googlesource.com/356188
Commit-Ready: Andrey Pronin <apronin@chromium.org>
Tested-by: Andrey Pronin <apronin@chromium.org>
Reviewed-by: Darren Krahn <dkrahn@chromium.org>

[modify] https://crrev.com/a673044b209b32cf96c375f3c93418dc829f92a3/chromeos-base/trunks/trunks-9999.ebuild

The following revision refers to this bug:
  https://chromium.googlesource.com/aosp/platform/system/tpm/+/ca9bdc109fb7230452f6d0f9f54f81bf210807f6

commit ca9bdc109fb7230452f6d0f9f54f81bf210807f6
Author: Andrey Pronin <apronin@google.com>
Date: Sat Jun 25 01:32:15 2016

trunks: add special .conf file for simulated mode

Create a special file to be used in case of USE="tpm2_simulator"
as /etc/init/trunksd.conf to start trunksd in simulated mode

BUG= chromium:622829 
TEST=none, to be combined with subsequent CLs

Change-Id: Ic8695932e2f5f56cfca2e20d1bf395f7a30dc267
Reviewed-on: https://chromium-review.googlesource.com/356216
Commit-Ready: Andrey Pronin <apronin@chromium.org>
Tested-by: Andrey Pronin <apronin@chromium.org>
Reviewed-by: Andrey Pronin <apronin@chromium.org>

[add] https://crrev.com/ca9bdc109fb7230452f6d0f9f54f81bf210807f6/trunks/trunksd.conf.tpm2_simulator