From: Lei Wen <leiwen@marvell.com>
Date: Sun, 10 Oct 2010 04:36:40 +0000 (+0800)
Subject: env: don't set to default env twice when use CONFIG_ENV_IS_NOWHERE
X-Git-Tag: v2010.12-rc1~127
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=d259079d6d147541ddfe2e093cfa55db8e1a6cbf;p=oweals%2Fu-boot.git

env: don't set to default env twice when use CONFIG_ENV_IS_NOWHERE

When use the CONFIG_ENV_IS_NOWHERE, I met such issue:

	DRAM:  256 MiB
	Using default environment

	*** Warning - bad CRC, using default environment

Signed-off-by: Lei Wen <leiwen@marvell.com>
---

diff --git a/common/env_common.c b/common/env_common.c
index 88f068cc38..5acda4d49e 100644
--- a/common/env_common.c
+++ b/common/env_common.c
@@ -237,8 +237,8 @@ void env_relocate (void)
 		set_default_env(NULL);
 #else
 		show_boot_progress (-60);
-#endif
 		set_default_env("!bad CRC");
+#endif
 	} else {
 		env_relocate_spec ();
 	}