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

Unified Diff: host/cros_sign_bootstub

Issue 6609004: Temporarily disable flash parameter configuration. (Closed) Base URL: ssh://git@gitrw.chromium.org:9222/dev-util.git@master
Patch Set: Move empty echo's into comment and add tracker item for TODO. Created 9 years, 10 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 | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: host/cros_sign_bootstub
diff --git a/host/cros_sign_bootstub b/host/cros_sign_bootstub
index 878f45cc5ccb07862898b23c97443dc4b788e3f7..d28216b7afd2ae2a6dca795aebaf5350ac3885c3 100755
--- a/host/cros_sign_bootstub
+++ b/host/cros_sign_bootstub
@@ -34,11 +34,6 @@ function construct_config() {
local text_base="$4"
#
- # First we output the boot flash configuration file.
- #
- cat ${flash_file}
-
- #
# The cbootimage config file format is not yet documented. Below is
# a minimal config file that merges a BCT file and bootloader; in
# this case our stub U-Boot image. We do not use the Version, but it
@@ -54,11 +49,21 @@ function construct_config() {
# entry point of the resulting image. For U-Boot these are the same
# value (TEXT_BASE).
#
- echo ""
- echo "Bctfile=${bct_file};"
- echo "Version=1;"
- echo "Redundancy=1;"
- echo "BootLoader=${bootstub},${text_base},${text_base},Complete;"
+ echo "Bctfile = ${bct_file};"
+ echo "Version = 1;"
+ echo "Redundancy = 1;"
+
+ # TODO(robotboy): This needs to be added back in to support selecting the
+ # boot flash device. With this commented out we can only boot from the
+ # boot device that the source BCT file was created for. This is commented
+ # out because it causes the resulting image to not boot if it is added.
+ # TRACKER: http://code.google.com/p/chromium-os/issues/detail?id=12712
+ #
+ # echo ""
+ # cat ${flash_file}
+ # echo ""
+
+ echo "BootLoader = ${bootstub},${text_base},${text_base},Complete;"
}
###############################################################################
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698