summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--u-boot/common/env_common.c6
1 files changed, 5 insertions, 1 deletions
diff --git a/u-boot/common/env_common.c b/u-boot/common/env_common.c
index c3e6388..10ea90c 100644
--- a/u-boot/common/env_common.c
+++ b/u-boot/common/env_common.c
@@ -204,11 +204,15 @@ int env_import(const char *buf, int check)
{
env_t *ep = (env_t *)buf;
+#if defined(CONFIG_START_WITH_DEFAULT_ENVIRONMENT)
+ set_default_env(NULL);
+ return 0;
+#endif
+
if (check) {
uint32_t crc;
memcpy(&crc, &ep->crc, sizeof(crc));
-
if (crc32(0, ep->data, ENV_SIZE) != crc) {
set_default_env("!bad CRC");
return 0;