From 0679b368c95588b90da3ddf7368ad97efc942a5a Mon Sep 17 00:00:00 2001 From: Sonny Rao Date: Wed, 12 Oct 2011 13:53:19 -0700 Subject: [PATCH] Add amd64 recognition to build_kernel_image.sh This causes the script to treat amd64 the same as x86. BUG=chromium-os:21284 TEST=./build_image for amd64-generic shouldn't generate an invalid architecture error Change-Id: I8f40a827684dde1258158d470a38623a8c936bca Reviewed-on: http://gerrit.chromium.org/gerrit/9963 Reviewed-by: Vince Laviano Tested-by: Sonny Rao Commit-Ready: Sonny Rao --- build_kernel_image.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/build_kernel_image.sh b/build_kernel_image.sh index ea1a22d299..8756b820a9 100755 --- a/build_kernel_image.sh +++ b/build_kernel_image.sh @@ -31,7 +31,7 @@ get_default_board # Flags. DEFINE_string arch "x86" \ - "The boot architecture: arm or x86. (Default: x86)" + "The boot architecture: arm, x86, or amd64. (Default: x86)" DEFINE_string to "/tmp/vmlinuz.image" \ "The path to the kernel image to be created. (Default: /tmp/vmlinuz.image)" DEFINE_string hd_vblock "/tmp/vmlinuz_hd.vblock" \ @@ -148,7 +148,7 @@ EOF WORK="${WORK} ${FLAGS_working_dir}/boot.config" info "Emitted cross-platform boot params to ${FLAGS_working_dir}/boot.config" -if [[ "${FLAGS_arch}" = "x86" ]]; then +if [ "${FLAGS_arch}" = "x86" -o "${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.