Temporarily disable flash parameter configuration.

The flash parameters need to come after the BCT file in the
cbootimage config file (otherwise they are clobbered by the
BCT's values).  But once they are moved to the correct location
the resulting image doesn't boot.  This change means that
we can only boot from flash devices that are already specified
in the BCT file.

BUG=chromium-os:11981
TEST=Build and Boot from spi on Kaen.

Change-Id: Ic5e92e8057c56bb5c5e2f0e3ca191806c56859f0

Review URL: http://codereview.chromium.org/6609004
diff --git a/host/cros_sign_bootstub b/host/cros_sign_bootstub
index 878f45c..d28216b 100755
--- a/host/cros_sign_bootstub
+++ b/host/cros_sign_bootstub
@@ -34,11 +34,6 @@
   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 @@
   # 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;"
 }
 
 ###############################################################################