From 60da642e64906fa22c1b32329a2892b03032ac4e Mon Sep 17 00:00:00 2001 From: Taylor Hutt Date: Thu, 2 Jun 2011 13:54:43 -0700 Subject: [PATCH] Fix regression in 'update_kernel.sh' for Tegra2 boards. This 'update_kernel.sh' script gratuitiously broke on ARM targets because the bootloader file has been changed to 'bootloader.bin' from its previous name. TEST=Used the script with a small kernel change to my Arthur board. BUG=none Change-Id: I146f08256543ffe2c4c52995625b26a1b3f28318 Reviewed-on: http://gerrit.chromium.org/gerrit/1989 Reviewed-by: Olof Johansson Reviewed-by: Taylor Hutt Tested-by: Taylor Hutt --- update_kernel.sh | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/update_kernel.sh b/update_kernel.sh index 1291b50237..d6d5c8471d 100755 --- a/update_kernel.sh +++ b/update_kernel.sh @@ -1,6 +1,6 @@ #!/bin/bash -# Copyright (c) 2009-2010 The Chromium OS Authors. All rights reserved. +# Copyright (c) 2009-2011 The Chromium OS Authors. All rights reserved. # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. @@ -87,7 +87,8 @@ function make_kernelimage() { local bootloader_path local kernel_image if [[ "${FLAGS_arch}" == "arm" ]]; then - bootloader_path="${SRC_ROOT}/build/images/${FLAGS_board}/latest/kernel.scr.uimg" + name="bootloader.bin" + bootloader_path="${SRC_ROOT}/build/images/${FLAGS_board}/latest/${name}" kernel_image="/build/${FLAGS_board}/boot/vmlinux.uimg" else bootloader_path="/lib64/bootstub/bootstub.efi"