Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2365)

Unified Diff: build_image

Issue 3448022: build_image: Merge x86 and ARM where possible. (Closed) Base URL: ssh://git@gitrw.chromium.org:9222/crosutils.git
Patch Set: Codereview ate my homework. Created 10 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « build_gpt.sh ('k') | create_esp.sh » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: build_image
diff --git a/build_image b/build_image
index 7620d0af7fdbe6e82ba29f2d052a001a29378d9d..2df9a3cc055f81a9ef443f1f8a2ea820099b12e9 100755
--- a/build_image
+++ b/build_image
@@ -49,8 +49,6 @@ DEFINE_boolean factory_install ${FLAGS_FALSE} \
is also required in image_to_usb."
DEFINE_boolean dev_install ${FLAGS_FALSE} \
"Build a smaller image to overlay the dev recovery install shim on"
-DEFINE_string arm_extra_bootargs "" \
- "Additional command line options to pass to the ARM kernel."
DEFINE_integer rootfs_partition_size 1024 \
"rootfs partition size in MiBs."
DEFINE_integer rootfs_size 720 \
@@ -360,7 +358,6 @@ create_boot_desc() {
--verity_algorithm="${FLAGS_verity_algorithm}"
--keys_dir="${DEVKEYSDIR}"
--usb_disk="${FLAGS_usb_disk}"
- --arm_extra_bootargs="${FLAGS_arm_extra_bootargs}"
--nocleanup_dirs
${enable_rootfs_verification_flag}
EOF
@@ -637,8 +634,7 @@ create_base_image() {
# cros_make_image_bootable will clobber vmlinuz.image for x86.
# Until then, just copy the kernel to vmlinuz.image. It is
- # expected in build_gpt.sh and needed by ARM until it supports the
- # full, signed kernel partition format.
+ # expected in build_gpt.sh.
cp "${ROOT_FS_DIR}/boot/vmlinuz" "${OUTPUT_DIR}/vmlinuz.image"
# Create an empty esp image to be updated in by update_bootloaders.sh.
@@ -652,7 +648,6 @@ create_base_image() {
${SCRIPTS_DIR}/build_gpt.sh \
--arch=${ARCH} \
--board=${FLAGS_board} \
- --arm_extra_bootargs="${FLAGS_arm_extra_bootargs}" \
--rootfs_partition_size=${FLAGS_rootfs_partition_size} \
"${OUTPUT_DIR}" \
"${OUTPUT_DIR}/${image_name}"
« no previous file with comments | « build_gpt.sh ('k') | create_esp.sh » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698