diff options
| author | Doug Anderson <dianders@chromium.org> | 2011-10-13 11:53:02 -0700 |
|---|---|---|
| committer | Doug Anderson <dianders@chromium.org> | 2011-10-13 13:36:30 -0700 |
| commit | 4d6f68523d56433f3938276cf45009f8ce131a57 (patch) | |
| tree | 46d7d4f081afcc9d8aee051a868da23200588c6d /include | |
| parent | 3e149baa0a74ca85f45ef706c81d4b76f639fc7d (diff) | |
CHROMIUM: tegra: config: Add vmalloc to command line.
This was added to the non-legacy kernel boot command line in
<http://gerrit.chromium.org/gerrit/8373>. Since legacy has its own
command line, we need it too.
BUG=chromium-os:21650
TEST=Booted a newer kernel with this change and saw vmalloc=234MB.
Change-Id: I1daaa71ce63892ef4534722caa705c4e9608c6ed
Signed-off-by: Doug Anderson <dianders@chromium.org>
Reviewed-on: http://gerrit.chromium.org/gerrit/10033
Reviewed-by: Sean Paul <seanpaul@chromium.org>
Reviewed-by: Simon Glass <sjg@chromium.org>
Diffstat (limited to 'include')
| -rw-r--r-- | include/configs/tegra-common.h | 2 | ||||
| -rw-r--r-- | include/configs/tegra2-common.h | 8 | ||||
| -rw-r--r-- | include/configs/tegra3-common.h | 6 |
3 files changed, 15 insertions, 1 deletions
diff --git a/include/configs/tegra-common.h b/include/configs/tegra-common.h index 11ccc09dfe..cbf157ca89 100644 --- a/include/configs/tegra-common.h +++ b/include/configs/tegra-common.h @@ -176,7 +176,7 @@ * extra_bootargs: Filled in by update_firmware_vars.py script in some cases. */ #define CONFIG_REGEN_ALL_SETTINGS \ - "common_bootargs=cros_legacy " CONFIG_BOOTARGS "\0" \ + "common_bootargs=cros_legacy " CONFIG_DIRECT_BOOTARGS "\0" \ \ "dev_extras=\0" \ "extra_bootargs=\0" \ diff --git a/include/configs/tegra2-common.h b/include/configs/tegra2-common.h index 80ef730308..7dc3d7208f 100644 --- a/include/configs/tegra2-common.h +++ b/include/configs/tegra2-common.h @@ -131,6 +131,14 @@ TEGRA_LP0_VEC " " \ TEGRA2_SYSMEM +/* + * Extra bootargs used for direct booting, but not for vboot. + * - vmalloc >= carveout size + framebuffer size - 32MB + */ +#define CONFIG_DIRECT_BOOTARGS \ + CONFIG_BOOTARGS " " \ + "vmalloc=234MB" + #define CONFIG_SYS_LOAD_ADDR (0xA00800) /* default */ /*----------------------------------------------------------------------- diff --git a/include/configs/tegra3-common.h b/include/configs/tegra3-common.h index b85bb12a00..7761c209c7 100644 --- a/include/configs/tegra3-common.h +++ b/include/configs/tegra3-common.h @@ -59,6 +59,12 @@ #define CONFIG_BOOTARGS \ CONFIG_LINUXCONSOLE +/* + * Extra bootargs used for direct booting, but not for vboot. + * Not needed for T30. + */ +#define CONFIG_DIRECT_BOOTARGS CONFIG_BOOTARGS + #define CONFIG_SYS_LOAD_ADDR (0x80A00800) /* default */ /*----------------------------------------------------------------------- |