commit 4a9dd323bb83127281d7d0d9b80f4a4b4114cd80
author Simon Glass <sjg@chromium.org> Fri Jun 05 14:39:44 2015 -0600
committer Tom Warren <twarren@nvidia.com> Tue Jun 09 09:56:15 2015 -0700
tree d9ef9c4001bb4ac5016bdd19fe5358ffb0a66449
parent 899af8e880edef3f181497e6e1fb40e85795d097

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>

include/configs/tegra-common-post.h

diff --git a/include/configs/tegra-common-post.h b/include/configs/tegra-common-post.h
index 48c1a7a..483222f 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