]> git.ipfire.org Git - people/ms/u-boot.git/commitdiff
tegra: config: Allow Chrome OS environment settings to be included
authorSimon Glass <sjg@chromium.org>
Fri, 5 Jun 2015 20:39:44 +0000 (14:39 -0600)
committerTom Warren <twarren@nvidia.com>
Tue, 9 Jun 2015 16:56:15 +0000 (09:56 -0700)
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

index 48c1a7a1b6791cc937c32afdfa9ece40a35201a1..483222fbcf9c6f066d83d4c36424d71acc7b6934 100644 (file)
 
 #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