Commit Graph

26 Commits

Author SHA1 Message Date
Olof Johansson
24e10cb3db remove quiet and loglevel=1 from arm cmdline for now
It makes debugging system boot issues harder, so let's re-enable console
output for a while. It will be quieted down again later.

Change-Id: I7c543c09818c0152470c9f5e54d36c614d05bf3a

BUG=chrome-os-partner:3199
TEST=Boot a system, check for console output before login screen

Review URL: http://codereview.chromium.org/6801045
2011-04-07 15:08:08 -07:00
Duncan Laurie
1649ba8c1b Revert "Disable the 8042 MUX on our x86 devices."
This reverts commit 4deda9c24f.

BUG=chrome-os-partner:2811, chromium-os:13101
TEST=boot and verify /proc/cmdline
TBR=puneetster

Change-Id: I52990abc01fe5fc2d160d8efbb0a14bff1943ae4
2011-03-18 19:23:01 -07:00
Duncan Laurie
4deda9c24f Disable the 8042 MUX on our x86 devices.
The use of the mux can cause issues with some EC 8042 controllers and
result in loss of keyboard/trackpad between suspend/resume/reboot cycles.
We will never have more than keyboard+trackpad attached through the 8042
on our devices so using the mux is unnecessary.

BUG=chrome-os-partner:2700
TEST=manual verification that mux is not probed at boot:

Original:
serio: i8042 KBD port at 0x60,0x64 irq 1
serio: i8042 AUX0 port at 0x60,0x64 irq 12
serio: i8042 AUX1 port at 0x60,0x64 irq 12
serio: i8042 AUX2 port at 0x60,0x64 irq 12
serio: i8042 AUX3 port at 0x60,0x64 irq 12

New:
serio: i8042 KBD port at 0x60,0x64 irq 1
serio: i8042 AUX port at 0x60,0x64 irq 12

Change-Id: I942ab86eb71941ab072ad6a17d15b067ca94439d

Review URL: http://codereview.chromium.org/6679031
2011-03-12 15:45:19 -08:00
Vadim Bendebury
8e623f6ea5 Modify x86 kernel command line to enable nmi watchog.
For the kernel nmi to be activated and function properly it
must be enabled in the kernel command line. This CL adds
`nmi_watchdog=panic,lapic' (which is equivalent of
nmi_watchdog=2) to the command line. The reason '2' was used
and not '1' is that nmi_watchdog=1 is known to break audio
functionality on chromeos devices.

Note that only x86 platforms are affected by this change,
ARM platforms will be added later.

This CL is required by the autotest CL

http://codereview.chromium.org/6596002

Change-Id: Ie8a9ba3f0de6d236cbe098e402b0240aa64ddcd0

BUG=chromium-os:12463, chromium-os:12464
TEST=see below

. build new image for test and install it on the target
. restart the target
. observe the contents of /proc/sys/kernel/nmi_watchdog (it
  should read '1' after reboot)
. run autotest as follows
 (chroot) ~/trunk/src/scripts $ ./run_remote_tests.sh \
   --board=x86-mario --remote=172.22.75.163 \
   platform_KernelErrorPaths kernel_BootMessagesServer \
platform_HighResTimers
. observe the results:

INFO   : Test results:
---------------------------------------------------------
kernel_BootMessagesServer                           PASS
kernel_BootMessagesServer/kernel_BootMessagesServer PASS
  coldboot_active_mb                                50
  coldboot_anonpages_mb                             36
  coldboot_buffers_mb                               3
  coldboot_cached_mb                                166
  coldboot_inactive_mb                              156
  coldboot_memfree_mb                               1649
platform_HighResTimers                              PASS
platform_HighResTimers/platform_HighResTimers       PASS
platform_KernelErrorPaths                           PASS
platform_KernelErrorPaths/platform_KernelErrorPaths PASS
---------------------------------------------------------
Total PASS: 6/6 (100%)

No crashes detected during testing.
Elapsed time: 4m28s

Review URL: http://codereview.chromium.org/6597001
2011-02-28 10:28:31 -08:00
Che-Liang Chiou
75ac2beb67 Add transitional flag for enabling arm kernel signing
For now arm kernel partitions are not signed. This CL is a transitionsl.
That is, the added flag should be removed after arm verified boot is stable.

To properly create an arm kernel partition, we also need another CL for
vbutil_kernel utility that turns off x86-only modifications on kernel
image. See CL:6538015.

BUG=chromium-os:3790,chromium-os:12352
TEST=see below

Build images for x86 and arm successfully, and notice that load_kernel_test
passes for x86 and signed arm image.

$ build_image --board=tegra2_seaboard --crosbug12352_arm_kernel_signing
$ build_image --board=tegra2_seaboard --nocrosbug12352_arm_kernel_signing
$ build_image --board=x86-generic

Review URL: http://codereview.chromium.org/6538014

Change-Id: I1be381bae2fc367a0603ac2ec67ee70fc9a257e4
2011-02-24 12:00:16 +08:00
Will Drewry
b910de849c kernel build: use %U+1 for dm-verity booting
Using %U+1 will ensure that we avoid device enumeration issues during recovery mode
boots.

TEST=build_image+dev recovery kernel and boot to it on new cros fw / fixed enumeration problem
         used build with mp recovery kernel on cr-48 -> installed then booted fine
         used dev recovery kernel on a legacy machine; installed fine, booted fine
         tested with cr-48, mp recovery kernel, and noenable_rootfs_verification to ensure /dev/sd%D%P still worked as normal.

Change-Id: I5b1277a47536738a78c18988fd912cc05ebddd4b

BUG=chromium-os:5470

Review URL: http://codereview.chromium.org/6549034
2011-02-23 13:26:50 -06:00
Greg Spencer
798d75f3be This starts to fix the scripts so that they load from /usr/lib/crosutils
from within the chroot.

It also fixes a number of style issues.

It changes the meaning of cros_workon "list-all" to list all available
packages, and adds "list-live" to list all live packages.

It changes things that load chromeos-common.sh from the installer to
load it from /usr/lib/installer.

BUG=chromium-os:4230
TEST=synced, rebuilt chroot, made packages, made images, built chrome
from source, and wrote an image to a USB stick.

Review URL: http://codereview.chromium.org/6240018

Change-Id: I90c34420af1a64020402bafef8e9e77f56837c02
2011-02-01 22:04:49 -08:00
Olof Johansson
e0b7551f7b add quiet to arm bootargs
Not printing on the uart makes a huge difference in boot time performance. Since it's easy to re-enable again for those debugging boot time issues, let's disable it by default. It's how x86 does it as well.

Change-Id: Idb4af8d98434e70ee1389b3579c220da34be9c3b

BUG=chromium-os:11351
TEST=Build image and boot system

Review URL: http://codereview.chromium.org/6290011
2011-01-26 14:31:26 -08:00
Todd Broch
93300cd754 Revert "build_kernel_image: enable nmi watchdog"
This reverts commit ea621903e9.

TEST=grep dmesg for clock & nmi to make sure things look ok.
Run example program to make sure result of clock_getres call tv_nsec = 1 again
BUG=chromium-os:10720

Change-Id: Ife23fc7d08420788d4c165957d739ec2ce974969

Review URL: http://codereview.chromium.org/6274006
2011-01-18 10:05:21 -08:00
Mandeep Singh Baines
ea621903e9 build_kernel_image: enable nmi watchdog
BUG=10425
TEST=Tested before and after.

Change-Id: Ic3e66805945f379a79562338b16845bb5dbd674f
Before: Machine hangs till power-cycle.
After: Machine reboots and we get a crash dump.

Review URL: http://codereview.chromium.org/5893005
2010-12-16 18:27:06 -08:00
Allen Martin
5b2f49deeb Support booting from non zero MMC device numbers
On ARM platform read kernel from device passed in from u-boot
instead of hardcoding it to 0

BUG=none
TEST=emerged on seaboard, booted from SD card and emmc

Change-Id: Ia4506ed9f85d94eb37a9ac57430e1490d106c403

Review URL: http://codereview.chromium.org/5612008
Patch from Allen Martin <amartin@nvidia.com>.
2010-12-09 16:35:39 -08:00
Nick Sanders
ada8a1fdcc Notes:
This just matches H2C and H2O

Changes are:
-earlyprintk: serial isn't supported, so remove
-console=ttyS0: allow /dev/console to function, after serial console support is removed.

+quiet: sets loglevel=2, quiets early boot
+console=tty2: this will output console onto vt2.
+loglevel=1: this reduces output to vt2 past what quiet specifies.

BUG=chromium-os:8084
TEST="boot factory install shim, regular image. Note /dev/console works and outputs to tty2"

Change-Id: I2d77bf1de5870c7e610859f063d5a587acd56051

Review URL: http://codereview.chromium.org/4167001
2010-10-26 02:56:51 -07:00
Luigi Semenzato
195aebeaea Add tpm_tis module configuration options in preparation for linking with kernel
We need to set these options in order to link the TPM driver in the kernel before we fix the PNP table in the firmware.  This is the least disruptive change that makes the TPM available earlier in the boot sequence.

Change-Id: I729cd7c153507200e177895bae01951e97b70968

BUG=none
TEST=rebuilt kernel, reinstalled, booted, verified that tcsd still runs

Review URL: http://codereview.chromium.org/3969001
2010-10-20 17:35:00 -07:00
Will Drewry
d6435d4746 kernel cmdline: add dm_verity.dev_wait=1
dm_verity will wait for a device to be ready. This is needed in the factory installer so that
dmsetup doesn't fail early before the usb device is visible.

TEST=built images and booted them (x86-generic & factory installer)
            Prior to commit, need to ensure dev_wait doesn't break unverified boot behavior
BUG=chromium-os:7451

Change-Id: I5b838b94e6a17dd0778331121311cdfe180991ce

Review URL: http://codereview.chromium.org/3936001
2010-10-20 15:37:46 -05:00
Kenneth Waters
9bc78b3acb make_image: Fake vmlinuz_hd.vblock on ARM.
- This unbreaks the devserver's update server for ARM.
- This also unforks some of build_image.

BUG=None
TEST=Installed to tegra2_seaboard from USB without --skip_vblock,
     updated tegra2_seaboard.

Review URL: http://codereview.chromium.org/3493004

Change-Id: I6e66344de51609393407934f78aa20f49974efef
2010-09-22 13:54:44 -07:00
Kenneth Waters
ed54d93e2c build_image: Add verity support for ARM.
- Build a "kernel image" which contains a uboot script and a uboot kernel
  image.
- Fix some sd* assumptions.
- Remove cruft that has never done anything usefull from update_bootloaders

BUG=none
TEST=Built, booted, and updated on tegra2_dev-board

Review URL: http://codereview.chromium.org/3396011

Change-Id: I00ecf57faa5fe64c8e33dd4c042f1dbed806c10a
2010-09-21 10:29:54 -07:00
Tan Gao
843b70acf4 Issue 5183: Create a developer shim for release builds
Change-Id: I14cd9dc365093c0450210d7853ad5f67ffa0ddd0

BUG=chromium-os:5183
TEST=1) manually built a dev install shim and verified it's only bootable when dev switch is ON

Review URL: http://codereview.chromium.org/3153001
2010-08-17 09:41:48 -07:00
Bill Richardson
8bfa4685df Add "kern_guid=%U" to the secure boot kernel command-line template.
With the newest Chrome OS BIOS and bootstub, this will be expanded to the
booted kernel partition's UniqueGuid, so that the kernel device can be
determined with certainty, since the BIOS and kernel may enumerate drives
differently.

You can identify the booted kernel partition at runtime with something like
this:

  sudo cgpt find -1 -u \
    $(cat /proc/cmdline | sed 's/.*kern_guid=\([0-9a-f-]\+\).*/\1/')

Review URL: http://codereview.chromium.org/3035020
2010-07-23 17:24:15 -07:00
Will Drewry
78992a33f4 build_image, build_kernel_image, update_bootloaders: fix up rootfs_verification
This change adds
- --rootfs_hash_pad to specify the MBs reserved for the pad
- the implementation of the above flag
- check if total fs size + pad size exceeds the partition size
- hash appending in make_image_bootable()

Fixes:
- a style for ROOT_FS_HASH usage
- bad mount|grep
- bad bash subst for root devices in all boot paths
- fixed a typo in the update_bootloaders table creation
- disables verified usb for now

Adding the padding argument ensures that the generated hash tree for the root filesystem is appended to the image.  Assuming the rootfs is _never_ mounted read-write
again, that hash tree will be valid and vboot will be able to proceed.

BUG=chromium-os:2693
TEST=manual build_image

Review URL: http://codereview.chromium.org/3043011

Change-Id: I67d9b0f91cacdefa309c0cc2dd7fed1d2eddd7a7
2010-07-21 14:02:20 -05:00
Will Drewry
1670d481a1 build_image, build_kernel_image, legacy_bootloaders: Rename vboot flags
The use_vboot and vboot_ flags were confusing from a functionality perspective
since verified boot as a feature encompasses firmware and kernel functionality.
The firmware bits are always enabled, but use_vboot enabled the image-integrity
portion of vboot.  It is not called
  --enable_rootfs_verification
and all options for the kernel functionality is under --verity_* given that
verity/dm-verity is the current working name for the module and userspace tool.

TEST=ran x86-generic build_image & tegra2-dev-board build_image and checked the resulting boot.config files (with and without --enable_rootfs_verification).
BUG=chromium-os:2693

Review URL: http://codereview.chromium.org/2917008
2010-07-09 13:08:38 -07:00
Louis Yung-Chieh Lo
3602040b74 Use the new developer keys to sign things. (submit for Bill)
The original CL is http://codereview.chromium.org/2868044/show

Review URL: http://codereview.chromium.org/2818045
2010-07-05 13:23:34 +08:00
Will Drewry
821d07cb42 build_image: fix hash perms & arm image path
This should fix the bad parsing and the failed archiving.
EMphasis on should. I'll keep monitoring.

TEST=in progress
BUG=none

Review URL: http://codereview.chromium.org/2812044
2010-07-03 17:14:58 -07:00
Will Drewry
bcbf1c4484 [PATCH 2/5] build_kernel_image: add verified boot support
Adds rootfs image hashing to the build.  If it is hashed
even if the default boot device is not dm-0, the baseline
rootfs integrity information will be included (though
device setup will fail in the logs during boot).

TEST=manually ran without enabling vboot support.
BUG=chromium-os:327

Review URL: http://codereview.chromium.org/2808043
2010-07-03 10:23:30 -05:00
Bill Richardson
2ace49e0a4 Generate and use .vbprivk files for signing now.
Review URL: http://codereview.chromium.org/2817047
2010-07-01 10:23:27 -07:00
Randall Spangler
d51f39f681 TBR: wfrichar
Change flags for key block to 15 so it works in all modes, since I'm
about to fix the vboot bug which prevented flag checking from working.

BUG=none
TEST=none
2010-06-29 18:03:30 -07:00
Will Drewry
69563b7349 build_image: pull out kernel partition creation
Makes kernel partition creation standalone.  This is motivated
both by the ability to build test kernel partitions easily as well
the need to create all kernel command line configuration after the
rootfs has been completely created.

Instead of a massive overhaul, I'll do this refactor in pieces.

TEST=manually rebuilt the image
BUG=chromium-os:327

Review URL: http://codereview.chromium.org/2825021
2010-06-24 16:12:58 -05:00