build_image: Merge x86 and ARM where possible.

build_gpt.sh

Index: build_gpt.sh
diff --git a/build_gpt.sh b/build_gpt.sh
index 84888a902c1b4ff1f4f595c16cbe77e679cb2cf7..df0f4fc070de3673dc504205cbc814ed89018978 100755
--- a/build_gpt.sh
+++ b/build_gpt.sh
@@ -21,8 +21,6 @@ DEFINE_string arch "" \
   "The target architecture (\"arm\" or \"x86\")."
 DEFINE_string board "$DEFAULT_BOARD" \
   "The board to build an image for."
-DEFINE_string arm_extra_bootargs "" \
-  "Additional command line options to pass to the ARM kernel."
 DEFINE_integer rootfs_partition_size 1024 \
   "rootfs parition size in MBs."
 
@@ -109,8 +107,7 @@ if [ ! -s ${ESP_IMG} ]; then
   exit 1
 fi
 
-# We'll need some code to put in the PMBR, for booting on legacy BIOS. Some ARM
-# systems will use a U-Boot script temporarily, but it goes in the same place.
+# We'll need some code to put in the PMBR, for booting on legacy BIOS.
 if [[ "$ARCH" = "arm" ]]; then
   PMBRCODE=/dev/zero
 else
@@ -122,18 +119,6 @@ fi
 install_gpt $OUTDEV $(numsectors $ROOTFS_IMG) $(numsectors $STATEFUL_IMG) \
     $PMBRCODE $(numsectors $ESP_IMG) false $FLAGS_rootfs_partition_size
 
-if [[ "$ARCH" = "arm" ]]; then
-  # assume /dev/mmcblk1. we could not get this from ${OUTDEV}
-  DEVICE=1
-  MBR_SCRIPT_UIMG=$(make_arm_mbr \
-    ${START_KERN_A} \
-    ${NUM_KERN_SECTORS} \
-    ${DEVICE} \
-    "${FLAGS_arm_extra_bootargs}")
-  sudo dd bs=1 count=`stat --printf="%s" ${MBR_SCRIPT_UIMG}` \
-     if="$MBR_SCRIPT_UIMG" of=${OUTDEV} conv=notrunc
-fi
-
 # Emit helpful scripts for testers, etc.
 ${SCRIPTS_DIR}/emit_gpt_scripts.sh "${OUTDEV}" "${IMAGEDIR}"