From 325755e9230b504d327fb6fd81be251ba2d3db5e Mon Sep 17 00:00:00 2001
From: Michael Marineau <michael.marineau@coreos.com>
Date: Fri, 16 Aug 2013 21:29:01 -0400
Subject: [PATCH] cleanup(build_image): Remove some unused flags.

Remove --verity_*: Unused, we don't support verity
Remove --usb_disk: Unused, we use PARTUUID now.
Remove --enable_serial: Unused, and serial is enabled for syslinux
---
 bin/cros_make_image_bootable                        | 12 ------------
 build_image                                         |  4 ----
 build_library/build_image_util.sh                   |  3 ---
 build_library/create_legacy_bootloader_templates.sh |  7 -------
 4 files changed, 26 deletions(-)

diff --git a/bin/cros_make_image_bootable b/bin/cros_make_image_bootable
index e68e367994..462f54a7f9 100755
--- a/bin/cros_make_image_bootable
+++ b/bin/cros_make_image_bootable
@@ -95,14 +95,6 @@ DEFINE_boolean enable_rootfs_verification ${FLAGS_FALSE} \
   "Default all bootloaders to NOT use kernel-based root fs integrity checking."
 DEFINE_boolean enable_bootcache ${FLAGS_FALSE} \
   "Default all bootloaders to NOT use bootcache."
-DEFINE_integer verity_error_behavior 3 \
-  "Kernel verified boot error behavior (0: I/O errors, 1: reboot, 2: nothing)"
-DEFINE_integer verity_max_ios -1 \
-  "Number of outstanding I/O operations dm-verity caps at."
-DEFINE_string verity_algorithm "sha1" \
-  "Cryptographic hash algorithm used for kernel vboot."
-DEFINE_string verity_salt "" \
-  "Salt for rootfs hash tree."
 
 DEFINE_string keys_dir "/usr/share/vboot/devkeys" \
   "Directory containing the signing keys."
@@ -141,15 +133,11 @@ DEFINE_boolean enable_squashfs ${FLAGS_FALSE} \
 DEFINE_string squash_sort_file "" \
   "Specify the priority of files when squashing the rootfs."
 
-DEFINE_string enable_serial "" \
-  "Enable serial port for printks. Example values: ttyS0"
 
 # Parse the boot.desc and any overrides
 eval set -- "${BOOT_DESC} ${FLAG_OVERRIDES}"
 FLAGS "${@}" || exit 1
 
-[ -z "${FLAGS_verity_salt}" ] && FLAGS_verity_salt=$(make_salt)
-
 . "${BUILD_LIBRARY_DIR}/board_options.sh" || exit 1
 
 # Only now can we die on error.  shflags functions leak non-zero error codes,
diff --git a/build_image b/build_image
index 9bf6d7fc9e..ad1f87d255 100755
--- a/build_image
+++ b/build_image
@@ -29,10 +29,6 @@ DEFINE_string disk_layout "default" \
   "The disk layout type to use for this image."
 DEFINE_boolean standard_backdoor ${FLAGS_TRUE} \
   "Install standard backdoor credentials for testing"
-DEFINE_string usb_disk /dev/sdb4 \
-  "Path syslinux should use to do a usb boot. Default: /dev/sdb4"
-DEFINE_string enable_serial "" \
-  "Enable serial port for printks. Example values: ttyS0"
 
 # include upload options
 . "${BUILD_LIBRARY_DIR}/release_util.sh" || exit 1
diff --git a/build_library/build_image_util.sh b/build_library/build_image_util.sh
index 25adb9ab6a..978f68c531 100755
--- a/build_library/build_image_util.sh
+++ b/build_library/build_image_util.sh
@@ -104,7 +104,6 @@ create_boot_desc() {
     enable_bootcache_flag=--enable_bootcache
   fi
 
-  [ -z "${FLAGS_verity_salt}" ] && FLAGS_verity_salt=$(make_salt)
   cat <<EOF > ${BUILD_DIR}/boot.desc
   --board=${BOARD}
   --image_type=${image_type}
@@ -112,8 +111,6 @@ create_boot_desc() {
   --keys_dir="${DEVKEYSDIR}"
   --boot_args="${FLAGS_boot_args}"
   --nocleanup_dirs
-  --verity_algorithm=sha1
-  --enable_serial="${FLAGS_enable_serial}"
   ${enable_rootfs_verification_flag}
   ${enable_bootcache_flag}
 EOF
diff --git a/build_library/create_legacy_bootloader_templates.sh b/build_library/create_legacy_bootloader_templates.sh
index 2dcc8c0770..e9ece557a0 100755
--- a/build_library/create_legacy_bootloader_templates.sh
+++ b/build_library/create_legacy_bootloader_templates.sh
@@ -18,19 +18,12 @@ DEFINE_string arch "x86" \
   "The boot architecture: arm or x86. (Default: x86)"
 DEFINE_string to "/tmp/boot" \
   "Path to populate with bootloader templates (Default: /tmp/boot)"
-DEFINE_string usb_disk /dev/sdb3 \
-  "Path syslinux should use to do a usb boot. Default: /dev/sdb3"
 DEFINE_string boot_args "" \
   "Additional boot arguments to pass to the commandline (Default: '')"
 DEFINE_boolean enable_bootcache ${FLAGS_FALSE} \
   "Default all bootloaders to NOT use boot cache."
 DEFINE_boolean enable_rootfs_verification ${FLAGS_FALSE} \
   "Controls if verity is used for root filesystem checking (Default: false)"
-DEFINE_integer verity_error_behavior 3 \
-  "Verified boot error behavior [0: I/O errors, 1: reboot, 2: nothing] \
-(Default: 3)"
-DEFINE_integer verity_max_ios -1 \
-  "Optional number of outstanding I/O operations. (Default: 1024)"
 
 # Parse flags
 FLAGS "$@" || exit 1