sf.c (0649cd0d4908d9b983a0361b8665938ef25701be) sf.c (203e94f6c9ca03e260175ce240f5856507395585)
1/*
2 * (C) Copyright 2000-2010
3 * Wolfgang Denk, DENX Software Engineering, wd@denx.de.
4 *
5 * (C) Copyright 2001 Sysgo Real-Time Solutions, GmbH <www.elinos.com>
6 * Andreas Heppel <aheppel@sysgo.de>
7 *
8 * (C) Copyright 2008 Atmel Corporation

--- 79 unchanged lines hidden (view full) ---

88 if (ret)
89 return ret;
90
91 ret = env_export(&env_new);
92 if (ret)
93 return ret;
94 env_new.flags = ACTIVE_FLAG;
95
1/*
2 * (C) Copyright 2000-2010
3 * Wolfgang Denk, DENX Software Engineering, wd@denx.de.
4 *
5 * (C) Copyright 2001 Sysgo Real-Time Solutions, GmbH <www.elinos.com>
6 * Andreas Heppel <aheppel@sysgo.de>
7 *
8 * (C) Copyright 2008 Atmel Corporation

--- 79 unchanged lines hidden (view full) ---

88 if (ret)
89 return ret;
90
91 ret = env_export(&env_new);
92 if (ret)
93 return ret;
94 env_new.flags = ACTIVE_FLAG;
95
96 if (gd->env_valid == 1) {
96 if (gd->env_valid == ENV_VALID) {
97 env_new_offset = CONFIG_ENV_OFFSET_REDUND;
98 env_offset = CONFIG_ENV_OFFSET;
99 } else {
100 env_new_offset = CONFIG_ENV_OFFSET;
101 env_offset = CONFIG_ENV_OFFSET_REDUND;
102 }
103
104 /* Is the sector larger than the env (i.e. embedded) */

--- 35 unchanged lines hidden (view full) ---

140
141 ret = spi_flash_write(env_flash, env_offset + offsetof(env_t, flags),
142 sizeof(env_new.flags), &flag);
143 if (ret)
144 goto done;
145
146 puts("done\n");
147
97 env_new_offset = CONFIG_ENV_OFFSET_REDUND;
98 env_offset = CONFIG_ENV_OFFSET;
99 } else {
100 env_new_offset = CONFIG_ENV_OFFSET;
101 env_offset = CONFIG_ENV_OFFSET_REDUND;
102 }
103
104 /* Is the sector larger than the env (i.e. embedded) */

--- 35 unchanged lines hidden (view full) ---

140
141 ret = spi_flash_write(env_flash, env_offset + offsetof(env_t, flags),
142 sizeof(env_new.flags), &flag);
143 if (ret)
144 goto done;
145
146 puts("done\n");
147
148 gd->env_valid = gd->env_valid == 2 ? 1 : 2;
148 gd->env_valid = gd->env_valid == ENV_REDUND ? ENV_VALID : ENV_REDUND;
149
150 printf("Valid environment: %d\n", (int)gd->env_valid);
151
152 done:
153 if (saved_buffer)
154 free(saved_buffer);
155
156 return ret;

--- 36 unchanged lines hidden (view full) ---

193 if (crc32(0, tmp_env2->data, ENV_SIZE) == tmp_env2->crc)
194 crc2_ok = 1;
195 }
196
197 if (!crc1_ok && !crc2_ok) {
198 set_default_env("!bad CRC");
199 goto err_read;
200 } else if (crc1_ok && !crc2_ok) {
149
150 printf("Valid environment: %d\n", (int)gd->env_valid);
151
152 done:
153 if (saved_buffer)
154 free(saved_buffer);
155
156 return ret;

--- 36 unchanged lines hidden (view full) ---

193 if (crc32(0, tmp_env2->data, ENV_SIZE) == tmp_env2->crc)
194 crc2_ok = 1;
195 }
196
197 if (!crc1_ok && !crc2_ok) {
198 set_default_env("!bad CRC");
199 goto err_read;
200 } else if (crc1_ok && !crc2_ok) {
201 gd->env_valid = 1;
201 gd->env_valid = ENV_VALID;
202 } else if (!crc1_ok && crc2_ok) {
202 } else if (!crc1_ok && crc2_ok) {
203 gd->env_valid = 2;
203 gd->env_valid = ENV_REDUND;
204 } else if (tmp_env1->flags == ACTIVE_FLAG &&
205 tmp_env2->flags == OBSOLETE_FLAG) {
204 } else if (tmp_env1->flags == ACTIVE_FLAG &&
205 tmp_env2->flags == OBSOLETE_FLAG) {
206 gd->env_valid = 1;
206 gd->env_valid = ENV_VALID;
207 } else if (tmp_env1->flags == OBSOLETE_FLAG &&
208 tmp_env2->flags == ACTIVE_FLAG) {
207 } else if (tmp_env1->flags == OBSOLETE_FLAG &&
208 tmp_env2->flags == ACTIVE_FLAG) {
209 gd->env_valid = 2;
209 gd->env_valid = ENV_REDUND;
210 } else if (tmp_env1->flags == tmp_env2->flags) {
210 } else if (tmp_env1->flags == tmp_env2->flags) {
211 gd->env_valid = 1;
211 gd->env_valid = ENV_VALID;
212 } else if (tmp_env1->flags == 0xFF) {
212 } else if (tmp_env1->flags == 0xFF) {
213 gd->env_valid = 1;
213 gd->env_valid = ENV_VALID;
214 } else if (tmp_env2->flags == 0xFF) {
214 } else if (tmp_env2->flags == 0xFF) {
215 gd->env_valid = 2;
215 gd->env_valid = ENV_REDUND;
216 } else {
217 /*
218 * this differs from code in env_flash.c, but I think a sane
219 * default path is desirable.
220 */
216 } else {
217 /*
218 * this differs from code in env_flash.c, but I think a sane
219 * default path is desirable.
220 */
221 gd->env_valid = 1;
221 gd->env_valid = ENV_VALID;
222 }
223
222 }
223
224 if (gd->env_valid == 1)
224 if (gd->env_valid == ENV_VALID)
225 ep = tmp_env1;
226 else
227 ep = tmp_env2;
228
229 ret = env_import((char *)ep, 0);
230 if (!ret) {
231 error("Cannot import environment: errno = %d\n", errno);
232 set_default_env("!env_import failed");

--- 86 unchanged lines hidden (view full) ---

319 CONFIG_ENV_OFFSET, CONFIG_ENV_SIZE, buf);
320 if (ret) {
321 set_default_env("!spi_flash_read() failed");
322 goto err_read;
323 }
324
325 ret = env_import(buf, 1);
326 if (ret)
225 ep = tmp_env1;
226 else
227 ep = tmp_env2;
228
229 ret = env_import((char *)ep, 0);
230 if (!ret) {
231 error("Cannot import environment: errno = %d\n", errno);
232 set_default_env("!env_import failed");

--- 86 unchanged lines hidden (view full) ---

319 CONFIG_ENV_OFFSET, CONFIG_ENV_SIZE, buf);
320 if (ret) {
321 set_default_env("!spi_flash_read() failed");
322 goto err_read;
323 }
324
325 ret = env_import(buf, 1);
326 if (ret)
327 gd->env_valid = 1;
327 gd->env_valid = ENV_VALID;
328
329err_read:
330 spi_flash_free(env_flash);
331 env_flash = NULL;
332out:
333 free(buf);
334}
335#endif
336
337int env_init(void)
338{
339 /* SPI flash isn't usable before relocation */
340 gd->env_addr = (ulong)&default_environment[0];
328
329err_read:
330 spi_flash_free(env_flash);
331 env_flash = NULL;
332out:
333 free(buf);
334}
335#endif
336
337int env_init(void)
338{
339 /* SPI flash isn't usable before relocation */
340 gd->env_addr = (ulong)&default_environment[0];
341 gd->env_valid = 1;
341 gd->env_valid = ENV_VALID;
342
343 return 0;
344}
342
343 return 0;
344}