Switch to using cros_sign_bootstub.

sys-boot/chromeos-bios/chromeos-bios-0.0.1.ebuild

 # Copyright (c) 2011 The Chromium OS Authors. All rights reserved.
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=2
 
 inherit toolchain-funcs
 
 DESCRIPTION="ChromeOS BIOS builder"
 HOMEPAGE="http://www.chromium.org"
 LICENSE=""
@@ skipping 40 matching lines @@
         grep -E 'CONFIG_CHROMEOS_HWID' ${autoconf} ||
                 die "Failed to extract HWID."
 
         grep -E 'CONFIG_(OFFSET|LENGTH)_\w+' ${autoconf} ||
                 die "Failed to extract offsets and lengths."
 
         cat ${FILESDIR}/firmware_layout_config ||
                 die "Failed to cat firmware_layout_config."
 }
 
-construct_config() {
-        local text_base="0x$1"
-
-        #
-        # 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
-        # needs to be set.
-        #
-        # Currently a bug in cbootimage prevents us from setting Redundancy to
-        # 0.  Redundancy controls how many instances of the BCT should be
-        # written to the signed image.  A value of 1 causes two instances to
-        # be written.
-        #
-        # The BootLoader parameter specifies the bootloader image to use.  It
-        # also specifies the load address for the bootloader in RAM and the
-        # entry point of the resulting image.  For U-Boot these are the same
-        # value (TEXT_BASE).
-        #
-        echo "Bctfile=${bct_file};"
-        echo "Version=1;"
-        echo "Redundancy=1;"
-        echo "BootLoader=${stub_image},${text_base},${text_base},Complete;"
-}
-
 src_compile() {
         hwid=$(get_autoconf CONFIG_CHROMEOS_HWID)
         gbb_size=$(get_autoconf CONFIG_LENGTH_GBB)
 
         construct_layout > layout.py
 
         /usr/share/vboot/bitmaps/make_bmp_images.sh \
                 "${hwid}" \
                 "$(get_screen_geometry)" \
                 "arm"
@@ skipping 11 matching lines @@
         gbb_utility -s \
                 --hwid="${hwid}" \
                 --rootkey=${keys}/root_key.vbpubk \
                 --recoverykey=${keys}/recovery_key.vbpubk \
                 --bmpfv="${bmp_dir}/bmpblk.bin" \
                 gbb.bin ||
                 die "Failed to write keys and HWID to the GBB."
 
         #
         # Sign the bootstub.  This is a combination of the board specific
-        # BCT and the stub U-Boot image.  The cbootimage tool takes a config
-        # file and an output filename to write to.
+        # BCT and the stub U-Boot image.
         #
-        cat ${cfg_file} > boot.cfg ||
-                die "Failed to cat flash configuration file."
-
-        construct_config $(get_text_base) >> boot.cfg ||
-                die "Failed to create boot stub signing configuration file."
-
-        cbootimage boot.cfg bootstub.bin ||
+        cros_sign_bootstub \

[vb, 2011/03/03 04:10:19]

please add to the CL description some information as of where cros_sign_bootstub
comes from (maybe a link to the CL which introduced it).

Hopefully that CL has some information about what this utility does and what
parameters it expects, at the very least it's text would be available.

+                --bct "${bct_file}" \
+                --flash "${cfg_file}" \
+                --bootstub "${stub_image}" \
+                --output bootstub.bin \
+                --text_base "0x$(get_text_base)" ||
                 die "Failed to sign boot stub image."
 
         pack_firmware_image layout.py \
                 KEYDIR=${keys}/ \
                 BOOTSTUB_IMAGE=bootstub.bin \
                 RECOVERY_IMAGE=${recovery_image} \
                 GBB_IMAGE=gbb.bin \
                 FIRMWARE_A_IMAGE=${normal_image} \
                 FIRMWARE_B_IMAGE=${normal_image} \
                 OUTPUT=image.bin ||
                 die "Failed to pack the firmware image."
 }
 
 src_install() {
         insinto /u-boot
-        doins boot.cfg || die
         doins layout.py || die
         doins image.bin || die
         doins bootstub.bin || die
 }