diff options
| author | Doug Anderson <dianders@chromium.org> | 2011-07-20 16:57:49 -0700 |
|---|---|---|
| committer | Simon Glass <sjg@chromium.org> | 2011-08-29 10:59:04 -0700 |
| commit | 3464b37bac038b75d0925e0d6d1f2cc637d0e4f8 (patch) | |
| tree | eeb152b03b17997dcdd67a06a168d2b3025b7530 /include/configs/tegra2-common.h | |
| parent | 40866f7fef21a49cf590368c3ac76d8669abc870 (diff) | |
CHROMIUM: ARM: tegra: Don't run 'regen_all' in secure boot case.
This requires 'bootargs' to be correct by default, so I did
a little bit of refactoring of the way regen_all works to
account for that.
After this CL lands and is marked as stable, I'll change the
FDT from 'run secure_boot' to just 'vboot_twostop'. That
will mean that we're not _running_ any commands from the
environment in the vboot case.
BUG=chromium-os:17940
TEST=Saw the legacy boot worked; saw that vboot worked.
Change-Id: I966c3f215beef5d9a1e47fa483a89f0ec42b8914
Reviewed-on: http://gerrit.chromium.org/gerrit/4448
Tested-by: Doug Anderson <dianders@chromium.org>
Reviewed-by: Tom Wai-Hong Tam <waihong@chromium.org>
Diffstat (limited to 'include/configs/tegra2-common.h')
| -rw-r--r-- | include/configs/tegra2-common.h | 33 |
1 files changed, 21 insertions, 12 deletions
diff --git a/include/configs/tegra2-common.h b/include/configs/tegra2-common.h index b5b6f18ba7..164836fcd7 100644 --- a/include/configs/tegra2-common.h +++ b/include/configs/tegra2-common.h @@ -202,6 +202,18 @@ /* Environment information */ +/* Passed on the kernel command line to specify the console. */ +#define CONFIG_LINUXCONSOLE "console=ttyS0,115200n8" + +/* + * Defines the standard boot args; these are used in the vboot case (which + * doesn't run regen_all) as well as used as part of regen_all. + */ +#define CONFIG_BOOTARGS \ + CONFIG_LINUXCONSOLE " " \ + TEGRA_LP0_VEC " " \ + TEGRA2_SYSMEM + /* * Defines the regen_all variable, which is used by other commands * defined in this file. Usage is to override one or more of the environment @@ -212,25 +224,21 @@ * device. * * Args: - * linuxconsole - console passed to the kernel - * lp0_args: ? - * platform_extras: Platform-specific bootargs. + * common_bootargs: A copy of the default bootargs so we can run regen_all + * more than once. * dev_extras: Placeholder space for developers to put their own boot args. * extra_bootargs: Filled in by update_firmware_vars.py script in some cases. */ #define CONFIG_REGEN_ALL_SETTINGS \ - "linuxconsole=ttyS0,115200n8\0" \ - "lp0_args=" TEGRA_LP0_VEC "\0" \ - "platform_extras=" TEGRA2_SYSMEM "\0" \ + "common_bootargs=" CONFIG_BOOTARGS "\0" \ + \ "dev_extras=\0" \ "extra_bootargs=\0" \ "bootdev_bootargs=\0" \ \ "regen_all=" \ "setenv bootargs " \ - "console=${linuxconsole} " \ - "${lp0_args} "\ - "${platform_extras} " \ + "${common_bootargs} " \ "${dev_extras} " \ "${extra_bootargs} " \ "${bootdev_bootargs}\0" @@ -373,8 +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 both "normal_boot" and "secure_boot". The secure_boot command - * is referenced when we override the boot command with the FDT. + * - 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. */ #define CONFIG_EXTRA_ENV_SETTINGS_COMMON \ @@ -407,7 +417,6 @@ "run mmc1_boot; " \ "run mmc0_boot\0" \ "secure_boot=" \ - "run regen_all; " \ "vboot_twostop\0" #define CONFIG_BOOTCOMMAND "run non_verified_boot" |