From 61e0b6b6a5f6dcf838198d9d4a1f4e836f480161 Mon Sep 17 00:00:00 2001
From: Doug Anderson <dianders@chromium.org>
Date: Fri, 7 Dec 2012 12:15:10 -0800
Subject: [PATCH] update_kernel: Don't double-copy the kernel on ARM

On ARM we were copying the kernel twice: one next to the "copying
kernel" message and once in copy_kernelimage() where we just copied
vmlinux.uimg.  Avoid the second copy.

BUG=None
TEST=On ARM with no verity, still found that the kernel got copied.

Change-Id: I2a8124b47d018195c7e4b1657d6caf961d3d4d0b
Reviewed-on: https://gerrit.chromium.org/gerrit/39391
Tested-by: Doug Anderson <dianders@chromium.org>
Reviewed-by: Olof Johansson <olofj@chromium.org>
Reviewed-by: Mike Frysinger <vapier@chromium.org>
Reviewed-by: Mandeep Singh Baines <msb@chromium.org>
Commit-Ready: Doug Anderson <dianders@chromium.org>
---
 update_kernel.sh | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/update_kernel.sh b/update_kernel.sh
index 75b495f237..2b9b2dc92f 100755
--- a/update_kernel.sh
+++ b/update_kernel.sh
@@ -85,12 +85,7 @@ make_kernelimage() {
 }
 
 copy_kernelimage() {
-  if [ "${FLAGS_arch}" == "arm" -a ${REMOTE_VERITY} -eq ${FLAGS_FALSE} ]; then
-    remote_cp_to /build/${FLAGS_board}/boot/vmlinux.uimg /boot
-  fi
-
   remote_cp_to $TMP/new_kern.bin /tmp
-
   remote_sh dd if=/tmp/new_kern.bin of="${FLAGS_partition}"
 }