diff options
| author | Doug Anderson <dianders@chromium.org> | 2011-07-20 17:15:45 -0700 |
|---|---|---|
| committer | Simon Glass <sjg@chromium.org> | 2011-08-29 10:59:04 -0700 |
| commit | 61779cad71f91fb01925f4aabadfbf3d08a4ff7c (patch) | |
| tree | 91f61bc227a78c6e80302a0fad82c6b6935ccebd /include/configs/tegra2-common.h | |
| parent | 3464b37bac038b75d0925e0d6d1f2cc637d0e4f8 (diff) | |
CHROMIUM: ARM: tegra: Remove 'secure_boot' variable from u-boot.
The secure boot now can just call 'vboot_twostop' directly.
BUG=chromium-os:17940
TEST=Built and booted non-legacy image.
Change-Id: I20148f71007ef519ad09c3321eaf935f4a02bc26
Reviewed-on: http://gerrit.chromium.org/gerrit/4455
Tested-by: Doug Anderson <dianders@chromium.org>
Reviewed-by: Tom Wai-Hong Tam <waihong@chromium.org>
Reviewed-by: Gaurav Shah <gauravsh@chromium.org>
Diffstat (limited to 'include/configs/tegra2-common.h')
| -rw-r--r-- | include/configs/tegra2-common.h | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/include/configs/tegra2-common.h b/include/configs/tegra2-common.h index 164836fcd7..7d78faa9cf 100644 --- a/include/configs/tegra2-common.h +++ b/include/configs/tegra2-common.h @@ -381,10 +381,10 @@ * A few notes: * - Right now, we can only boot from one USB device. Need to fix this once * usb works better. - * - We define "non_verified_boot", which is the normal boot command. - * - At the moment, we define "secure_boot". This is specified in the FDT - * as the boot command when we've got secure boot turned on. TODO(dianders): - * Just have the FDT run vboot_twostop directly. + * - We define "non_verified_boot", which is the normal boot command unless + * it is overridden in the FDT. + * - When we're running securely, the FDT will specify to call vboot_twostop + * directly. */ #define CONFIG_EXTRA_ENV_SETTINGS_COMMON \ @@ -415,9 +415,7 @@ "run usb_boot; " \ \ "run mmc1_boot; " \ - "run mmc0_boot\0" \ - "secure_boot=" \ - "vboot_twostop\0" + "run mmc0_boot\0" #define CONFIG_BOOTCOMMAND "run non_verified_boot" |