diff options
| author | Tom Rini <trini@ti.com> | 2013-08-21 16:27:47 -0400 |
|---|---|---|
| committer | Tom Rini <trini@ti.com> | 2013-08-21 16:27:47 -0400 |
| commit | 6612ab33956ae09c5ba2fde9c1540b519625ba37 (patch) | |
| tree | b6da2e20793336cf0eed44292edb3b5e7ce88819 /common | |
| parent | 3fb858891273945ce2238e6d4dac3363a1fb0853 (diff) | |
| parent | b6df9b01fb8c126b212aba92b6523407d3fa60a5 (diff) | |
| download | u-boot-imx-6612ab33956ae09c5ba2fde9c1540b519625ba37.zip u-boot-imx-6612ab33956ae09c5ba2fde9c1540b519625ba37.tar.gz u-boot-imx-6612ab33956ae09c5ba2fde9c1540b519625ba37.tar.bz2 | |
Merge branch 'master' of git://git.denx.de/u-boot-mpc85xx
Diffstat (limited to 'common')
| -rw-r--r-- | common/env_common.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/common/env_common.c b/common/env_common.c index f387f9a..1ac3377 100644 --- a/common/env_common.c +++ b/common/env_common.c @@ -140,7 +140,6 @@ int set_default_vars(int nvars, char * const vars[]) H_NOCLEAR | H_INTERACTIVE, nvars, vars); } -#ifndef CONFIG_SPL_BUILD /* * Check if CRC is valid and (if yes) import the environment. * Note that "buf" may or may not be aligned. @@ -172,7 +171,6 @@ int env_import(const char *buf, int check) return 0; } -#endif void env_relocate(void) { |