commit 55d53d2e4d3606ab3d1c688446fbe335f2c574c0
author LaMont Jones <lamontjones@chromium.org> Tue Jul 09 10:49:07 2019 -0600
committer Bernie Thompson <bhthompson@chromium.org> Thu Jul 11 16:11:33 2019 +0000
tree 633e6a43b47f9a7a15dece2568e3915a5dd5eff4
parent 6bab324c70a1b667232b919b87d75ae69464b7a5

build_kernel_image: avoid duplicate tpm_tis.force= args.

Avoid duplicate args.

BUG=chromium:981924
TEST=tryjob passes

Change-Id: I484d18505b47dd76049705a55ffddb443bd83c29
Reviewed-on: https://chromium-review.googlesource.com/1693123
Tested-by: LaMont Jones <lamontjones@chromium.org>
Commit-Ready: Rajat Jain <rajatja@google.com>
Legacy-Commit-Queue: Commit Bot <commit-bot@chromium.org>
Reviewed-by: Rajat Jain <rajatja@google.com>
(cherry picked from commit e96f2cbe3952107968ffb9711117d86378a9c0e2)

baseboard-hatch/scripts/build_kernel_image.sh

diff --git a/baseboard-hatch/scripts/build_kernel_image.sh b/baseboard-hatch/scripts/build_kernel_image.sh
index a86d6da..be2aa77 100755
--- a/baseboard-hatch/scripts/build_kernel_image.sh
+++ b/baseboard-hatch/scripts/build_kernel_image.sh
@@ -9,6 +9,7 @@
   echo "ramoops.ecc=1" >> "$1"
 
   # Avoid a cosmetic TPM error (Work around for b/113527055)
+  sed -i -e '/tpm_tis.force/d' "$1"
   echo "tpm_tis.force=0" >> "$1"
 
   # Enable S0ix logging using GSMI

chipset-skl/scripts/build_kernel_image.sh

diff --git a/chipset-skl/scripts/build_kernel_image.sh b/chipset-skl/scripts/build_kernel_image.sh
index 33e54cd..016cb02 100755
--- a/chipset-skl/scripts/build_kernel_image.sh
+++ b/chipset-skl/scripts/build_kernel_image.sh
@@ -7,5 +7,6 @@
 modify_kernel_command_line() {
   echo "intel_idle.max_cstate=7" >> "$1"
 # Avoid a cosmetic TPM error (Work around for b/113527055)
+  sed -i -e '/tpm_tis.force/d' "$1"
   echo "tpm_tis.force=0" >> "$1"
 }