summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* 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>
* Make crossystem kern_nv field read-only.Randall Spangler2011-07-262-5/+7
| | | | | | | | | | | | | | | | | | | | | BUG=chromium-os:14029 TEST=make && make runtests, and manually check: crossystem fwupdate_tries=3 crossystem fwupdate_tries kern_nv (should print 3 0x00000003) crossystem kern_nv=0 (should fail) crossystem fwupdate_tries kern_nv (should print 3 0x00000003) crossystem fwupdate_tries=0 crossystem fwupdate_tries kern_nv (should print 0 0x00000000) Change-Id: I906ad41a36378b93e0c3330d8f94b7d69aafa536 Reviewed-on: http://gerrit.chromium.org/gerrit/4751 Reviewed-by: Bill Richardson <wfrichar@chromium.org> Tested-by: Randall Spangler <rspangler@chromium.org>
* Fix vboot_reference-firmware compilation error when building for coreboot.Vadim Bendebury2011-07-261-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | When compiling for coreboot the printf format helpers are not available (they come from the Insyde tree). The specifier is use in a very limited number of places, it is probably better to typecast the variable being printed to avoid compilation errors. This CL accomplishes just that. BUG=none TEST=manual: run the following commands: emerge-x86-alex -C sys-boot/chromeos-coreboot \ sys-boot/chromeos-u-boot\ chromeos-base/vboot_reference \ chromeos-base/vboot_reference-firmware emerge-x86-alex chromeos-bootimage observe the second one succeed. Change-Id: If19e3a583eb759ba5a21863d1b9b28636c7f00b0 Signed-off-by: Vadim Bendebury <vbendeb@chromium.org> Reviewed-on: http://gerrit.chromium.org/gerrit/4690
* Refactor LoadFirmware() and LoadKernel() to return VbError_tRandall Spangler2011-07-269-117/+58
| | | | | | | | | | BUG=chromium-os:18161 TEST=make && make runtests Change-Id: I1f60654fef84e26ee15fa8bdaacdb87fb1ddf69e Reviewed-on: http://gerrit.chromium.org/gerrit/4676 Reviewed-by: Stefan Reinauer <reinauer@chromium.org> Tested-by: Randall Spangler <rspangler@chromium.org>
* Return more meaningful error codes from vboot entry pointsRandall Spangler2011-07-254-52/+114
| | | | | | | | | | | | This also fixes one place where TPM error codes were getting lost. BUG=chromium-os:18132 TEST=make && make runtests Change-Id: I83c74e1103805f166d1dc7448be7d67bd46d15b3 Reviewed-on: http://gerrit.chromium.org/gerrit/4659 Tested-by: Randall Spangler <rspangler@chromium.org> Reviewed-by: Randall Spangler <rspangler@chromium.org>
* Refactor TPM calls into vboot wrapperRandall Spangler2011-07-2511-339/+257
| | | | | | | | | | | | | | | | | | | | | | Try #2, now that ARM has the fix from http://gerrit.chromium.org/gerrit/4667 This cleans up the TPM calls inside vboot_reference. * TPM calls share mode code between boot modes. * Better handling for TPM_E_MUST_REBOOT, particularly in recovery mode. * TAB screen shows current TPM versions. No changes required to the wrapper API; these changes are internal to vboot. BUG=chromium-os:18084 TEST=make && make runtests; built for both alex and tegra2-seaboard Original-Change-Id: I2a52066f2889210af83409872b10f9d6380470af (cherry picked from commit da55560cddcf7a1aa8a881cdf52792a21a01e766) Change-Id: I120797145772116f09b8125b9e56fdbb11dc16b3 Reviewed-on: http://gerrit.chromium.org/gerrit/4671 Tested-by: Randall Spangler <rspangler@chromium.org> Reviewed-by: Randall Spangler <rspangler@chromium.org>
* Fix missing inttypes define on ARMRandall Spangler2011-07-251-0/+1
| | | | | | | | | | BUG=none TEST=emerge-tegra2_seaboard vboot_reference-firmware Change-Id: Ia14468885454383945dd47d328a54c7f6b7221e0 Reviewed-on: http://gerrit.chromium.org/gerrit/4667 Tested-by: Randall Spangler <rspangler@chromium.org> Reviewed-by: Elly Jones <ellyjones@chromium.org>
* Revert "Refactor TPM calls into vboot wrapper"Elly Jones2011-07-2511-257/+339
| | | | | | | | | This reverts commit da55560cddcf7a1aa8a881cdf52792a21a01e766. This commit caused http://build.chromium.org/p/chromiumos/builders/arm%20tegra2%20binary/builds/6301 to fail. Change-Id: Ie132c1e600ab28f97337ecfe0e7cff053987717d Reviewed-on: http://gerrit.chromium.org/gerrit/4661 Reviewed-by: Elly Jones <ellyjones@chromium.org> Tested-by: Elly Jones <ellyjones@chromium.org>
* Refactor TPM calls into vboot wrapperRandall Spangler2011-07-2511-339/+257
| | | | | | | | | | | | | | | | | | This cleans up the TPM calls inside vboot_reference. * TPM calls share mode code between boot modes. * Better handling for TPM_E_MUST_REBOOT, particularly in recovery mode. * TAB screen shows current TPM versions. No changes required to the wrapper API; these changes are internal to vboot. BUG=chromium-os:18084 TEST=make && make runtests; built for both alex and tegra2-seaboard Change-Id: I2a52066f2889210af83409872b10f9d6380470af Reviewed-on: http://gerrit.chromium.org/gerrit/4611 Reviewed-by: Bill Richardson <wfrichar@chromium.org> Reviewed-by: Gaurav Shah <gauravsh@chromium.org> Tested-by: Randall Spangler <rspangler@chromium.org>
* resign_firmwarefd.sh: support new "flag" (for hinting two-stop FW)Hung-Te Lin2011-07-222-3/+18
| | | | | | | | | | | | | | The two-stop firmware relies on the "flag" field which may be useful for the resign_firmwarefd.sh. BUG=chrome-os-partner:5095 TEST=./resign_firmwarefd [params] 1 vbutil_firmware --verify ..... # seeing flag = 1 Change-Id: I56b44ee5b610e36384e15e6eb31286f0f838734b Reviewed-on: http://gerrit.chromium.org/gerrit/4561 Tested-by: Hung-Te Lin <hungte@chromium.org> Reviewed-by: Gaurav Shah <gauravsh@chromium.org>
* Cleanup and preparation for inside-wrapper TPM refactoring.Randall Spangler2011-07-226-6/+13
| | | | | | | | | | | | | | | | | Add recovery reason for already in recovery and need to reboot to recovery to let the TPM init. Add vboot_struct fields. Fix type for keyblock flags param to SetTPMBootModeState(). BUG=none TEST=make && make runtests Change-Id: I4035bdb377aaebaca03a43799be57977166da739 Reviewed-on: http://gerrit.chromium.org/gerrit/4599 Reviewed-by: Bill Richardson <wfrichar@chromium.org> Tested-by: Randall Spangler <rspangler@chromium.org>
* Implement different strategy for soft-reset workaround on Kaen prototypes.Luigi Semenzato2011-07-221-46/+3
| | | | | | | | | | | BUG=chrome-os-partner:5071 TEST=check that factory flow works on Kaen prototypes without HW fix Change-Id: I56a830ed292d7e998fa25299f52d22d2faac3c77 Reviewed-on: http://gerrit.chromium.org/gerrit/4533 Tested-by: Luigi Semenzato <semenzato@chromium.org> Reviewed-by: Gaurav Shah <gauravsh@chromium.org> Reviewed-by: Luigi Semenzato <semenzato@chromium.org>
* Fix script to use new key=value style /bin/verity argumentsGaurav Shah2011-07-211-6/+5
| | | | | | | | | | | BUG=chromium-os:17953 TEST=Run sign_official_build.sh verify from the chroot on an image, now it succeeds. Change-Id: Idd923716c95f4f12bd0a1236e2894af276e26d71 Reviewed-on: http://gerrit.chromium.org/gerrit/4499 Reviewed-by: Elly Jones <ellyjones@chromium.org> Tested-by: Gaurav Shah <gauravsh@chromium.org>
* Fix "tpmc help" description of pplockGaurav Shah2011-07-211-1/+1
| | | | | | | | | | BUG=none TEST=none Change-Id: I2a976f6e876ff7751a746ea89211795ab454e65d Reviewed-on: http://gerrit.chromium.org/gerrit/4458 Reviewed-by: Luigi Semenzato <semenzato@chromium.org> Tested-by: Gaurav Shah <gauravsh@chromium.org>
* Add check to validate VbSharedData magicNick Sanders2011-07-201-0/+7
| | | | | | | | | | TEST=run crossystem BUG=chrome-os-partner:4691 Change-Id: If590d185446dfa7cb628b5014f3a9a9c7b7a901d Reviewed-on: http://gerrit.chromium.org/gerrit/3355 Reviewed-by: Nick Sanders <nsanders@chromium.org> Tested-by: Nick Sanders <nsanders@chromium.org>
* CHROMIUM: fix incorrect crossystem recovery_reasonChe-Liang Chiou2011-07-201-7/+1
| | | | | | | | | | | | | | | | | | U-Boot should not parse the raw contents of VbNvStorage, and so cannot read the recovery reason from the VbNvStorage. On the other hand, it is easy for crossystem to read the recovery reason from the VbNvStorage itself. After this change is merged, U-Boot will stop providing the (incorrect) recovery reason in the device tree. BUG=chromium-os:17876,chromium-os:17852 TEST=press recovery button and see crossystem reports recovery_reason=2 Change-Id: I236667f0b4f2e25da193cf6b6f7db3871d1e093f Reviewed-on: http://gerrit.chromium.org/gerrit/4396 Tested-by: Che-Liang Chiou <clchiou@chromium.org> Reviewed-by: Randall Spangler <rspangler@chromium.org>
* Change description of dev_boot_usbRandall Spangler2011-07-201-1/+1
| | | | | | | | | | | | Now indicates it covers SD as well (it did already, but now it's clearer). BUG=chromium-os:17907 TEST=run `crossystem`; look at new descriptions Change-Id: I4e4d8502b0dc5a29eb403039535b7512941ab4fa Reviewed-on: http://gerrit.chromium.org/gerrit/4408 Reviewed-by: Simon Glass <sjg@chromium.org> Tested-by: Randall Spangler <rspangler@chromium.org>
* Clear the recovery request after each boot attempt which is allowed to failRandall Spangler2011-07-201-4/+9
| | | | | | | | | | | | | | The problem is that the recovery request was only being cleared when the firmware found a good image, not after a failed attempt was ignored. BUG=chromium-os:17846 TEST=see bug for manual test procedure Change-Id: I4c6b026bef477839def9bf2b0fed626a9922650f Reviewed-on: http://gerrit.chromium.org/gerrit/4352 Reviewed-by: Stefan Reinauer <reinauer@google.com> Tested-by: Randall Spangler <rspangler@chromium.org>
* Add indication to developer that dev_boot_usb is disabledRandall Spangler2011-07-191-50/+65
| | | | | | | | | | | | | | | | | | | | | BUG=chrome-os-partner:5031 TEST=manual 1. crossystem dev_boot_usb=0 2. Boot with dev switch on and bootable USB device inserted 3. Press Tab. Should show dev_boot_usb: 0 4. Press Ctrl+U. Should beep twice 5. crossystem dev_boot_usb=1 6. Boot with dev switch on and nothing in USB/SD 7. Press Tab. Should show dev_boot_usb: 1 8. Press Ctrl+U. Should beep once Change-Id: Ie9b73f86d68337b48c1b859c7c6d76fcb72d13c2 Reviewed-on: http://gerrit.chromium.org/gerrit/4312 Reviewed-by: Bill Richardson <wfrichar@chromium.org> Reviewed-by: Hung-Te Lin <hungte@chromium.org> Tested-by: Randall Spangler <rspangler@chromium.org>
* Report mainfw_act based on VbSharedData780.BRandall Spangler2011-07-152-3/+20
| | | | | | | | | | | | | | | Don't use FDT to report it on ARM. This fixes ARM reporting the wrong thing for RO-normal. BUG=none TEST=none Change-Id: Id3a1bd2a1d2502e1d9493ab362be5a58fa88d70e Reviewed-on: http://gerrit.chromium.org/gerrit/4213 Reviewed-by: Olof Johansson <olofj@chromium.org> Reviewed-by: Simon Glass <sjg@chromium.org> Tested-by: Randall Spangler <rspangler@chromium.org>
* Add typecast to fix compiling in MSVCRandall Spangler2011-07-151-1/+1
| | | | | | | | | | BUG=none TEST=make && make runtests Change-Id: I774645c1059df70cd25ea6a3f78161eb916d7293 Reviewed-on: http://gerrit.chromium.org/gerrit/4192 Reviewed-by: Stefan Reinauer <reinauer@google.com> Tested-by: Randall Spangler <rspangler@chromium.org>
* crossystem: arm: use proper gpio referencesOlof Johansson2011-07-141-11/+24
| | | | | | | | | | BUG=none TEST=make sure developer switch and recovery switch runtime reading works as expected (manually) Change-Id: I3b17ac66f88b2b789bebe4e7d271666f8c63a8b0 Reviewed-on: http://gerrit.chromium.org/gerrit/4127 Reviewed-by: Olof Johansson <olofj@chromium.org> Tested-by: Olof Johansson <olofj@chromium.org>
* Fix compiler errorChe-Liang Chiou2011-07-141-1/+1
| | | | | | | | | | BUG=chromium-os:17304 TEST=make successfully Change-Id: Icebd25069a445960eb4e1e92f10dec195ea3fbf1 Reviewed-on: http://gerrit.chromium.org/gerrit/4152 Reviewed-by: Che-Liang Chiou <clchiou@chromium.org> Tested-by: Che-Liang Chiou <clchiou@chromium.org>
* Add vboot support for RO-normal code path.Randall Spangler2011-07-147-62/+78
| | | | | | | | | | BUG=chromium-os:17304 TEST=make && make runtests Change-Id: I4d0f8afd516649fba67119845ec1c4479ba54c43 Reviewed-on: http://gerrit.chromium.org/gerrit/4065 Reviewed-by: Stefan Reinauer <reinauer@chromium.org> Tested-by: Randall Spangler <rspangler@chromium.org>
* arm: convert to new device tree usageOlof Johansson2011-07-141-102/+114
| | | | | | | | | | | | | This also includes reading the nonvolatile storage from disk instead of through the device-tree, since it's not updated there. BUG=none TEST=read and write a few crossystem variables Change-Id: I6836a6eb0c92a0560dd393e694690a694bdb77a6 Reviewed-on: http://gerrit.chromium.org/gerrit/4078 Tested-by: Olof Johansson <olofj@chromium.org> Reviewed-by: Rong Chang <rongchang@chromium.org>
* Add support for flags in the firmware preamble.Randall Spangler2011-07-1311-26/+125
| | | | | | | | | | | | | | | | | | The old (v2.0) parser is compatible with new (v2.1) structs. That is, this won't break existing firmware or vbutil_firmware. A new (v2.1) parser parsing an old (v2.0) struct will return 0 for the flags. This will be used to support the RO-normal code path in a subsequent CL. BUG=chromium-os:17304 TEST=added unit tests; make && make runtests Change-Id: I73bcd8acd3330b0d7d143061b5ef838e6d79cf1a Reviewed-on: http://gerrit.chromium.org/gerrit/4030 Reviewed-by: Bill Richardson <wfrichar@chromium.org> Tested-by: Randall Spangler <rspangler@chromium.org>
* Introduce arm fdt support in crossystem utilityRong Chang2011-07-111-172/+218
| | | | | | | | | | | | | | | | | | | | This CL builds upon recent changes in u-boot and kernel. (see issue ids: 15744, 16665) - Remove /sys/kernel/debug/chromeos_arm share memory mechanism - Load properties from /proc/device-tree/crossystem/* - Write NVCXT to /dev/mmcblk0:lba[0] BUG=chromium-os:17300 TEST=manual Run crossystem on device console. Check current values of gpio switches. All other values are exported from FDT directly. Change-Id: Ib8db4a4aeb6dc36308ad8882403cb2f5978a5c70 Signed-off-by: Rong Chang <rongchang@chromium.org> Reviewed-on: http://gerrit.chromium.org/gerrit/3676 Reviewed-by: Tom Wai-Hong Tam <waihong@chromium.org>
* Add support for merged normal+dev firmwareRandall Spangler2011-07-114-37/+31
| | | | | | | | | | | | | | | BUG=chromium-os:17457 TEST=make && make runtests When this is merged into an actual firmware build, can test it: * dev switch off -> no dev screen, won't boot self-signed kernel * dev switch on --> dev warning screen, will boot self-signed kernel (e.g., it acts like the Cr-48) Change-Id: I985428256e48b7e05dd4d8fe582a0c0103bf5fb2 Reviewed-on: http://gerrit.chromium.org/gerrit/3901 Reviewed-by: Stefan Reinauer <reinauer@google.com> Tested-by: Randall Spangler <rspangler@chromium.org>
* Add support for dev_boot_usb flagRandall Spangler2011-07-116-4/+41
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | BUG=chromium-os:17433 TEST=make && make runtests. Additional manual tests: 0. Insert a valid dev-signed USB key. 1. Boot with dev switch off. `crossystem dev_boot_usb` should print 0. 2. Flip dev switch on. `crossystem dev_boot_usb` should print 0. Ctrl+U at dev screen should beep, but not boot USB. 3. Type `crossystem dev_boot_usb=1`. Should succeed. `crossystem dev_boot_usb` should print 1. 4. Reboot system. At the dev mode warning, press Ctrl+U System should boot from USB key `crossystem dev_boot_usb` should print 0. 5. Flip dev switch off. `crossystem dev_boot_usb` should print 0. 6. Flip dev switch on. `crossystem dev_boot_usb` should print 0. Note that this does not apply to Cr-48, Alex, or ZGB. Change-Id: Idf85fdd642f38f531c89e5fa5b1679e84936d4da Reviewed-on: http://gerrit.chromium.org/gerrit/3875 Reviewed-by: Bill Richardson <wfrichar@chromium.org> Reviewed-by: Stefan Reinauer <reinauer@google.com> Tested-by: Randall Spangler <rspangler@chromium.org>
* Vboot wrapper - add recovery reason, refactor timingRandall Spangler2011-07-0810-180/+175
| | | | | | | | | | | | | | | | | | | | | Pressing Tab at a firmware screen now displays real data, including the recovery reason, HWID, and contents of VbNvStorage. Entry point start/end time tracking in VbSharedData now refers to the new wrapper APIs. Added capability for calling firmware to request recovery mode (for example, if it's unable to initialize RAM, can't find the SSD, etc.). Previously, calling firmware had no (good) way to do this other than faking the recovery button being pressed. BUG=chromium-os:17018 TEST=emerge on x86 and tegra2_seaboard Change-Id: I7d377f279842b30a10d945d13571c41c464633f1 Reviewed-on: http://gerrit.chromium.org/gerrit/3814 Reviewed-by: Simon Glass <sjg@chromium.org> Tested-by: Randall Spangler <rspangler@chromium.org>
* Vboot wrapper initial implementationRandall Spangler2011-07-0822-311/+908
| | | | | | | | | | | | | | | | | | Patch 1: Initial change Patch 2: Fix comment in vboot_struct.h Patch 3: Revert files unintentionally reverted Patch 4: (rebase) Patch 5: (rebase) Patch 6: Revert files unintentionally reverted (again) Patch 7: Fix mocked tlcl for ARM build BUG=chromium-os:17010 TEST=make && make runtests; works on H2C; emerge-tegra2_seaboard chromeos-bootimage compiles Change-Id: I6e5ce72d41b9297c07a3f330a881eba68cfabee2 Reviewed-on: http://gerrit.chromium.org/gerrit/3593 Reviewed-by: Randall Spangler <rspangler@chromium.org> Tested-by: Randall Spangler <rspangler@chromium.org>
* Port vboot_reference to use new wrapper API utility functionsRandall Spangler2011-07-0816-136/+85
| | | | | | | | | | | | | | | | Third time's the charm. Now that we've moved to u-boot-next, this won't break the ARM build. BUG=chromium-os:17006 TEST=make && make runtests; emerge vboot_reference; emerge-tegra2_seaboard chromeos-bootimage Change-Id: Ib4fa26c7a23868dd2ffd2b321ee8dc08c66ea322 Original-Change-Id: I771085dcdf79d9592de64f35e3b758111a80dd9f Original-Reviewed-on: http://gerrit.chromium.org/gerrit/3263 Original-Reviewed-by: Simon Glass <sjg@chromium.org> Reviewed-on: http://gerrit.chromium.org/gerrit/3803 Tested-by: Randall Spangler <rspangler@chromium.org> Reviewed-by: Simon Glass <sjg@chromium.org>
* Fix compiler warning in vboot_referenceRandall Spangler2011-07-081-1/+1
| | | | | | | | | | BUG=none TEST=none Change-Id: I60089b4bfb5f4ba2f0df66f335794b3fed1495f3 Reviewed-on: http://gerrit.chromium.org/gerrit/3787 Reviewed-by: Randall Spangler <rspangler@chromium.org> Tested-by: Randall Spangler <rspangler@chromium.org>
* Add string utility functions.Randall Spangler2011-07-085-0/+213
| | | | | | | | | | | | | These are used by the coming-soon vboot wrapper (vboot_api_kernel) to display debug information when Tab is pressed at a BIOS screen. BUG=chromium-os:17035 TEST=make && make runtests (runs new test!) Change-Id: I4893f31e9333f4e9d458a6e347213eef22f770cd Reviewed-on: http://gerrit.chromium.org/gerrit/3759 Reviewed-by: Bill Richardson <wfrichar@chromium.org> Tested-by: Randall Spangler <rspangler@chromium.org>
View Lorry Controller Status