summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorSimon Glass <sjg@chromium.org>2015-06-05 14:39:44 -0600
committerTom Warren <twarren@nvidia.com>2015-06-09 09:56:15 -0700
commite379b03e6bde7b1e78fbec1adc22d69cd1c3063e (patch)
treed9ef9c4001bb4ac5016bdd19fe5358ffb0a66449 /include
parent7cfde8117fc74d7d10035dfef37ae21c014705fa (diff)
tegra: config: Allow Chrome OS environment settings to be included
Bring these in if they are provided by the board. Signed-off-by: Simon Glass <sjg@chromium.org> Signed-off-by: Tom Warren <twarren@nvidia.com>
Diffstat (limited to 'include')
-rw-r--r--include/configs/tegra-common-post.h7
1 files changed, 6 insertions, 1 deletions
diff --git a/include/configs/tegra-common-post.h b/include/configs/tegra-common-post.h
index 48c1a7a1b6..483222fbcf 100644
--- a/include/configs/tegra-common-post.h
+++ b/include/configs/tegra-common-post.h
@@ -58,13 +58,18 @@
#define CONFIG_SYS_LOAD_ADDR CONFIG_LOADADDR
+#ifndef CONFIG_CHROMEOS_EXTRA_ENV_SETTINGS
+#define CONFIG_CHROMEOS_EXTRA_ENV_SETTINGS
+#endif
+
#define CONFIG_EXTRA_ENV_SETTINGS \
TEGRA_DEVICE_SETTINGS \
MEM_LAYOUT_ENV_SETTINGS \
"fdt_high=ffffffff\0" \
"initrd_high=ffffffff\0" \
BOOTENV \
- BOARD_EXTRA_ENV_SETTINGS
+ BOARD_EXTRA_ENV_SETTINGS \
+ CONFIG_CHROMEOS_EXTRA_ENV_SETTINGS
#if defined(CONFIG_TEGRA20_SFLASH) || defined(CONFIG_TEGRA20_SLINK) || defined(CONFIG_TEGRA114_SPI)
#define CONFIG_TEGRA_SPI