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>

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>
Simon Glass · Tom Warren
1 parent 7cfde8117f
Showing 1 changed file with 6 additions and 1 deletions Side-by-side Diff
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
...	...	@@ -58,13 +58,18 @@
58	58
59	59	#define CONFIG_SYS_LOAD_ADDR CONFIG_LOADADDR
60	60
	61	+#ifndef CONFIG_CHROMEOS_EXTRA_ENV_SETTINGS
	62	+#define CONFIG_CHROMEOS_EXTRA_ENV_SETTINGS
	63	+#endif
	64	+
61	65	#define CONFIG_EXTRA_ENV_SETTINGS \
62	66	TEGRA_DEVICE_SETTINGS \
63	67	MEM_LAYOUT_ENV_SETTINGS \
64	68	"fdt_high=ffffffff\0" \
65	69	"initrd_high=ffffffff\0" \
66	70	BOOTENV \
67		- BOARD_EXTRA_ENV_SETTINGS
	71	+ BOARD_EXTRA_ENV_SETTINGS \
	72	+ CONFIG_CHROMEOS_EXTRA_ENV_SETTINGS
68	73
69	74	#if defined(CONFIG_TEGRA20_SFLASH) \|\| defined(CONFIG_TEGRA20_SLINK) \|\| defined(CONFIG_TEGRA114_SPI)
70	75	#define CONFIG_TEGRA_SPI