summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* sign_official_build: support new firmware updater repacking methodfactory-1020.BHung-Te Lin2011-09-091-35/+59
| | | | | | | | | | | | | | | | | | To prevent hard-coding the procedure to repack a firmware updater, this CL supports using new "--sb_repack" mode supported by updater so that signer does not need to care about how the updater is packed anymore. BUG=chromium-os:20027 TEST=./sign_official_build.sh ssd \ ~/trunk/src/build/images/x86-zgb/latest/chromiumos_image.bin \ ../../tests/devkeys \ ~/trunk/src/build/images/x86-zgb/latest/chromiumos_new_image.bin # success Change-Id: I035dfaa86b05b85748e69ec039769b0c08d33f64 Reviewed-on: http://gerrit.chromium.org/gerrit/7311 Tested-by: Hung-Te Lin <hungte@chromium.org> Reviewed-by: Gaurav Shah <gauravsh@chromium.org>
* Add unit tests for vboot_api_firmware.cRandall Spangler2011-09-092-0/+295
| | | | | | | | | | BUG=chromium-os:17564 TEST=make && make runtests Change-Id: I030c204527e1c17b8d6523beec3b7604a638fc98 Reviewed-on: http://gerrit.chromium.org/gerrit/7444 Reviewed-by: Bill Richardson <wfrichar@chromium.org> Tested-by: Randall Spangler <rspangler@chromium.org>
* Change debug messages to use 1-based GPT partition numbers.Bill Richardson2011-09-082-3/+6
| | | | | | | | | | BUG=none TEST=none Change-Id: Ib717f1008edbb6c11d73fbe42d533ebe45800a45 Reviewed-on: http://gerrit.chromium.org/gerrit/7410 Reviewed-by: Randall Spangler <rspangler@chromium.org> Tested-by: Bill Richardson <wfrichar@chromium.org>
* Fix bug in recognizing bad image files.Bill Richardson2011-09-083-2/+4
| | | | | | | | | | | | | BUG=none TEST=manual make make runtests Change-Id: I8456c25187e01666cc46bad50813e8a4d268f1bc Reviewed-on: http://gerrit.chromium.org/gerrit/7409 Reviewed-by: Randall Spangler <rspangler@chromium.org> Tested-by: Bill Richardson <wfrichar@chromium.org>
* Tweak a bit to clean up alignment and one non-rendering character.Bill Richardson2011-09-0712-144/+158
| | | | | | | | | | | BUG=chromium-os:13037 TEST=none Change-Id: Ib2a18e44753fd82eb3e2c8aed456abfa4165c235 Reviewed-on: http://gerrit.chromium.org/gerrit/7376 Reviewed-by: Randall Spangler <rspangler@chromium.org> Reviewed-by: Bill Richardson <wfrichar@chromium.org> Tested-by: Bill Richardson <wfrichar@chromium.org>
* vboot_reference: update localized bitmapsHung-Te Lin2011-09-0755-0/+0
| | | | | | | | | | | | | | | | | There were some locale bitmaps displayed as question marks (like ???) due to missing font with ImageMagick. Since we use Pango now, this CL updates the bitmaps from those locales: ar el fa hi iw ja ko th vi zh_CN zh_TW BUG=chromium-os:13037 TEST=for X in ar el fa hi iw ja ko th vi zh_CN zh_TW; do display $X; done # all pictures looks fine - at least no question marks anymore Change-Id: I4b4c443d6afb25cf603f3371a47677744ea9358d Reviewed-on: http://gerrit.chromium.org/gerrit/7326 Reviewed-by: Bill Richardson <wfrichar@chromium.org> Tested-by: Hung-Te Lin <hungte@chromium.org>
* vboot_reference: add pango based text_to_bmp converterHung-Te Lin2011-09-061-37/+28
| | | | | | | | | | | | | pango provides TTF fontset rendering, which solves i18n text issue. BUG=chromium-os:13037 TEST=./text_to_bmp localized_text/ja/*.txt display localized_text/ja/*.bmp $ looks fine Change-Id: Id2731efa131516125ea9bd27016d44cdd4c50974 Reviewed-on: http://gerrit.chromium.org/gerrit/7152 Reviewed-by: Bill Richardson <wfrichar@chromium.org> Tested-by: Hung-Te Lin <hungte@chromium.org>
* Add unit tests for vboot_api_init.cRandall Spangler2011-09-063-1/+276
| | | | | | | | | | BUG=chromium-os:17564 TEST=make && make runtests Change-Id: Idca158e82d1ea102221ea3b51d445fadee9d2794 Reviewed-on: http://gerrit.chromium.org/gerrit/7183 Reviewed-by: Luigi Semenzato <semenzato@chromium.org> Tested-by: Randall Spangler <rspangler@chromium.org>
* Display sha1sums in BIOS debug infotest-982.Bfactory-980.BBill Richardson2011-09-011-2/+37
| | | | | | | | | | | | BUG=none TEST=manual Press 'TAB' at any BIOS screen. You should see some sha1sums. Change-Id: Id2f034ad198e4c9c53ab2f2a8fa6195f3479f6aa Reviewed-on: http://gerrit.chromium.org/gerrit/7101 Reviewed-by: Randall Spangler <rspangler@chromium.org> Tested-by: Bill Richardson <wfrichar@chromium.org>
* Add tests for vboot_firmware.cRandall Spangler2011-09-015-12/+444
| | | | | | | | | | | | | | | Yaay, LoadFirmware() finally has unit tests! Fix minor memory leak in LoadFirmware(). BUG=chromium-os:17564 TEST=make && make runtests Change-Id: I7eabc14484271f488b77f286e846781ccc22b8f2 (cherry picked from commit 2b7c5635d7069c55a1d96d11b99d02291b7e308b) Reviewed-on: http://gerrit.chromium.org/gerrit/7052 Reviewed-by: Bill Richardson <wfrichar@chromium.org> Tested-by: Randall Spangler <rspangler@chromium.org>
* Add tests for rsa_utility.cRandall Spangler2011-09-016-8/+250
| | | | | | | | | | BUG=chromium-os:17564 TEST=make && make runtests Change-Id: Ia86241f5407ba53d93d3862b29c61b510e560e92 Reviewed-on: http://gerrit.chromium.org/gerrit/6959 Reviewed-by: Bill Richardson <wfrichar@chromium.org> Tested-by: Randall Spangler <rspangler@chromium.org>
* Determine GPIO base from /sys/class/gpio/gpiochip<N>Bill Richardson2011-08-311-13/+39
| | | | | | | | | | | | | | | ... instead of using hard-coded 192 constant. BUG=chromium-os:19876 TEST=manual If crossystem still reports correct values for devsw_cur recoverysw_cur (and maybe wpsw_cur, although that's a separate bug), then it works. Change-Id: Id8d4fb389bfd78f40da9ef08aa372071d77cbec1 Reviewed-on: http://gerrit.chromium.org/gerrit/7014 Reviewed-by: Bill Richardson <wfrichar@chromium.org> Tested-by: Bill Richardson <wfrichar@chromium.org>
* gbb_utility: add --flags parameter.Hung-Te Lin2011-08-293-28/+156
| | | | | | | | | | | | | | | | | | The --flags is added to get/set the "flags" field. BUG=chrome-os-partner:2317 TEST=gbb_utiltiy --get --flags bios.bin # see flags as 0 gbb_utility --set --flags=0x3052 bios.bin # for version error message for GBB1.0 files, # and see flag value changed for GBB1.1+ files gbb_utility --get --flags bios.bin # flag as 0 for GBB1.0, 0x3052 for GBB1.1+ Change-Id: I7aab62c8fc32ea08b4822e496f543511ff5e5ebc Reviewed-on: http://gerrit.chromium.org/gerrit/6721 Reviewed-by: Bill Richardson <wfrichar@chromium.org> Reviewed-by: Randall Spangler <rspangler@chromium.org> Tested-by: Hung-Te Lin <hungte@chromium.org>
* Add more tests for rsa.c.Randall Spangler2011-08-291-19/+63
| | | | | | | | | | | BUG=chromium-os:17564 TEST=make && make runtests Change-Id: Ib1cdb139b695a648fc500ad61c58efc86c7940a9 (cherry picked from commit 5178f3ce82020e8caa287ceee47f9556c0b3bae8) Reviewed-on: http://gerrit.chromium.org/gerrit/6860 Reviewed-by: Gaurav Shah <gauravsh@chromium.org> Tested-by: Randall Spangler <rspangler@chromium.org>
* Fix makefile typoRandall Spangler2011-08-291-1/+1
| | | | | | | | | | BUG=none TEST=emerge-tegra2_aebl vboot_reference Change-Id: Idc792a1e8b9636a3959fecfde85110e560a64895 Reviewed-on: http://gerrit.chromium.org/gerrit/6836 Reviewed-by: Randall Spangler <rspangler@chromium.org> Tested-by: Randall Spangler <rspangler@chromium.org>
* Remaining unit tests for rollback_index.cRandall Spangler2011-08-293-40/+439
| | | | | | | | | | BUG=chromium-os:17564 TEST=make && make runtests Change-Id: If2fbfb788bc3199603c8646e8f1c9e061199bc6f Reviewed-on: http://gerrit.chromium.org/gerrit/6832 Reviewed-by: Bill Richardson <wfrichar@chromium.org> Tested-by: Randall Spangler <rspangler@chromium.org>
* Partial unit tests for rollback_indexRandall Spangler2011-08-266-33/+330
| | | | | | | | | | | BUG=chromium-os:17564 TEST=make && make runtests Change-Id: I8ea6bcc15f277e10c5b8539f2ea19ad90be34889 Reviewed-on: http://gerrit.chromium.org/gerrit/6770 Reviewed-by: Bill Richardson <wfrichar@chromium.org> Reviewed-by: Stefan Reinauer <reinauer@chromium.org> Tested-by: Randall Spangler <rspangler@chromium.org>
* Fix image verify with new key-value verity paramsGaurav Shah2011-08-251-7/+13
| | | | | | | | | | BUG=chromium-os:18492 TEST=manually on new and old image. Change-Id: Ifa7ab70cd2cd3629656d167cd6f4bfaae8f7f03a Reviewed-on: http://gerrit.chromium.org/gerrit/6589 Reviewed-by: Elly Jones <ellyjones@chromium.org> Tested-by: Gaurav Shah <gauravsh@chromium.org>
* Scale the HWID font to match the rest of the text.Bill Richardson2011-08-256-53/+105
| | | | | | | | | | | | | BUG=chromium-os:18631 TEST=manual Boot to recovery mode screen. HWID should be the same size and shape as the rest of the text. Change-Id: Iee0b0611c1319a304d911b710dd7f35ef999a1eb Reviewed-on: http://gerrit.chromium.org/gerrit/6667 Reviewed-by: Randall Spangler <rspangler@chromium.org> Tested-by: Bill Richardson <wfrichar@chromium.org>
* Add unit tests for tpm_bootmodeRandall Spangler2011-08-252-0/+85
| | | | | | | | | | BUG=chromium-os:17564 TEST=make && make runtests Change-Id: I6437e41f55d5b705a3768d325999847c5753a13d Reviewed-on: http://gerrit.chromium.org/gerrit/6627 Reviewed-by: Stefan Reinauer <reinauer@google.com> Tested-by: Randall Spangler <rspangler@chromium.org>
* dump_fmap: flashrom format should generate [start, end] pair.Louis Yung-Chieh Lo2011-08-241-1/+2
| | | | | | | | | | | | | Rather than [start, size] pair. BUG=no bug id TEST=tested on chroot. Change-Id: I34ec1f654f88f2e9a27b06f07825ff8bf4d9cd8e Reviewed-on: http://gerrit.chromium.org/gerrit/6573 Reviewed-by: Bill Richardson <wfrichar@chromium.org> Reviewed-by: Yung-Chieh Lo <yjlou%chromium.org@gtempaccount.com> Tested-by: Yung-Chieh Lo <yjlou%chromium.org@gtempaccount.com>
* Add missing tests for vboot_commonRandall Spangler2011-08-241-3/+81
| | | | | | | | | | BUG=chromium-os:17564 TEST=make && make runtests Change-Id: I8dd6103eb60c8bc5af2abdd733d8f581984f27b9 Reviewed-on: http://gerrit.chromium.org/gerrit/6615 Reviewed-by: Bill Richardson <wfrichar@chromium.org> Tested-by: Randall Spangler <rspangler@chromium.org>
* Add tests for utility.h and sysincludes.h macrosRandall Spangler2011-08-244-4/+58
| | | | | | | | | | | BUG=chromium-os:17564 TEST=make && make runtests Change-Id: Id0a834c2b234d5f9cbbb37a69426e2b97c734d0a Reviewed-on: http://gerrit.chromium.org/gerrit/6608 Reviewed-by: Bill Richardson <wfrichar@chromium.org> Reviewed-by: Stefan Reinauer <reinauer@google.com> Tested-by: Randall Spangler <rspangler@chromium.org>
* Add tests for vboot_reference stateful_util.cRandall Spangler2011-08-247-8/+345
| | | | | | | | | | BUG=chromium-os:17564 TEST=make && make runtests Change-Id: I5d55be2dfead0c5d7af72841cbd6c65485685cd6 Reviewed-on: http://gerrit.chromium.org/gerrit/6596 Reviewed-by: Stefan Reinauer <reinauer@chromium.org> Tested-by: Randall Spangler <rspangler@chromium.org>
* bmpblock v1.2 - render HWID inside vboot_referenceBill Richardson2011-08-2417-136/+798
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The vboot_api.h doesn't require the BIOS display the ASCII HWID in a graphical form (ARM U-Boot doesn't know how), so we have to do it ourselves. This change makes that possible. Summary of changes: * bmpblk_font.h defines a structure to map ASCII chars to BMPs * bmpblk_font utility generates that font structure * bmpblock format is bumped to version 1.2 - YAML file specifies font to use for $HWID - make_default_yaml updated to emit the new format - README updated to describe the difference BUG=chromium-os:18631 TEST=manual I've tested this on ARM, like so: Inside the chroot, build a U-Boot that uses it: emerge-tegra2_kaen vboot_reference vboot_reference-firmware emerge-tegra2_kaen tegra-bct tegra2-public-firmware-fdts \ chromeos-u-boot chromeos-bootimage Outside chroot, but in src/platform/vboot_reference: make <copy ./build/utility/bmpblk_font and ./build/utility/bmpblk_utility to somewhere in your $PATH> make clean cd scripts/newbitmaps/fonts bmpblk_font --outfile ../images/hwid_fonts.bin outdir/* cd scripts/newbitmaps/images make arm cd out_arm <edit DEFAULT.yaml> bmpblk_utility -z 2 -c DEFAULT.yaml arm_bmpblock.bin <use gbb_utility to replace the bitmaps in the U-Boot image, boot it> The HWID string is displayed. Change-Id: I782004a0f30c57fa1f3bb246e8c59a02c5e9f561 Reviewed-on: http://gerrit.chromium.org/gerrit/6544 Reviewed-by: Bill Richardson <wfrichar@chromium.org> Tested-by: Bill Richardson <wfrichar@chromium.org>
* Don't check the firmware body when USE_RO_NORMAL preamble flag is presented.Tom Wai-Hong Tam2011-08-231-6/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since the firmware supporting RO normal boot doesn't contains any valid RW firmware body. Skipping the check avoids unnecessary failure. BUG=chromium-os:19451 TEST=manual Picked a firmware supporting RO normal boot and extracted its sections. Ran: $ vbutil_firmware --verify VBLOCK_A --signpubkey \ > /usr/share/vboot/devkeys/root_key.vbpubk --fv RW_SECTION_A Key block: Size: 2232 Flags: 7 (ignored) Data key algorithm: 7 RSA4096 SHA256 Data key version: 1 Data key sha1sum: e2c1c92d7d7aa7dfed5e8375edd30b7ae52b7450 Preamble: Size: 2164 Header version: 2.1 Firmware version: 1 Kernel key algorithm: 7 RSA4096 SHA256 Kernel key version: 1 Kernel key sha1sum: 5d2b220899c4403d564092ada3f12d3cc4483223 Firmware body size: 456411 Preamble flags: 1 Preamble requests USE_RO_NORMAL; skipping body verification. Change-Id: I8b81e679016f2946198396c5627415fe979c0a4f Reviewed-on: http://gerrit.chromium.org/gerrit/6396 Tested-by: Tom Wai-Hong Tam <waihong@chromium.org> Reviewed-by: Randall Spangler <rspangler@chromium.org>
* Add support for new verity key-value style kernel parametersGaurav Shah2011-08-231-10/+39
| | | | | | | | | | | BUG=chromium-os:18492 TEST=manually tested with both an old verity image, as well as a new one (with the pending http://gerrit.chromium.org/gerrit/6085) Change-Id: I347de9185db1c4ea949d37121c63e08184e8fcfe Reviewed-on: http://gerrit.chromium.org/gerrit/6516 Reviewed-by: Elly Jones <ellyjones@chromium.org> Tested-by: Gaurav Shah <gauravsh@chromium.org>
* Add unit tests for utility.cRandall Spangler2011-08-234-8/+80
| | | | | | | | | | | | | | Also fixes returned value from Memset(). And SafeMemcmp() should return 0 (equal) if comparing 0 bytes, to match the behavior of memcmp(). BUG=chromium-os:17564 TEST=make && make runtests Change-Id: Id43e70eecf04815216e1fd952271af35e0a66396 Reviewed-on: http://gerrit.chromium.org/gerrit/6539 Reviewed-by: Stefan Reinauer <reinauer@google.com> Reviewed-by: Bill Richardson <wfrichar@chromium.org> Tested-by: Randall Spangler <rspangler@chromium.org>
* Disable broken bmpblock_utility testRandall Spangler2011-08-231-2/+5
| | | | | | | | | | | | | | | | | The current bmpblock_utility doesn't preserve the order of images as specified in the config yaml file. This doesn't affect the functioning of the firmware, but does break this overly-restrictive test. Filed crosbug.com/19541 to fix this after Bill's current refactoring. BUG=chromium-os:19541 TEST=make && make runtests Change-Id: I03fe817bd191fec5f65aad37561a3224b6a2b1e6 Reviewed-on: http://gerrit.chromium.org/gerrit/6512 Reviewed-by: Bill Richardson <wfrichar@chromium.org> Tested-by: Randall Spangler <rspangler@chromium.org>
* Cleanup: DEFAULT.yaml should include locale_names section.Bill Richardson2011-08-224-4/+64
| | | | | | | | | | | | | | | | bmpblk_utility correctly supports this field, which can be used by the factory process to map the localization to the correct locale. We forgot to put the entries in the DEFAULT.yaml file. This change corrects that for future releases. BUG=none TEST=none Change-Id: Iea65d7439e6ef8cc8730ec1b862abba87041d93f Reviewed-on: http://gerrit.chromium.org/gerrit/6424 Reviewed-by: Randall Spangler <rspangler@chromium.org> Reviewed-by: Bill Richardson <wfrichar@chromium.org> Tested-by: Bill Richardson <wfrichar@chromium.org>
* Put VbDisplay* functions into their own file.Bill Richardson2011-08-224-317/+360
| | | | | | | | | | | | | | | | This refactoring will enable us to test and mock them separately from the rest of the vboot_api functions. BUG=chromium-os:17564 TEST=manual Built for ARM, ran "vbexport_test display" at U-Boot prompt. Still works. Change-Id: I2ddb01d3e981603f371aaa7317184457bdff48ac Reviewed-on: http://gerrit.chromium.org/gerrit/6422 Reviewed-by: Randall Spangler <rspangler@chromium.org> Reviewed-by: Bill Richardson <wfrichar@chromium.org> Tested-by: Bill Richardson <wfrichar@chromium.org>
* Decompress images in vboot wrapper, not in BIOS.Bill Richardson2011-08-173-16/+49
| | | | | | | | | | | | | | | | | | | | | | | The vboot library needs to decompress the images so that it can handle those that are special cases (like rendering the HWID). This means that 1) it needs access to the BIOS' native decompression routine, and 2) that VbExDisplayImage() only needs to handle the uncompressed native-format image and doesn't need to know about how the image is packed in the GBB. BUG=chromium-os:19134 TEST=manual This requires a change to vboot_api.h, which requires a (simultaneous) matching change to the BIOS, at least for U-Boot, which builds separately. I've made that change and run the "vbexport_test display" command from the modified U-Boot, but that also requires a change to the way U-Boot is built so that I can get at the U-Boot commandline. Change-Id: I449fb467cd3a68e742f27ec41b95d52685459d89 Reviewed-on: http://gerrit.chromium.org/gerrit/6129 Reviewed-by: Randall Spangler <rspangler@chromium.org> Reviewed-by: Bill Richardson <wfrichar@chromium.org> Tested-by: Bill Richardson <wfrichar@chromium.org>
* obsolete pack_firmware_imageChe-Liang Chiou2011-08-152-314/+0
| | | | | | | | | | | | | The firmware image packing is now done by cros_bundle_firmware of cros-devutils package, and we may retire pack_firmware_image. BUG=none TEST=emerge vboot_reference && [ ! -x /usr/bin/pack_firmware_image ] Change-Id: I177508bf8aada822535fe61258cd1a0df52bfac6 Reviewed-on: http://gerrit.chromium.org/gerrit/5979 Tested-by: Che-Liang Chiou <clchiou@chromium.org> Reviewed-by: Simon Glass <sjg@chromium.org>
* make_dev_firmware: handle developer firmware keyblock correctlyfirmware-u-boot-v1firmware-881-u-boot-v1Hung-Te Lin2011-08-101-0/+29
| | | | | | | | | | | | | | | | | | We should detect keyblock from existing firmware and decide if a developer firmware keyblock should be used. BUG=chromium-os:18946 TEST=./make_dev_firmware.sh -f zgb.bin -t zgb_dev.bin # seeing Using keyblocks (developer, normal)... ./make_dev_firmware.sh -f mario.bin -t mario_dev.bin # seeing Using keyblocks (normal, normal)... ./make_dev_firmware.sh -f arm.bin -t arm_dev.bin # seeing Using keyblocks (normal, normal)... Change-Id: I74fa0db980e26a6a19a4393303e8c5b3260c84c7 Reviewed-on: http://gerrit.chromium.org/gerrit/5623 Tested-by: Hung-Te Lin <hungte@chromium.org> Reviewed-by: Hung-Te Lin <hungte@chromium.org>
* Use BMP format for all master images.Bill Richardson2011-08-09446-552/+617
| | | | | | | | | | | | | | | | | | Since both UEFI BIOS and U-Boot display BMP images (although with different compression schemes), we might as well just use that format for the master images. We may still need to crop, scale, or compress these master images to the platform-specific formats, of course. This change also adds an example Makefile to produce the scaled images for x86 platforms. BUG=chromium-os:18631 TEST=none Change-Id: Idd18d66ea46502065c6f3707f625908a892a0cbd Reviewed-on: http://gerrit.chromium.org/gerrit/5619 Tested-by: Bill Richardson <wfrichar@chromium.org> Reviewed-by: Hung-Te Lin <hungte@chromium.org>
* Refactor bitmap directories and master images for ARM work.Bill Richardson2011-08-08690-178/+1516
| | | | | | | | | | | | | | | | | | | | | | | | | | | | This change moves the old bitmaps (Mario, Alex, ZGB) and their supporting scripts into a subdirectory, and creates a new set of images at 1366x768, in PNG format. This is preparation for providing a complete set of localized BIOS screens to use as the master for all new platforms. The plan is that these master images will be scaled, cropped, and converted into the correct formats for each target platform, and those binary bmpblocks saved in their own package. Only if a translation changes should we need to regenerate the bmpblocks. These new images do NOT (yet) include locales that cannot be rendered correctly by ImageMagick, and not all of them have been fully vetted by the localization team. BUG=chromium-os:13037 TEST=none Change-Id: Ic25832aad3c6cc36879db204c2579395014af311 Reviewed-on: http://gerrit.chromium.org/gerrit/5508 Reviewed-by: Hung-Te Lin <hungte@chromium.org> Reviewed-by: Tom Wai-Hong Tam <waihong@chromium.org> Tested-by: Bill Richardson <wfrichar@chromium.org> Reviewed-by: Bill Richardson <wfrichar@chromium.org>
* resign_firmwarefd: replace mosys by "dump_fmap -p"Hung-Te Lin2011-08-021-34/+28
| | | | | | | | | | | | | | | | | Parsing fmap information becomes easier after dump_fmap adds "-p" mode, and prevents the dependency because dump_fmap is in same repo with signing scripts. BUG=none, pure refine to reduce dependency and less error messages TEST=./resign_firmwarefd.sh mario_bios.bin output.bin \ devkeys/firmware_data_key.vbprivk devkeys/firmware.keyblock \ devkeys/firmware_data_key.vbprivk devkeys/firmware.keyblock \ devkeys/kernel_subkey.vbpubk # Also verified with modern firmware like ZGB/Alex and ARM. Change-Id: Ia40ecd9ab641250272952e20ab058e780eb7770b Reviewed-on: http://gerrit.chromium.org/gerrit/5132 Tested-by: Hung-Te Lin <hungte@chromium.org> Reviewed-by: Gaurav Shah <gauravsh@chromium.org>
* resign_firmwarefd: don't change preamble flag by default.Hung-Te Lin2011-08-021-5/+18
| | | | | | | | | | | | | | | | | | When preamble_flag is not assigned manually, resign_firwmarefd should not change the preamble flag. BUG=chromium-os:18207 TEST=# Prepare a bios.bin with preamble_flag=1 (ex, ARM firmware) ./resign_firmwarefd.sh bios.bin ..... # do not assign preamble vbutil_firmware --verify # see preamble_flag=1 # Repeat with firmware having preamble_flag=0 (ex, x86 firmware like ZGB/Alex) # preamble_flag is 0 after resign_firmwarefd. Change-Id: I50f88bbf51a28defaf1c4e5383ab856168a128fc Reviewed-on: http://gerrit.chromium.org/gerrit/5133 Tested-by: Hung-Te Lin <hungte@chromium.org> Reviewed-by: Bill Richardson <wfrichar@chromium.org> Reviewed-by: Gaurav Shah <gauravsh@chromium.org>
* Revert "Move bitmaps for shipping products into a separate directory."Roy Hashimoto2011-08-02460-13/+6
| | | | | | | | | This reverts commit 97505494b15f65e5e667521fa65b9155db673d46 Change-Id: Icbf0b997711fc44aeeeec8e3bb4b6fa103e6e7e6 Reviewed-on: http://gerrit.chromium.org/gerrit/5156 Tested-by: Roy Hashimoto <rhashimoto@chromium.org> Reviewed-by: Roy Hashimoto <rhashimoto@chromium.org>
* Revert "Generate base images at 1366 x 768 using Imagemagick."Roy Hashimoto2011-08-02232-1503/+172
| | | | | | | | | | This reverts commit a193afd320d36e0d60fefe990d869301d37f6340 Change-Id: I8190f98e2d8a33578eaf365ab5eca58f09cfe5bd Reviewed-on: http://gerrit.chromium.org/gerrit/5155 Tested-by: Bill Richardson <wfrichar@chromium.org> Reviewed-by: Bill Richardson <wfrichar@chromium.org> Tested-by: Roy Hashimoto <rhashimoto@chromium.org>
* Generate base images at 1366 x 768 using Imagemagick.Bill Richardson2011-08-02232-172/+1503
| | | | | | | | | | | BUG=chromium-os:13037 TEST=none Change-Id: I63fba47d14fca684589c885f1aac4b6228b24bb4 Reviewed-on: http://gerrit.chromium.org/gerrit/4426 Reviewed-by: Doug Anderson <dianders@chromium.org> Tested-by: Bill Richardson <wfrichar@chromium.org> Reviewed-by: Bill Richardson <wfrichar@chromium.org>
* Move bitmaps for shipping products into a separate directory.Bill Richardson2011-08-02460-6/+13
| | | | | | | | | | | | | | This is the first step in reorganizing and updating the bitmaps for all locales. BUG=chromium-os:13037 TEST=none Change-Id: I95ad4c20fde7cb5eefeb11ef50b6f0ead886bc3c Reviewed-on: http://gerrit.chromium.org/gerrit/4424 Reviewed-by: Doug Anderson <dianders@chromium.org> Reviewed-by: Bill Richardson <wfrichar@chromium.org> Tested-by: Bill Richardson <wfrichar@chromium.org>
* Add a -f option to dump_fmap to emit flashrom's layout format.Bill Richardson2011-07-291-11/+24
| | | | | | | | | | | BUG=none TEST=none Change-Id: Ic4fe7d9962eee9b819b5517ea375ca0855ce6968 Reviewed-on: http://gerrit.chromium.org/gerrit/5019 Reviewed-by: Randall Spangler <rspangler@chromium.org> Reviewed-by: Bill Richardson <wfrichar@chromium.org> Tested-by: Bill Richardson <wfrichar@chromium.org>
* Clean up calling LoadFirmware() from VbSelectFirmware()Randall Spangler2011-07-296-136/+36
| | | | | | | | | | | BUG=chromium-os:18383 TEST=compiles for both x86 and ARM; boots on my test system Change-Id: I6c7dc1dd086fb06e4ad8daa053bccdf61a463240 Reviewed-on: http://gerrit.chromium.org/gerrit/4977 Reviewed-by: Bill Richardson <wfrichar@chromium.org> Reviewed-by: Stefan Reinauer <reinauer@google.com> Tested-by: Randall Spangler <rspangler@chromium.org>
* Allow CougarPoint as a valid GPIO controller.Bill Richardson2011-07-281-6/+8
| | | | | | | | | | | | BUG=chrome-os-partner:4879 TEST=manual (just try it) NOTE: You must use a BIOS that exports the correct ACPI tables. Change-Id: I027680a203f3a566edf9ed82fb1fe1a9fa4c4f0f Reviewed-on: http://gerrit.chromium.org/gerrit/4957 Tested-by: Bill Richardson <wfrichar@chromium.org> Reviewed-by: Bill Richardson <wfrichar@chromium.org>
* Fix missing call to VbNvTeardown()Randall Spangler2011-07-281-0/+1
| | | | | | | | | | BUG=none TEST=compiles Change-Id: I7c917eee4a7893d535fc8f07a21410437c50b8a0 Reviewed-on: http://gerrit.chromium.org/gerrit/4956 Reviewed-by: Bill Richardson <wfrichar@chromium.org> Tested-by: Randall Spangler <rspangler@chromium.org>
* Vboot support for GBB flag to reduce boot time warning screenRandall Spangler2011-07-271-4/+21
| | | | | | | | | | | | | | | | | | | This is OFF by default, and must be turned on via the gbb_utility. BUG=chrome-os-partner:2317 TEST=manual Build a firmware image and flash it. Should have the same 30-sec delay as it does now. Pressing TAB should show GBB flags = 0x0. Modify the firmware image using gbb_utility to set GBB flags to 1 and reboot. Dev delay should be 2 sec. Pressing TAB should show GBB flags = 0x00000001. Change-Id: If96ab9e7d0d142a9cd9a2c6af3849421d073de5e Reviewed-on: http://gerrit.chromium.org/gerrit/4829 Reviewed-by: Bill Richardson <wfrichar@chromium.org> Tested-by: Randall Spangler <rspangler@chromium.org>
* Add flags field to GBBRandall Spangler2011-07-272-25/+44
| | | | | | | | | | | | Still need to update gbb_utility and firmware to use the flags. BUG=chrome-os-partner:2317 TEST=make && make runtests Change-Id: I16c77a175c78efa3212a00bbf94d68384ef1829f Reviewed-on: http://gerrit.chromium.org/gerrit/4817 Reviewed-by: Bill Richardson <wfrichar@chromium.org> Tested-by: Randall Spangler <rspangler@chromium.org>
* If trying firmware B and found invalid kernel, just rebootRandall Spangler2011-07-271-5/+24
| | | | | | | | | | | | | | | | | | | | | | When we're trying a new firmware B with a new kernel subkey, if it can't find any kernels there may still be a kernel which the old firmware A likes. So instead of going to recovery mode, just reboot so we fall back to firmware A. If firmware A doesn't find any valid kernels we'll still go to recovery mode. BUG=chrome-os-partner:1657 TEST=manual: Do a firmware+OS update which involves kernel subkey rotation. After installing the new firmware but before rebooting into the new OS, corrupt the new kernel so that it'll fail validation. Then reboot. On previous firmware, this would go to recovery mode. Now it should simply reboot and be back in firmware A / kernel A. Change-Id: I12796f428fd6969ea5ef36f39c4f58cb0a2bff0d Reviewed-on: http://gerrit.chromium.org/gerrit/4770 Reviewed-by: Gaurav Shah <gauravsh@chromium.org> Tested-by: Randall Spangler <rspangler@chromium.org>
* Move VbNvContext setup/teardown to vboot wrapper funcsRandall Spangler2011-07-267-52/+21
| | | | | | | | | | BUG=chromium-os:18226 TEST=make && make runtests Change-Id: Ie22e99a9796866e646ed92158410bc7a2fdf90f6 Reviewed-on: http://gerrit.chromium.org/gerrit/4754 Reviewed-by: Stefan Reinauer <reinauer@google.com> Tested-by: Randall Spangler <rspangler@chromium.org>