Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(44)

Side by Side Diff: build_kernel_image.sh

Issue 6274006: Revert "build_kernel_image: enable nmi watchdog" (Closed) Base URL: http://git.chromium.org/git/crosutils.git@master
Patch Set: Created 9 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 #!/bin/bash 1 #!/bin/bash
2 2
3 # Copyright (c) 2010 The Chromium OS Authors. All rights reserved. 3 # Copyright (c) 2010 The Chromium OS Authors. All rights reserved.
4 # Use of this source code is governed by a BSD-style license that can be 4 # Use of this source code is governed by a BSD-style license that can be
5 # found in the LICENSE file. 5 # found in the LICENSE file.
6 6
7 # Helper script that generates the signed kernel image 7 # Helper script that generates the signed kernel image
8 8
9 . "$(dirname "$0")/common.sh" 9 . "$(dirname "$0")/common.sh"
10 10
(...skipping 128 matching lines...) Expand 10 before | Expand all | Expand 10 after
139 rootwait 139 rootwait
140 ro 140 ro
141 noresume 141 noresume
142 noswap 142 noswap
143 i915.modeset=1 143 i915.modeset=1
144 loglevel=1 144 loglevel=1
145 cros_secure 145 cros_secure
146 kern_guid=%U 146 kern_guid=%U
147 tpm_tis.force=1 147 tpm_tis.force=1
148 tpm_tis.interrupts=0 148 tpm_tis.interrupts=0
149 nmi_watchdog=1
150 EOF 149 EOF
151 WORK="${WORK} ${FLAGS_working_dir}/config.txt" 150 WORK="${WORK} ${FLAGS_working_dir}/config.txt"
152 151
153 # We sign the image with the recovery_key, because this is what goes onto the 152 # We sign the image with the recovery_key, because this is what goes onto the
154 # USB key. We can only boot from the USB drive in recovery mode. 153 # USB key. We can only boot from the USB drive in recovery mode.
155 # For dev install shim, we need to use the installer keyblock instead of 154 # For dev install shim, we need to use the installer keyblock instead of
156 # the recovery keyblock because of the difference in flags. 155 # the recovery keyblock because of the difference in flags.
157 if [ ${FLAGS_use_dev_keys} -eq ${FLAGS_TRUE} ]; then 156 if [ ${FLAGS_use_dev_keys} -eq ${FLAGS_TRUE} ]; then
158 USB_KEYBLOCK=installer_kernel.keyblock 157 USB_KEYBLOCK=installer_kernel.keyblock
159 info "DEBUG: use dev install signing key" 158 info "DEBUG: use dev install signing key"
(...skipping 92 matching lines...) Expand 10 before | Expand all | Expand 10 after
252 info "Cleaning up temporary files: ${WORK}" 251 info "Cleaning up temporary files: ${WORK}"
253 rm ${WORK} 252 rm ${WORK}
254 rmdir ${FLAGS_working_dir} 253 rmdir ${FLAGS_working_dir}
255 fi 254 fi
256 255
257 info "Kernel partition image emitted: ${FLAGS_to}" 256 info "Kernel partition image emitted: ${FLAGS_to}"
258 257
259 if [[ -f ${FLAGS_rootfs_hash} ]]; then 258 if [[ -f ${FLAGS_rootfs_hash} ]]; then
260 info "Root filesystem hash emitted: ${FLAGS_rootfs_hash}" 259 info "Root filesystem hash emitted: ${FLAGS_rootfs_hash}"
261 fi 260 fi
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698