summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* CHERRY-PICK: mount-encrypted: report numeric results on TPM failurestabilize-link-2913.278release-R23-2913.BKees Cook2012-11-291-3/+4
| | | | | | | | | | | | | | | | | | | To help identify the specific failure conditions encountered when the TPM goes weird, report them any time they are encountered. BUG=chrome-os-partner:15960 TEST=daisy build, manual testing BRANCH=none Signed-off-by: Kees Cook <keescook@chromium.org> Reviewed-on: https://gerrit.chromium.org/gerrit/38468 Reviewed-by: Darren Krahn <dkrahn@chromium.org> (cherry picked from commit b08c46a0dad2c0eb2f8590a896bd09d3c01d43c6) Change-Id: I197fd069ac9dfd30fb7516712a1216c7e2800099 Signed-off-by: Kees Cook <keescook@chromium.org> Reviewed-on: https://gerrit.chromium.org/gerrit/38873 Reviewed-by: Elly Jones <ellyjones@chromium.org>
* (release-R23)crossystem devsw_cur returns devsw_boot if virtual dev switchstabilize-linkstabilize-daisystabilizeRandall Spangler2012-10-082-5/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | devsw_cur is really a meaningless concept on systems with virtual dev switches; it exists primarily to support factory test of physical developer switches. However, some plugins use this instead of the preferred devsw_boot, and it's easier to modify crossystem than the plugins at this point in time. BUG=chrome-os-partner:12928 BRANCH=none (affects all current products, but is an OS-level change, not FW) TEST=manual - On link, 'crossystem devsw_cur devsw_boot' with dev switch on -> '1 1' - On link, 'crossystem devsw_cur devsw_boot' with dev switch off -> '0 0' - On lumpy or earlier, 'crossystem devsw_cur' should return current dev switch position; check this by toggling the physical switch without rebooting and see that the reported value follows the switch value. Signed-off-by: Randall Spangler <rspangler@chromium.org> Reviewed-on: https://gerrit.chromium.org/gerrit/34531 Reviewed-by: Bill Richardson <wfrichar@chromium.org> Reviewed-by: Hung-Te Lin <hungte@chromium.org> (cherry picked from commit 09a8447862c7d111d6abdd7891508df1a8f1cc5b) Change-Id: I6d07d905b250d762553d44d8b441f04b9ad25bc5 Reviewed-on: https://gerrit.chromium.org/gerrit/34967 Reviewed-by: Randall Spangler <rspangler@chromium.org> Tested-by: Jay Kim <yongjaek@chromium.org>
* Add scripts to increment single fm/kernel keys.factory-2914.BKris Rambish2012-09-185-77/+263
| | | | | | | | | | | | | | | For firmware and kernel key increment testing we need to be able to rev only particular keys and verify an autoupdate works. BUG=None TEST=Ran it BRANCH=None Change-Id: Ic814480b4bf8fbc994132fcd7ba519c3be9b0ccd Reviewed-on: https://gerrit.chromium.org/gerrit/32458 Reviewed-by: Mike Frysinger <vapier@chromium.org> Commit-Ready: Kris Rambish <krisr@chromium.org> Tested-by: Kris Rambish <krisr@chromium.org>
* crossystem should switch on VbNvContext storage typeChe-Liang Chiou2012-09-181-2/+117
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We may have multiple storage types (disk or mkbp) of VbNvContext. crossystem should switch the type and choose the corresponding device driver. After patching U-Boot, you may check storage type: [ "mkbp" = "$(cat /proc/device-tree/firmware/chromeos/nonvolatile-context-storage)" ] And cross-verify crossystem with mosys: $ mosys nvram vboot read 70000000000000000000000000000020 $ crossystem recovery_request 0 $ crossystem recovery_request=123 $ mosys nvram vboot read 70007b0000000000000000000000005d $ mosys nvram vboot write 70000000000000000000000000000020 $ crossystem recovery_request 0 More importantly, crossystem should also work with older version of firmware, which does not pass down this information. Signed-off-by: Che-Liang Chiou <clchiou@chromium.org> BRANCH=none BUG=chrome-os-partner:13766 TEST=Check storage type on a Snow device: [ "mkbp" = "$(cat /proc/device-tree/firmware/chromeos/nonvolatile-context-storage)" ] Make sure that FAFT is still happy: ./run_remote_tests.sh --remote $ADDR --board daisy 'firmware_TryFwB/control$' ./run_remote_tests.sh --remote $ADDR --board daisy 'firmware_TryFwB/control.dev$' More importantly, check crossystem worked well even when ChromeOS is booted from an older version of firmware. Change-Id: I3989a8c181efe03cd9f06127743763e0ad97e281 Reviewed-on: https://gerrit.chromium.org/gerrit/32470 Reviewed-by: Che-Liang Chiou <clchiou@chromium.org> Tested-by: Che-Liang Chiou <clchiou@chromium.org> Commit-Ready: Che-Liang Chiou <clchiou@chromium.org>
* scripts: Add the new GBB_FLAG_ENTER_TRIGGERS_TONORM usageTom Wai-Hong Tam2012-09-171-0/+1
| | | | | | | | | | | | | | | | | | This GBB_FLAG_ENTER_TRIGGERS_TONORM is new added for allowing Enter (default is Space) to trigger the TONORM screen. This flag is used by FAFT testing. Chage the usage of set_gbb_flags.sh to help an user. BUG=chrome-os-partner:12699 TEST=None. Trivial comment change. Change-Id: I8a1efa880627965570719f22dedfa0e31ab2d5f5 Reviewed-on: https://gerrit.chromium.org/gerrit/33404 Reviewed-by: Hung-Te Lin <hungte@chromium.org> Commit-Ready: Tom Wai-Hong Tam <waihong@chromium.org> Tested-by: Tom Wai-Hong Tam <waihong@chromium.org> Reviewed-by: Randall Spangler <rspangler@chromium.org>
* newbitmaps: Remove language in UPDATE screen.Hung-Te Lin2012-09-121-3/+7
| | | | | | | | | | | | | | Currently we don't accept keyboard input in UPDATE screen. BRANCH=none BUG=chrome-os-partner:13821 TEST=make # no more languages on UPDATE screen. Change-Id: I08fa6dab7415e9a461ca8096073e98a155a8489e Reviewed-on: https://gerrit.chromium.org/gerrit/33161 Tested-by: Hung-Te Lin <hungte@chromium.org> Reviewed-by: Dave Parker <dparker@chromium.org> Commit-Ready: Hung-Te Lin <hungte@chromium.org>
* utility: Add "enable_dev_usb_boot".Hung-Te Lin2012-09-122-0/+43
| | | | | | | | | | | | | | | A shortcut and easier way to enable USB booting without always calling the huge firmware updater. BRANCH=none BUG=none TEST=./enable_dev_usb_boot # successfully set dev_usb_boot value. Change-Id: I9ebb3ce79ef58bc0a32926866d5e1827a92b6e74 Reviewed-on: https://gerrit.chromium.org/gerrit/33046 Reviewed-by: Randall Spangler <rspangler@chromium.org> Commit-Ready: Hung-Te Lin <hungte@chromium.org> Tested-by: Hung-Te Lin <hungte@chromium.org>
* sign_official_build.sh: rename "install" to "factory"Mike Frysinger2012-09-121-2/+3
| | | | | | | | | | | | | | | | This lines up with the terminology that people have been using, and the valid types that can appear in signer instruction files. We keep around the old "install" so that other code continues to work. BUG=None TEST=None BRANCH=none Change-Id: I8d0d2ab4c0ae61f6bcdbcc24ec9796d9eabe386e Reviewed-on: https://gerrit.chromium.org/gerrit/33056 Reviewed-by: David McMahon <djmm@chromium.org> Commit-Ready: Mike Frysinger <vapier@chromium.org> Tested-by: Mike Frysinger <vapier@chromium.org>
* newbitmaps: Add 1280x* with AR=8x5 profilesHung-Te Lin2012-09-112-1/+15
| | | | | | | | | | | | | | For larger panels, we want to support 1280x* profiles. BRANCH=none BUG=chrome-os-partner:12896 TEST=make # all profiles generated. Change-Id: I5b6729e4335bc0ade3948151e766c02ab937435d Reviewed-on: https://gerrit.chromium.org/gerrit/32892 Tested-by: Hung-Te Lin <hungte@chromium.org> Reviewed-by: Dave Parker <dparker@chromium.org> Commit-Ready: Hung-Te Lin <hungte@chromium.org>
* newbitmaps: Remove SD card asset for USB-only profiles.Hung-Te Lin2012-09-103-3/+2
| | | | | | | | | | | | BRANCH=none BUG=chrome-os-partner:13767 TEST=make # success, s1024usb profiles don't have SD in Remove page. Change-Id: Ifa605dea50d9d8538fca6032743662e9d8dc7e6c Reviewed-on: https://gerrit.chromium.org/gerrit/32683 Reviewed-by: Hung-Te Lin <hungte@chromium.org> Tested-by: Dave Parker <dparker@chromium.org> Commit-Ready: Dave Parker <dparker@chromium.org>
* Don't copy BMP data on ARMSimon Glass2012-09-102-0/+9
| | | | | | | | | | | | | | | | | | | | | This just chews up memory and wastes time on ARM, since the data is already in memory. BUG=chrome-os-partner:13492 BRANCH=snow TEST=manual Build and boot on snow with manually modified code, to see that the bmpfv pointer is in the same region as the bmp region. Build and boot on link and see that displaying screens is still fast. Change-Id: I98349b73671e38fa6cace966b6953a2abf129fab Reviewed-on: https://gerrit.chromium.org/gerrit/32629 Reviewed-by: Mike Truty <truty@chromium.org> Reviewed-by: Randall Spangler <rspangler@chromium.org> Tested-by: Simon Glass <sjg@chromium.org> Reviewed-by: Che-Liang Chiou <clchiou@chromium.org> Commit-Ready: Simon Glass <sjg@chromium.org>
* Define all screens in enum ScreenIndex and use themSimon Glass2012-09-102-12/+16
| | | | | | | | | | | | | | | | | | This enum seems partially complete, and not used in vboot_reference. Complete it and use it. BUG=chrome-os-partner:13492 BRANCH=snow TEST=manual Build and boot through to recovery on snow. Run through the various screens and check that they still appear correctly. Change-Id: Ifca54d072457d9a0396a38026f44f8334efb9cf5 Reviewed-on: https://gerrit.chromium.org/gerrit/32628 Reviewed-by: Mike Truty <truty@chromium.org> Reviewed-by: Randall Spangler <rspangler@chromium.org> Tested-by: Simon Glass <sjg@chromium.org> Commit-Ready: Simon Glass <sjg@chromium.org>
* Replace %L with %ll in format strings.Gabe Black2012-09-093-4/+4
| | | | | | | | | | | | | | | | | | | %L is, in some standard libraries like U-Boot's, a synonym for %ll which is for long long integers, required by the C99 standard to be at least 64 bits. For practical purposes that basically means %ll should be used with 64 bit values. Since %L seems to be non-standard and, at least in U-Boot's case, %ll is recognized in the same way, %ll seems preferable. BUG=chrome-os-partner:8339 TEST=Booted ChromeOS using depthcharge and U-Boot. Booted with depthcharge/libpayload which does not support %L and saw a number where %L had been printed. BRANCH=None Change-Id: Id51fb5c9295e0dd65b42a5c0738eb34c8210a2b2 Signed-off-by: Gabe Black <gabeblack@google.com> Reviewed-on: https://gerrit.chromium.org/gerrit/32660 Reviewed-by: Randall Spangler <rspangler@chromium.org>
* Remove power button work-around for ARMSimon Glass2012-09-072-5/+9
| | | | | | | | | | | | | | | | | | | | | | | | On x86 U-Boot cannot see the power button, which means that the EC must deal with it, and may power off the unit at any time. To get around this, we write the vbcontext every time we change it. Since this isn't a problem on ARM, and we want to avoid spurious writes (due to delay and disk wear), make this code execute only on x86 machines. BUG=chrome-os-partner:13717 BUG=chrome-os-partner:7689 BRANCH=snow,link TEST=manual On snow, see that the EC no longer gets MKBP messages to write the nv context. On link, manually add a print to U-Boot's nvstorage_write_disk() function and see that changing language in recovery still causes a write. Change-Id: I62508739c9fc3aca46fba58b196a8af45269af2a Reviewed-on: https://gerrit.chromium.org/gerrit/32464 Commit-Ready: Tom Wai-Hong Tam <waihong@chromium.org> Reviewed-by: Tom Wai-Hong Tam <waihong@chromium.org> Tested-by: Tom Wai-Hong Tam <waihong@chromium.org>
* Check keyboard more often in recovery modeSimon Glass2012-09-071-7/+8
| | | | | | | | | | | | | | | | | | | | Currently we check the keyboard each 250ms. This makes for a pretty choppy experience when changing languages. Change to check every 20ms, without changing the disk check interval (which remains 1s). BUG=chrome-os-partner:13717 BRANCH=snow TEST=manual Boot into recovery Try changing language on snow with left/right arrow and see that it updates instantly. Change-Id: I2ae411bc36fdb2badac11595b099bca43f116669 Signed-off-by: Simon Glass <sjg@chromium.org> Reviewed-on: https://gerrit.chromium.org/gerrit/32463 Commit-Ready: Tom Wai-Hong Tam <waihong@chromium.org> Reviewed-by: Tom Wai-Hong Tam <waihong@chromium.org> Tested-by: Tom Wai-Hong Tam <waihong@chromium.org>
* Cache GBB images to speed up displaySimon Glass2012-09-071-5/+5
| | | | | | | | | | | | | | | | | | | | | Rather than read the images from slow flash every time we need them, cache them the first time and use that cache thereafter. BUG=none BRANCH=snow,link TEST=manual Go into recovery mode on link See that we can display a new screen in roughly 20ms instead of the 250ms it previously took on link. Also tested on snow and shown to have no ill effects. Change-Id: Ieb39c44bddeb6315da8983669f19f550888659bd Signed-off-by: Simon Glass <sjg@chromium.org> Reviewed-on: https://gerrit.chromium.org/gerrit/32462 Commit-Ready: Tom Wai-Hong Tam <waihong@chromium.org> Reviewed-by: Tom Wai-Hong Tam <waihong@chromium.org> Tested-by: Tom Wai-Hong Tam <waihong@chromium.org>
* newbitmaps: Add more locales & fix locale 'ms' (Malay).Hung-Te Lin2012-09-0612-1/+33
| | | | | | | | | | | | | | | Adding 'update' and language description for locale 'ms'. Also fixed 'model' height in 'th' locale. BRANCH=none BUG=chrome-os-partner:11969 TEST=make # success. Change-Id: I3eb12d43284bab8c3c243cf86e3dc90c7c0e5497 Reviewed-on: https://gerrit.chromium.org/gerrit/32440 Tested-by: Hung-Te Lin <hungte@chromium.org> Reviewed-by: Dave Parker <dparker@chromium.org> Commit-Ready: Hung-Te Lin <hungte@chromium.org>
* Allow vbutil_kernel to work on block devicesVincent Palatin2012-09-061-5/+19
| | | | | | | | | | | | | | | | | | Block devices return a size of 0 when stat'ed. In order to be able to verify directly a raw partition, let's add a special case to query the block device size. BUG=chromium-os:34176 TEST="vbutil_kernel --verify /dev/sda4 --verbose" shows the actual content not an error message. BRANCH=none Change-Id: Ibecf0a88816abf97305f0f87c0131ba7b66e386c Reviewed-on: https://gerrit.chromium.org/gerrit/32302 Reviewed-by: Randall Spangler <rspangler@chromium.org> Reviewed-by: Jon Salz <jsalz@chromium.org> Commit-Ready: Vincent Palatin <vpalatin@chromium.org> Tested-by: Vincent Palatin <vpalatin@chromium.org>
* Esc at DEV screen no longer triggers TONORMRandall Spangler2012-09-061-2/+1
| | | | | | | | | | | | | | | | BUG=chrome-os-partner:13765 BRANCH=all TEST=manual 1. boot in dev mode. see DEV screen 2. press space -> TONORM 3. press esc -> DEV 4. press esc -> (still at DEV) Change-Id: I9ed2fd2ff2380b058f1aa677ccd516d9fd5679d2 Signed-off-by: Randall Spangler <rspangler@chromium.org> Reviewed-on: https://gerrit.chromium.org/gerrit/32454 Reviewed-by: Duncan Laurie <dlaurie@chromium.org>
* Key increment script: Preserve extension and take the target keyset directoryGaurav Shah2012-09-061-8/+22
| | | | | | | | | | | | | | | | | | First, preserve extensions for the backed up keys (and keyblocks). Useful since our wrapping scripts look at the extension in deciding what needs wrapping. Second, instead of having to run the script from within a keyset directory, take the keyset path as an argument and increment the versions for the keys in there. BUG=chrome-os-partner:13748 TEST=ran on devkeys BRANCH=none Change-Id: I9e8c3e58149e5cb4cd5557521e047e25c06b0cd6 Reviewed-on: https://gerrit.chromium.org/gerrit/32417 Reviewed-by: Mike Frysinger <vapier@chromium.org> Tested-by: Gaurav Shah <gauravsh@chromium.org>
* signing script: Resign just firmware body, not the entire sectionfactory-2848.BChe-Liang Chiou2012-09-041-6/+42
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The signing script extracted firmware body sections FW_MAIN_{A,B} and resigned the whole section instead of just firmware body. As a result, read-only firmware spends more time loading read-write firmware from SPI flash. Since vblock has firmware body size information, signing script should retrieve it and use it to sign just firmware body. This may reduce boot time for ~560ms, depending on firmware image size, section size and SPI flash/bus throughput. Signed-off-by: Che-Liang Chiou <clchiou@chromium.org> BRANCH=snow,link BUG=chrome-os-partner:13094 TEST=For Snow (or boards that use cros_bundle_firmware), check that after resigning, VBLOCK_{A,B} and FW_MAIN_{A,B} are unchanged For Alex and ZGB, check that old and new resign_firmwarefd.sh generates identical output (Test for Snow; repeat for A and B) dump_fmap -x image.bin VBLOCK_A FW_MAIN_A mv VBLOCK_A VBLOCK_A.orig mv FW_MAIN_A FW_MAIN_A.orig resign_firmwarefd.sh image.bin image-resigned.bin \ firmware_data_key.vbprivk \ firmware.keyblock \ dev_firmware_data_key.vbprivk \ dev_firmware.keyblock \ kernel_subkey.vbpubk dump_fmap -x image-resigned.bin VBLOCK_A FW_MAIN_A cmp VBLOCK_A.orig VBLOCK_A cmp FW_MAIN_A.orig FW_MAIN_A (Test for Alex and ZGB; repeat for old and new resign_firmwarefd.sh) resign_firmwarefd.sh image.bin image-resigned-{old or new}.bin \ firmware_data_key.vbprivk \ firmware.keyblock \ dev_firmware_data_key.vbprivk \ dev_firmware.keyblock \ kernel_subkey.vbpubk cmp image-resigned-old.bin image-resigned-new.bin Change-Id: Ie70b6c91614343ad9f991ae369a0f8e74ec213fe Reviewed-on: https://gerrit.chromium.org/gerrit/31572 Commit-Ready: Che-Liang Chiou <clchiou@chromium.org> Tested-by: Che-Liang Chiou <clchiou@chromium.org> Reviewed-by: Simon Glass <sjg@chromium.org> Reviewed-by: Gaurav Shah <gauravsh@chromium.org>
* mount-encrypted: mount with commit=600factory-2846.BKees Cook2012-08-311-1/+1
| | | | | | | | | | | | | | Mount with commit=600, just as the unencrypted stateful is mounted. BUG=chrome-os-partner:13185 TEST=x86-alex build Change-Id: I0cee85c8bdabccb6545ca2238f6d5a120300e3aa Signed-off-by: Kees Cook <keescook@chromium.org> Reviewed-on: https://gerrit.chromium.org/gerrit/31762 Commit-Ready: Luigi Semenzato <semenzato@chromium.org> Reviewed-by: Luigi Semenzato <semenzato@chromium.org> Tested-by: Luigi Semenzato <semenzato@chromium.org>
* Revert "Change FMAP search stride from 4-byte to 64-byte."Louis Yung-Chieh Lo2012-08-291-1/+1
| | | | | | | | | | | | | | This reverts commit 92951c813dc416c24d8a9eda39d037f46baeb077. BUG=chromium-os:33963, TEST=None BRANCH=None Change-Id: I186432ab4cdb91495f81a1574863fada28f59603 Reviewed-on: https://gerrit.chromium.org/gerrit/31690 Commit-Ready: Yung-Chieh Lo <yjlou@chromium.org> Reviewed-by: Yung-Chieh Lo <yjlou@chromium.org> Tested-by: Yung-Chieh Lo <yjlou@chromium.org>
* Declare VbExProtectFlash() in vboot_api.h so we can implement it.Bill Richardson2012-08-281-0/+8
| | | | | | | | | | | | | | | | We have to define the function we need here, so that we can implement it in U-Boot, then we can come back here and try to use it. Grr. BUG=chrome-os-partner:11215 BRANCH=link TEST=none This just defines the function prototype. No change to test. Change-Id: I38a19baa54c59c9744d20f743eb53260f2d19852 Signed-off-by: Bill Richardson <wfrichar@chromium.org> Reviewed-on: https://gerrit.chromium.org/gerrit/31658 Reviewed-by: Randall Spangler <rspangler@chromium.org>
* Add VB_INIT_FLAG_SW_WP_ENABLED to VbInit() input flags.Bill Richardson2012-08-286-3/+24
| | | | | | | | | | | | | | | | | | We need to know not only whether the HW WP pin is asserted, but whether the flash chip has configured its software protection registers to actually protect anything. This flag can be used to indicate that. BUG=chrome-os-partner:13265 BRANCH=link TEST=none This just adds the flag. Nothing actually sets the flag yet, so there's nothing to test. Change-Id: Icba9945fb56eb3a4681486c630cbbdc9232485ef Signed-off-by: Bill Richardson <wfrichar@chromium.org> Reviewed-on: https://gerrit.chromium.org/gerrit/31642 Reviewed-by: Randall Spangler <rspangler@chromium.org>
* vbutil_keyblock: Fix argument to PrivateKeyReadPem()Gaurav Shah2012-08-281-1/+1
| | | | | | | | | | | | | | | | | | If the --signprivate_pem option is used to vbutil_keyblock and without an external signer, we were passing the wrong name to PrivateKeyReadPem() causing all such invocations to fail. This CL fixes the typo. (This particular path isn't current being used.) BUG=none TEST=manually verified with --signprivatekey_pem but without --external_signer. BRANCH=none Change-Id: I56df76a965706f654df1de8ac6e42738c15284c7 Reviewed-on: https://gerrit.chromium.org/gerrit/31556 Commit-Ready: Gaurav Shah <gauravsh@chromium.org> Reviewed-by: Gaurav Shah <gauravsh@chromium.org> Tested-by: Gaurav Shah <gauravsh@chromium.org>
* Change FMAP search stride from 4-byte to 64-byte.Louis Yung-Chieh Lo2012-08-271-1/+1
| | | | | | | | | | | | | | | | | | The FMAP requires to be aligned at 64-byte. Searchin at 4-byte could lead bug if a designated FMAP is located at 4-byte address. BUG=chrome-os-partner:13143, TEST=Tested in CL https://gerrit.chromium.org/gerrit/#/c/31436/ BRANCH=link,snow Signed-off-by: Louis Yung-Chieh Lo <yjlou@chromium.org> Change-Id: Ib7f36dc89d7d2763b1a72b641433d45bec6c2bef Reviewed-on: https://gerrit.chromium.org/gerrit/31442 Reviewed-by: Bill Richardson <wfrichar@chromium.org> Reviewed-by: David Hendricks <dhendrix@chromium.org> Reviewed-by: Simon Glass <sjg@chromium.org> Commit-Ready: Yung-Chieh Lo <yjlou@chromium.org> Tested-by: Yung-Chieh Lo <yjlou@chromium.org>
* cgpt: Fix error in modifying size of an existing partitionBill Richardson2012-08-242-2/+27
| | | | | | | | | | | | | | | | | | | Modifying the size of an existing partition without modifying the start as well assumed the start was at block 0. Sometimes it was caught, often it wasn't. Fix the error, add a test to catch the problem. BUG=chrome-os-partner:13090 BRANCH=all TEST=manual make && make runtests Change-Id: I4f5a5031a90a3e78d886ed3573f61305316a3f1f Signed-off-by: Bill Richardson <wfrichar@chromium.org> Reviewed-on: https://gerrit.chromium.org/gerrit/31418 Reviewed-by: Randall Spangler <rspangler@chromium.org>
* Rename $GPT as $CGPT, just for clarity.Bill Richardson2012-08-241-63/+63
| | | | | | | | | | | | | | | | I'm about to add a new test to fix some borkage with cgpt. First step is to clean up the script a little bit. BUG=none (yet) BRANCH=all TEST=manual make && make runtests Change-Id: I2311b5eb20aff80c4a0435cf1d10331c679af3c0 Signed-off-by: Bill Richardson <wfrichar@chromium.org> Reviewed-on: https://gerrit.chromium.org/gerrit/31379 Reviewed-by: Randall Spangler <rspangler@chromium.org>
* Fix broken bitmap testsBill Richardson2012-08-246-6/+6
| | | | | | | | | | | | | | | | When we changed the bmpblk version from 1.2 to 2.0, the tests weren't updated. BUG=chrome-os-partner:11078 BRANCH=all TEST=manual make && make runtests Change-Id: I244a9aeeb34be912fe6058687394c37d0e474890 Signed-off-by: Bill Richardson <wfrichar@chromium.org> Reviewed-on: https://gerrit.chromium.org/gerrit/31377 Reviewed-by: Randall Spangler <rspangler@chromium.org>
* signer scripts: break kernel parameters on spaces rather than word boundariesMike Frysinger2012-08-241-7/+15
| | | | | | | | | | | | | | | | | | | | | The current kernel parameter parsing logic uses word boundaries (\b) to keep from replacing parameters inside of other parameters (like "level=1" mangling "loglevel=1" into "log"), but this fails when the last character isn't a "word" character. e.g. "\bconsole=\b" doesn't match "console=". Change the \b to a space. Since we're already using spaces as our split marker, this shouldn't be a problem. BRANCH=None BUG=chrome-os-partner:12780 BUG=chromium-os:33868 TEST=ran `ensure_secure_kernelparams.sh` on an image with 'console=' and saw it work Change-Id: Id69250179ea76aabfed9cd21c1c59483d78a215d Reviewed-on: https://gerrit.chromium.org/gerrit/31356 Reviewed-by: David McMahon <djmm@chromium.org> Commit-Ready: Mike Frysinger <vapier@chromium.org> Tested-by: Mike Frysinger <vapier@chromium.org>
* signer scripts: include debug output when we failMike Frysinger2012-08-241-0/+21
| | | | | | | | | | | | | | | | When checking kernel params fail, it's useful to know all the variables as to what it's doing. So dump some state when an error occurs. BRANCH=None BUG=None TEST=ran `ensure_secure_kernelparams.sh` on a bad image and saw useful output TEST=ran `ensure_secure_kernelparams.sh` on a good image and saw no output Change-Id: I0e499f87a6d8feed80da72aba75e1e6c1b4076c9 Reviewed-on: https://gerrit.chromium.org/gerrit/31355 Reviewed-by: David McMahon <djmm@chromium.org> Commit-Ready: Mike Frysinger <vapier@chromium.org> Tested-by: Mike Frysinger <vapier@chromium.org>
* Short-circuit looping for audio in Sandbox U-Boot buildsTaylor Hutt2012-08-241-0/+4
| | | | | | | | | | | | | | | | | Sandbox U-Boot has no sound, so there is no point in looping while it doesn't really play. BRANCH=none BUG=chromium-os:32603 TEST=Sandbox U-Boot has no sound, no need to loop Signed-off-by: Taylor Hutt <thutt@chromium.org> Change-Id: I5ff987d9d80c2d24ae6502c36cf399e582dff524 Reviewed-on: https://gerrit.chromium.org/gerrit/31015 Reviewed-by: Bill Richardson <wfrichar@chromium.org> Commit-Ready: Taylor Hutt <thutt@chromium.org> Reviewed-by: Taylor Hutt <thutt@chromium.org> Tested-by: Taylor Hutt <thutt@chromium.org>
* newbitmaps: Add "native 1366x768 USB" profile.Hung-Te Lin2012-08-242-1/+7
| | | | | | | | | | | | BRANCH=none # we always build images in ToT. BUG=chrome-os-partner:13048 TEST=make # got n1366usb bmpblk.bin Change-Id: I5af3c4f599c6789c208013095db86f0836241ced Reviewed-on: https://gerrit.chromium.org/gerrit/31324 Reviewed-by: Bill Richardson <wfrichar@chromium.org> Commit-Ready: Hung-Te Lin <hungte@chromium.org> Tested-by: Hung-Te Lin <hungte@chromium.org>
* Fix reporting TPM kernel version and firmware version on ZGBRandall Spangler2012-08-231-6/+6
| | | | | | | | | | | | | | | | These fields are part of the version 1 struct, but were mistakenly labeled as version 2 fields. Since ZGB firmware produces a version 1 struct, crossystem was treating the fields as unavailable. BUG=chromium-os:33685 TEST=crossystem tpm_fwver tpm_kernver BRANCH=none (OS utility change, not firmware, and affects only Alex/ZGB) Change-Id: Ic857ee2da9a7ae7f0d42317b711bf102d068de64 Signed-off-by: Randall Spangler <rspangler@chromium.org> Reviewed-on: https://gerrit.chromium.org/gerrit/30904 Tested-by: Sonny Rao <sonnyrao@chromium.org> Reviewed-by: Sonny Rao <sonnyrao@chromium.org>
* newbitmaps: Reduce spacing between for_help and URL text.Hung-Te Lin2012-08-222-1/+6
| | | | | | | | | | | | | | | Both for_help_* and Url bitmaps have margin, so it looks too large as a "margin*2 + 5(x_pad)" gap on screen. BRANCH=none BUG=chrome-os-partner:12893 TEST=make # All bitmaps generated. Change-Id: Ic8d3e9180e52b7476b07367a027793cea0ed3109 Reviewed-on: https://gerrit.chromium.org/gerrit/30988 Tested-by: Hung-Te Lin <hungte@chromium.org> Reviewed-by: Dave Parker <dparker@chromium.org> Commit-Ready: Hung-Te Lin <hungte@chromium.org>
* mount-encrypted: explicitly use uint64_t for sizesKees Cook2012-08-223-53/+55
| | | | | | | | | | | | | | | On very large HDDs, the sector count was wrapping around. Switch most calculations to bytes using uint64_t, and use BLKGETSIZE64 for checking the loopback device size. BUG=chrome-os-partner:12705 TEST=parrot build, manual testing STATUS=Fixed Change-Id: I1f7aea81151ed5cc130b1f6a05fda83f7a85150f Signed-off-by: Kees Cook <keescook@chromium.org> Reviewed-on: https://gerrit.chromium.org/gerrit/31073 Reviewed-by: Elly Jones <ellyjones@chromium.org>
* newbitmaps: Improve insert_sd_usb2 message.Hung-Te Lin2012-08-2052-52/+166
| | | | | | | | | | | | | | | | | "insert_sd_usb2" message didn't include the "ChromeOS is missing or damaged" text, also is too long for certain locales. We should revise message and check if the locale fits screen width. BRANCH=none BUG=none TEST=cd strings; make # all pass Change-Id: Ie9cb5e4ecd6d143772ffa8e7de29c202e9bde130 Reviewed-on: https://gerrit.chromium.org/gerrit/30824 Tested-by: Hung-Te Lin <hungte@chromium.org> Reviewed-by: Dave Parker <dparker@chromium.org> Commit-Ready: Hung-Te Lin <hungte@chromium.org>
* newbitmaps: Support more profiles.Hung-Te Lin2012-08-207-3/+31
| | | | | | | | | | | | | | | Added "n1366usb2" profile and remove SD icon in *usb profile. BRANCH=none BUG=chrome-os-partner:11078 TEST=make # all profiles generated. Change-Id: If280cebb847cdc7a599f510f279df03e1cc9b4d5 Reviewed-on: https://gerrit.chromium.org/gerrit/30810 Tested-by: Hung-Te Lin <hungte@chromium.org> Reviewed-by: Bill Richardson <wfrichar@chromium.org> Reviewed-by: Dave Parker <dparker@chromium.org> Commit-Ready: Hung-Te Lin <hungte@chromium.org>
* newbitmaps: Change build targets from x86/arm to "profiles".Hung-Te Lin2012-08-175-51/+63
| | | | | | | | | | | | | | | | | | | | | The difference of firmware bitmaps won't rely on platform (x86/arm) in future; instead, things will differ by rescaling & message contents. To support that, we need to change build target from "platform" to "profiles". To build all platforms, run "make" in top leve (or "make all" in images). To debug (en locale without rescaling), run "make" in images folder. To debug a specific profile, run "make $PROFILE" in images folder. BRANCH=none BUG=chrome-os-partner:11078, chrome-os-partner:12790 TEST=make # all profiles generated in images/out_*/*.bin Change-Id: Iaabf160b1b2bc844d230188eb593daa8a597d378 Reviewed-on: https://gerrit.chromium.org/gerrit/30683 Commit-Ready: Hung-Te Lin <hungte@chromium.org> Reviewed-by: Hung-Te Lin <hungte@chromium.org> Tested-by: Hung-Te Lin <hungte@chromium.org>
* newbitmaps: Replace image source BMP files by PNG format.Hung-Te Lin2012-08-1713-2/+2
| | | | | | | | | | | | | | | PNG files are better for editing and checking than BMP files. Also smaller file size. BRANCH=none BUG=none TEST=make # x86 & arm bitmap blocks generated. Change-Id: I828779aafa4938cb21356a8c42dee27b1b3ad8ae Reviewed-on: https://gerrit.chromium.org/gerrit/30682 Commit-Ready: Hung-Te Lin <hungte@chromium.org> Reviewed-by: Hung-Te Lin <hungte@chromium.org> Tested-by: Hung-Te Lin <hungte@chromium.org>
* newbitmaps: Revise fonts, color, layout & messages.Hung-Te Lin2012-08-17163-135/+85
| | | | | | | | | | | | | | | | | | | | | Inspired by https://gerrit.chromium.org/gerrit/#/c/30631/ - Increase gray colored text contrast - Enlarge font size to 17pt - Change standard font to Verdata (which is wider than usually fonts, to provide better quality when stretched in horizontal) - Decomposed tonorm_confirmation & devmode so we can have better control to verif_* prompt, and look more similar to original mock. BUG=chrome-os-partner:11078 TEST=make # All platforms generated BRANCH=none Change-Id: If019b5767f13556df0e4da77f6457e092fa06016 Reviewed-on: https://gerrit.chromium.org/gerrit/30679 Commit-Ready: Hung-Te Lin <hungte@chromium.org> Reviewed-by: Hung-Te Lin <hungte@chromium.org> Tested-by: Hung-Te Lin <hungte@chromium.org>
* newbitmaps: Add "insert SD / USB2" text resource.Hung-Te Lin2012-08-1751-0/+51
| | | | | | | | | | | | | | We need the text for "SD or USB2" (i.e., not USB3). BRANCH=none BUG=chrome-os-partner:12790 TEST=none, only adding text translation resource. Change-Id: Id70a2565bb1fb0b6a4ed92d3fceddbc72e60d77a Reviewed-on: https://gerrit.chromium.org/gerrit/30663 Commit-Ready: Hung-Te Lin <hungte@chromium.org> Reviewed-by: Hung-Te Lin <hungte@chromium.org> Tested-by: Hung-Te Lin <hungte@chromium.org>
* Improved pretty-print for dump_fmap, with gap detectionBill Richardson2012-08-171-61/+221
| | | | | | | | | | | | | | | BUG=none BRANCH=none TEST=manual Use it to dump the FMAP from a firmware image: dump_fmap -h /build/link/firmware/image-link.bin Change-Id: I94fb9396ea886b072845fadef6ef1e1e2ff85a59 Signed-off-by: Bill Richardson <wfrichar@chromium.org> Reviewed-on: https://gerrit.chromium.org/gerrit/30784 Reviewed-by: Randall Spangler <rspangler@chromium.org>
* Fix vertical placement of bmp images on firmware screens.Dave Parker2012-08-161-11/+5
| | | | | | | | | | | | | BUG=chromium-os:33608 TEST=Run 'make' in newbitmaps directory to generate new bmpblock. Run on DUT. Observe spacing in the footer section is closer together. Change-Id: I96987e827fd395f13244dbc58db600de5dc30958 Reviewed-on: https://gerrit.chromium.org/gerrit/30610 Reviewed-by: Hung-Te Lin <hungte@chromium.org> Commit-Ready: Dave Parker <dparker@chromium.org> Tested-by: Dave Parker <dparker@chromium.org>
* Fix handling of enter and space in developer screens.Randall Spangler2012-08-162-60/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | At DEV screen: - Space triggers TONORM - Enter is ignored unless new GBB flag is set At TONORM screen: - Enter always means YES - Space is ignored So, if you hold the space key at the dev screen, you'll go to tonorm and stay there until you press Enter or Esc. If you hold the Enter key at the dev screen, nothing will happen. Add a GBB flag to allow Enter to trigger the TONORM screen; this will be used by FAFT testing. BRANCH=all BUG=chrome-os-partner:12699 TEST=manual 1. press enter at dev screen. nothing happens. 2. press space at dev screen. tonorm. 3. press space at tonorm. nothing happens. 4. press enter at tonorm. turns off dev mode. Change-Id: I9f3128d5114e1486911cc4d76d0ccd5649de1680 Signed-off-by: Randall Spangler <rspangler@chromium.org> Reviewed-on: https://gerrit.chromium.org/gerrit/30456 Reviewed-by: Tom Wai-Hong Tam <waihong@chromium.org>
* mount-encrypted: calculate inode ratio based on final sizeKees Cook2012-08-162-1/+74
| | | | | | | | | | | | | | | | mkfs.ext4 does not use the resize= hint for calculating inode ratios. This means very tiny initial filesystems will not get enough inodes once it has been resized. This calculates the desired inode ratio based on the expected final size of the filesystem. BUG=chrome-os-partner:12678 TEST=lumpy build, manual testing STATUS=Fixed Change-Id: I216aaaa6e0ef50e82265ee46ecac5a65bb077387 Signed-off-by: Kees Cook <keescook@chromium.org> Reviewed-on: https://gerrit.chromium.org/gerrit/30579 Reviewed-by: Gaurav Shah <gauravsh@chromium.org>
* Make crossystem look for the write protect switch in the chromeos_arm deviceGabe Black2012-08-161-2/+20
| | | | | | | | | | | | | | | | | | The value of the ChromeOS write protect switch is now provided through the new chromeos_arm platform device which avoids the mismatch between U-Boot and kernel GPIO numbering. BUG=chrome-os-partner:11297 TEST=gmerge-ed onto a snow and verified that crossystem got the right value of the write protect switch. BRANCH=snow Change-Id: I466370e4f6bf2d14c067518a9d620e9e60142a0b Signed-off-by: Gabe Black <gabeblack@google.com> Reviewed-on: https://gerrit.chromium.org/gerrit/30534 Reviewed-by: Simon Glass <sjg@chromium.org> Commit-Ready: Randall Spangler <rspangler@chromium.org> Reviewed-by: Randall Spangler <rspangler@chromium.org>
* Fix alignment of HWID on firmware screens and bitmap viewer.Dave Parker2012-08-157-5/+12
| | | | | | | | | | | | | | BUG=chrome-os-partner:12701 TEST=Disable the 'clean' step in the Makefile and run 'make' in newbitmaps directory. Use the bitmap_viewer to verify the HWID is correctly aligned when compared with the "Model" text. Change-Id: Icd3977f50461492a0999059ccd4982d16a373dce Reviewed-on: https://gerrit.chromium.org/gerrit/30453 Reviewed-by: Hung-Te Lin <hungte@chromium.org> Commit-Ready: Dave Parker <dparker@chromium.org> Tested-by: Dave Parker <dparker@chromium.org>
* Prevent color dithering of firmware bitmapsDave Parker2012-08-151-1/+2
| | | | | | | | | | | | | BUG=None TEST=Run 'make' in newbitmaps dir with "clean" removed from the default step in the Makefile. Use bitmap_viewer to check that the images do not show grainy color dithering. Change-Id: I6dff41338a7e54d090bb2f6dedb982fdaa31e657 Reviewed-on: https://gerrit.chromium.org/gerrit/30308 Reviewed-by: Hung-Te Lin <hungte@chromium.org> Commit-Ready: Dave Parker <dparker@chromium.org> Tested-by: Dave Parker <dparker@chromium.org>
View Lorry Controller Status