From d7a8aafa54f41ca2c9621699dcf9a10440d2ccbf Mon Sep 17 00:00:00 2001
From: Olof Johansson <olofj@chromium.org>
Date: Thu, 2 Aug 2012 20:35:47 -0700
Subject: [PATCH] build_kernel_image: fix duplicate options

Don't append common options twice.

BUG=chromium-os:33220
TEST=build image, check bootargs

Change-Id: I632b6a9c7726ff3838e84c51ed8cea77142ba948
Reviewed-on: https://gerrit.chromium.org/gerrit/29134
Reviewed-by: Gaurav Shah <gauravsh@chromium.org>
Reviewed-by: Puneet Kumar <puneetster@chromium.org>
Tested-by: Puneet Kumar <puneetster@chromium.org>
Commit-Ready: Puneet Kumar <puneetster@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 80b17b3165..061970acb9 100755
--- a/build_kernel_image.sh
+++ b/build_kernel_image.sh
@@ -146,8 +146,7 @@ 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"
+  cat <<EOF >> "${FLAGS_working_dir}/config.txt"
 add_efi_memmap
 boot=local
 noresume