From 99961380a639ceaaef0ab3d6cde0affa05da07c4 Mon Sep 17 00:00:00 2001
From: Liam McLoughlin <lmcloughlin@chromium.org>
Date: Mon, 22 Oct 2012 15:59:22 -0400
Subject: [PATCH] Remove now redundant hybrid MBR option (this is handled by
 board scripts now)

BUG=none
TEST=Build image for board that requires hybrid MBR without this flag and
     verify it boots

Change-Id: Idfb7886c28bb887f5fca4607824a5bbf5255fb98
Reviewed-on: https://gerrit.chromium.org/gerrit/36248
Reviewed-by: Don Garrett <dgarrett@chromium.org>
Commit-Ready: Liam McLoughlin <lmcloughlin@chromium.org>
Tested-by: Liam McLoughlin <lmcloughlin@chromium.org>
---
 image_to_usb.sh | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/image_to_usb.sh b/image_to_usb.sh
index d2879ddb14..0d4c03b609 100755
--- a/image_to_usb.sh
+++ b/image_to_usb.sh
@@ -39,8 +39,6 @@ DEFINE_boolean factory_install ${FLAGS_FALSE} \
   "generate a factory install shim"
 DEFINE_boolean factory ${FLAGS_FALSE} \
   "generate a factory runing image, implies autotest and test"
-DEFINE_boolean hybrid_mbr ${FLAGS_FALSE} \
-  "Creates a hybrid MBR rather than a protective one"
 DEFINE_boolean copy_kernel ${FLAGS_FALSE} \
   "copy the kernel to the fourth partition"
 DEFINE_boolean test_image "${FLAGS_FALSE}" \
@@ -367,11 +365,6 @@ if [ -b "${FLAGS_to}" ]; then
       --arch="${FLAGS_arch}" \
       --payload_image="${SRC_IMAGE}" \
       --dst="${FLAGS_to}"
-
-    # Setup hybrid MBR if it was enabled
-    if [[ ${FLAGS_hybrid_mbr} -eq ${FLAGS_TRUE} ]]; then
-      install_hybrid_mbr "${FLAGS_to}"
-    fi
   fi
 elif [[ "${FLAGS_to}" == /dev/* ]]; then
   # Did the user attempt to write to a non-existent block device?