From 2dd2e8ea91b8265783ffa6afd1d4137e5ae20c57 Mon Sep 17 00:00:00 2001
From: Doug Anderson <dianders@chromium.org>
Date: Fri, 6 Jan 2012 09:32:24 -0800
Subject: [PATCH] Moved setting of kern_guid kernel arg from platform-specific
 to common.

There was no reason for it to be platform-specific.  Original CL
that added it to ARM (it was already there for x86) is:
<http://gerrit.chromium.org/gerrit/1467>

This change is in preparation for moving platform-specific bits
into ebuilds.

BUG=chromium-os:24808
TEST=Validated that kern_guid gets set properly.

Change-Id: I5544ad3730e05128c0a9b0a4a3a8aee80ef31df5
Reviewed-on: https://gerrit.chromium.org/gerrit/13821
Tested-by: Doug Anderson <dianders@chromium.org>
Reviewed-by: Mike Frysinger <vapier@chromium.org>
Reviewed-by: Mandeep Singh Baines <msb@chromium.org>
Commit-Ready: Doug Anderson <dianders@chromium.org>
---
 build_kernel_image.sh | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/build_kernel_image.sh b/build_kernel_image.sh
index e3f4182127..3ea43372f9 100755
--- a/build_kernel_image.sh
+++ b/build_kernel_image.sh
@@ -144,6 +144,7 @@ dm_verity.dev_wait=${dev_wait}
 ${verity_args}
 ${FLAGS_boot_args}
 vt.global_cursor_default=0
+kern_guid=%U
 EOF
 
 WORK="${WORK} ${FLAGS_working_dir}/boot.config"
@@ -166,7 +167,6 @@ noresume
 noswap
 i915.modeset=1
 cros_secure
-kern_guid=%U
 tpm_tis.force=1
 tpm_tis.interrupts=0
 nmi_watchdog=panic,lapic
@@ -179,7 +179,6 @@ elif [[ "${FLAGS_arch}" = "arm" ]]; then
   cat <<EOF | cat - "${FLAGS_working_dir}/boot.config" \
     > "${FLAGS_working_dir}/config.txt"
 earlyprintk
-kern_guid=%U
 vmalloc=234MB
 EOF
   WORK="${WORK} ${FLAGS_working_dir}/config.txt"