From 1eafb5a351bfdedcd040b7334e12d3ac73d4ace5 Mon Sep 17 00:00:00 2001
From: Olof Johansson <olofj@chromium.org>
Date: Wed, 1 Aug 2012 00:04:30 -0700
Subject: [PATCH] build_kernel_image: turn off earlyprintk and make options
 common on ARM/x86

Also move the creation of config.txt to common code and add some of the
options that both platform should use to it.

BUG=chrome-os-partner:11403
TEST=build, boot

Change-Id: I9c6eed3bf05c9f0744063c1baf321bf6d24dc9cc
Reviewed-on: https://gerrit.chromium.org/gerrit/28914
Tested-by: Olof Johansson <olofj@chromium.org>
Reviewed-by: Doug Anderson <dianders@chromium.org>
Commit-Ready: Olof Johansson <olofj@chromium.org>
---
 build_kernel_image.sh | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/build_kernel_image.sh b/build_kernel_image.sh
index 3473f1e23c..80b17b3165 100755
--- a/build_kernel_image.sh
+++ b/build_kernel_image.sh
@@ -132,23 +132,27 @@ EOF
 WORK="${WORK} ${FLAGS_working_dir}/boot.config"
 info "Emitted cross-platform boot params to ${FLAGS_working_dir}/boot.config"
 
-if [[ "${FLAGS_arch}" = "x86" || "${FLAGS_arch}" = "amd64" ]]; then
-  # Legacy BIOS will use the kernel in the rootfs (via syslinux), as will
-  # standard EFI BIOS (via grub, from the EFI System Partition). Chrome OS
-  # BIOS will use a separate signed kernel partition, which we'll create now.
-  # FIXME: remove serial output, debugging messages.
-  cat <<EOF | cat - "${FLAGS_working_dir}/boot.config" \
-    > "${FLAGS_working_dir}/config.txt"
+# Add common boot options first.
+cat <<EOF | cat - "${FLAGS_working_dir}/boot.config" \
+  > "${FLAGS_working_dir}/config.txt"
 quiet
 loglevel=0
 console=tty2
 init=/sbin/init
+cros_secure
+EOF
+
+if [[ "${FLAGS_arch}" = "x86" || "${FLAGS_arch}" = "amd64" ]]; then
+  # Legacy BIOS will use the kernel in the rootfs (via syslinux), as will
+  # standard EFI BIOS (via grub, from the EFI System Partition). Chrome OS
+  # BIOS will use a separate signed kernel partition, which we'll create now.
+  cat <<EOF | cat - "${FLAGS_working_dir}/boot.config" \
+    >> "${FLAGS_working_dir}/config.txt"
 add_efi_memmap
 boot=local
 noresume
 noswap
 i915.modeset=1
-cros_secure
 tpm_tis.force=1
 tpm_tis.interrupts=0
 nmi_watchdog=panic,lapic
@@ -158,10 +162,6 @@ EOF
   bootloader_path="/lib64/bootstub/bootstub.efi"
   kernel_image="${FLAGS_vmlinuz}"
 elif [[ "${FLAGS_arch}" = "arm" ]]; then
-  cat <<EOF | cat - "${FLAGS_working_dir}/boot.config" \
-    > "${FLAGS_working_dir}/config.txt"
-earlyprintk
-EOF
   WORK="${WORK} ${FLAGS_working_dir}/config.txt"
 
   # arm does not need/have a bootloader in kernel partition