diff options
| author | Kumar Gala <galak@kernel.crashing.org> | 2006-03-20 10:42:05 -0600 |
|---|---|---|
| committer | Kumar Gala <galak@kernel.crashing.org> | 2006-03-20 10:42:05 -0600 |
| commit | f8edca2e9a128f526b1fe6f997f7adb852cf5b3c (patch) | |
| tree | 92deb9ddf1153c64ff1ced9392816e60b4ecaa03 /tools/env/fw_env.c | |
| parent | 79582020313e6d992a3bac71cf3a9b337f9ac7f7 (diff) | |
| parent | 7b4fd36b0322ec98836a8459d9be80e2777fdc05 (diff) | |
| download | u-boot-imx-f8edca2e9a128f526b1fe6f997f7adb852cf5b3c.zip u-boot-imx-f8edca2e9a128f526b1fe6f997f7adb852cf5b3c.tar.gz u-boot-imx-f8edca2e9a128f526b1fe6f997f7adb852cf5b3c.tar.bz2 | |
Merge branch 'origin'
Conflicts:
CHANGELOG
Diffstat (limited to 'tools/env/fw_env.c')
| -rw-r--r-- | tools/env/fw_env.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/tools/env/fw_env.c b/tools/env/fw_env.c index 74c0498..f723b5b 100644 --- a/tools/env/fw_env.c +++ b/tools/env/fw_env.c @@ -614,8 +614,7 @@ static int env_init (void) if (!crc1_ok) { fprintf (stderr, "Warning: Bad CRC, using default environment\n"); - environment.data = default_environment; - free (addr1); + memcpy(environment.data, default_environment, sizeof default_environment); } } else { flag1 = environment.flags; @@ -652,9 +651,8 @@ static int env_init (void) } else if (!crc1_ok && !crc2_ok) { fprintf (stderr, "Warning: Bad CRC, using default environment\n"); - environment.data = default_environment; + memcpy(environment.data, default_environment, sizeof default_environment); curdev = 0; - free (addr2); free (addr1); } else if (flag1 == active_flag && flag2 == obsolete_flag) { environment.data = addr1; |