diff options
| author | Tom Rini <trini@ti.com> | 2014-03-10 14:22:54 -0400 |
|---|---|---|
| committer | Tom Rini <trini@ti.com> | 2014-03-10 14:22:54 -0400 |
| commit | 5495dae7aa9d5cd161e07174d38acac86515c58a (patch) | |
| tree | 848c7f48688aeb5ada1fe221dc5dff4729561814 /include/configs/tegra-common.h | |
| parent | c0d297946fd2540c8057eb1589429978da888dbb (diff) | |
| parent | 27019e4a949fc3be2e895ac20839c4d4d119f902 (diff) | |
| download | u-boot-imx-5495dae7aa9d5cd161e07174d38acac86515c58a.zip u-boot-imx-5495dae7aa9d5cd161e07174d38acac86515c58a.tar.gz u-boot-imx-5495dae7aa9d5cd161e07174d38acac86515c58a.tar.bz2 | |
Merge branch 'master' of git://git.denx.de/u-boot-arm
Diffstat (limited to 'include/configs/tegra-common.h')
| -rw-r--r-- | include/configs/tegra-common.h | 20 |
1 files changed, 4 insertions, 16 deletions
diff --git a/include/configs/tegra-common.h b/include/configs/tegra-common.h index 9247aef..ae786cf 100644 --- a/include/configs/tegra-common.h +++ b/include/configs/tegra-common.h @@ -29,7 +29,6 @@ #define CONFIG_DISPLAY_BOARDINFO #define CONFIG_CMDLINE_TAG /* enable passing of ATAGs */ -#define CONFIG_OF_LIBFDT /* enable passing of devicetree */ /* Environment */ #define CONFIG_ENV_VARS_UBOOT_CONFIG @@ -69,33 +68,20 @@ #undef CONFIG_CMD_NET /* network support */ /* turn on command-line edit/hist/auto */ -#define CONFIG_CMDLINE_EDITING #define CONFIG_COMMAND_HISTORY -#define CONFIG_AUTO_COMPLETE /* turn on commonly used storage-related commands */ - -#define CONFIG_DOS_PARTITION -#define CONFIG_EFI_PARTITION #define CONFIG_PARTITION_UUIDS -#define CONFIG_FS_EXT4 -#define CONFIG_FS_FAT -#define CONFIG_CMD_EXT2 -#define CONFIG_CMD_FAT -#define CONFIG_CMD_FS_GENERIC #define CONFIG_CMD_PART #define CONFIG_SYS_NO_FLASH #define CONFIG_CONSOLE_MUX #define CONFIG_SYS_CONSOLE_IS_IN_ENV -#define CONFIG_BOOTDELAY 2 /* -1 to disable auto boot */ /* * Miscellaneous configurable options */ -#define CONFIG_SYS_LONGHELP /* undef to save memory */ -#define CONFIG_SYS_HUSH_PARSER /* use "hush" command parser */ #define CONFIG_SYS_PROMPT V_PROMPT /* * Increasing the size of the IO buffer as default nfsargs size is more @@ -133,8 +119,6 @@ #define CONFIG_TEGRA_GPIO #define CONFIG_CMD_GPIO #define CONFIG_CMD_ENTERRCM -#define CONFIG_CMD_BOOTZ -#define CONFIG_SUPPORT_RAW_INITRD /* Defines for SPL */ #define CONFIG_SPL @@ -161,4 +145,8 @@ #define CONFIG_BOUNCE_BUFFER #define CONFIG_CRC32_VERIFY +#ifndef CONFIG_SPL_BUILD +#include <config_distro_defaults.h> +#endif + #endif /* _TEGRA_COMMON_H_ */ |