build_image: Merge x86 and ARM where possible.

build_gpt.sh

 #!/bin/bash
 #
 # Copyright (c) 2010 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.
 #
 # Load common constants.  This should be the first executable line.
 # The path to common.sh should be relative to your script's location.
 . "$(dirname "$0")/common.sh"
 
 # Load functions and constants for chromeos-install
 . "$(dirname "$0")/chromeos-common.sh"
 
 # Script must be run inside the chroot.
 restart_in_chroot_if_needed $*
 
 get_default_board
 
 # Flags.
 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."
 
 # Usage.
 FLAGS_HELP=$(cat <<EOF
 
 Usage: $(basename $0) [flags] IMAGEDIR OUTDEV
 
 This takes the image components in IMAGEDIR and creates a bootable,
 GPT-formatted image in OUTDEV. OUTDEV can be a file or block device.
@@ skipping 66 matching lines @@
   error "Can't find ${OEM_IMG}"
   exit 1
 fi
 
 ESP_IMG="${IMAGEDIR}/esp.image"
 if [ ! -s ${ESP_IMG} ]; then
   error "Can't find ${ESP_IMG}"
   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
   PMBRCODE=$(readlink -f /usr/share/syslinux/gptmbr.bin)
 fi
 
 # Create the GPT. This has the side-effect of setting some global vars
 # describing the partition table entries (see the comments in the source).
 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}"
 
 sudo=
 if [ ! -w "$OUTDEV" ] ; then
   # use sudo when writing to a block device.
   sudo=sudo
 fi
 
 # Now populate the partitions.
@@ skipping 11 matching lines @@
 $sudo dd if=${ROOTFS_IMG} of=${OUTDEV} conv=notrunc bs=512 \
     seek=${START_ROOTFS_A}
 
 echo "Copying EFI system partition..."
 $sudo dd if=${ESP_IMG} of=${OUTDEV} conv=notrunc bs=512 seek=${START_ESP}
 
 # Clean up temporary files.
 if [[ -n "${MBR_IMG:-}" ]]; then
   rm "${MBR_IMG}"
 fi