From: Simon Glass Date: Fri, 5 Jun 2015 20:39:44 +0000 (-0600) Subject: tegra: config: Allow Chrome OS environment settings to be included X-Git-Tag: v2015.07-rc3~98 X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=e379b03e6bde7b1e78fbec1adc22d69cd1c3063e;p=oweals%2Fu-boot.git 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 Signed-off-by: Tom Warren --- 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