cros_bundle_firmware: Move fdt selection earlier

At present the fdt preamble flags are updated after the fdt has already
been used by PackFirmware to obtain its parameters. Move the fdt update
earlier so that these flags actually take effect.

The test used on the previous commit was insufficient.


$ cros_bundle_firmware -b daisy -O out -v4

See that vbutil_firmware is invoked with --flags 0 when --force-rw is
used and 1 when it is not.

I would like to test with something like this:

vbutil_firmware --verify out/vblock.vblock-a \
  --signpubkey /usr/share/vboot/devkeys/dev_firmware_data_key.vbpubk \
  --fv out/input.vblock-a

but it always gives this:
ERROR: Error verifying key block.

Change-Id: Iffb996eca818570a69271d986d3b3e46be31c804
(cherry picked from commit 412474f237103a190e09f0c8551cee387b1ec1cb)
Reviewed-by: Hung-Te Lin <>
Reviewed-by: Tom Wai-Hong Tam <>
Tested-by: Simon Glass <>
1 file changed