Blame view

env/flash.c 9.04 KB
c609719b8   wdenk   Initial revision
1
  /*
ea882baf9   Wolfgang Denk   New implementatio...
2
   * (C) Copyright 2000-2010
c609719b8   wdenk   Initial revision
3
4
5
6
   * Wolfgang Denk, DENX Software Engineering, wd@denx.de.
   *
   * (C) Copyright 2001 Sysgo Real-Time Solutions, GmbH <www.elinos.com>
   * Andreas Heppel <aheppel@sysgo.de>
3765b3e7b   Wolfgang Denk   Coding Style clea...
7
   * SPDX-License-Identifier:	GPL-2.0+
c609719b8   wdenk   Initial revision
8
9
10
11
12
   */
  
  /* #define DEBUG */
  
  #include <common.h>
c609719b8   wdenk   Initial revision
13
14
  #include <command.h>
  #include <environment.h>
c609719b8   wdenk   Initial revision
15
  #include <linux/stddef.h>
47cd00fa7   wdenk   * Patches by Robe...
16
  #include <malloc.h>
ea882baf9   Wolfgang Denk   New implementatio...
17
18
  #include <search.h>
  #include <errno.h>
c609719b8   wdenk   Initial revision
19

d87080b72   Wolfgang Denk   GCC-4.x fixes: cl...
20
  DECLARE_GLOBAL_DATA_PTR;
4415f1d1f   Simon Glass   env: Create a loc...
21
22
23
24
25
26
  #ifndef CONFIG_SPL_BUILD
  # if defined(CONFIG_CMD_SAVEENV) && defined(CONFIG_CMD_FLASH)
  #  define CMD_SAVEENV
  # elif defined(CONFIG_ENV_ADDR_REDUND)
  #  error CONFIG_ENV_ADDR_REDUND must have CONFIG_CMD_SAVEENV & CONFIG_CMD_FLASH
  # endif
c609719b8   wdenk   Initial revision
27
  #endif
82b54b972   Igor Grinberg   env: clean env_fl...
28
29
  #if defined(CONFIG_ENV_SIZE_REDUND) &&	\
  	(CONFIG_ENV_SIZE_REDUND < CONFIG_ENV_SIZE)
0e8d15866   Jean-Christophe PLAGNIOL-VILLARD   rename CFG_ENV ma...
30
  #error CONFIG_ENV_SIZE_REDUND should not be less then CONFIG_ENV_SIZE
c609719b8   wdenk   Initial revision
31
  #endif
4415f1d1f   Simon Glass   env: Create a loc...
32
33
34
35
36
37
38
39
40
41
42
  /* TODO(sjg@chromium.org): Figure out all these special cases */
  #if (!defined(CONFIG_MICROBLAZE) && !defined(CONFIG_ARCH_ZYNQ) && \
  	!defined(CONFIG_TARGET_MCCMON6) && !defined(CONFIG_TARGET_X600) && \
  	!defined(CONFIG_TARGET_EDMINIV2)) || \
  	!defined(CONFIG_SPL_BUILD)
  #define LOADENV
  #endif
  
  #if !defined(CONFIG_TARGET_X600) || !defined(CONFIG_SPL_BUILD)
  #define INITENV
  #endif
c609719b8   wdenk   Initial revision
43
  #ifdef ENV_IS_EMBEDDED
994bc671c   Igor Grinberg   env: move extern ...
44
  env_t *env_ptr = &environment;
c609719b8   wdenk   Initial revision
45

e5bce247b   Simon Glass   env: Switch over ...
46
  static __maybe_unused env_t *flash_addr = (env_t *)CONFIG_ENV_ADDR;
c609719b8   wdenk   Initial revision
47
48
  
  #else /* ! ENV_IS_EMBEDDED */
0e8d15866   Jean-Christophe PLAGNIOL-VILLARD   rename CFG_ENV ma...
49
  env_t *env_ptr = (env_t *)CONFIG_ENV_ADDR;
e5bce247b   Simon Glass   env: Switch over ...
50
  static __maybe_unused env_t *flash_addr = (env_t *)CONFIG_ENV_ADDR;
c609719b8   wdenk   Initial revision
51
  #endif /* ENV_IS_EMBEDDED */
ea882baf9   Wolfgang Denk   New implementatio...
52
  /* CONFIG_ENV_ADDR is supposed to be on sector boundary */
e5bce247b   Simon Glass   env: Switch over ...
53
54
  static ulong __maybe_unused end_addr =
  		CONFIG_ENV_ADDR + CONFIG_ENV_SECT_SIZE - 1;
ea882baf9   Wolfgang Denk   New implementatio...
55

0e8d15866   Jean-Christophe PLAGNIOL-VILLARD   rename CFG_ENV ma...
56
  #ifdef CONFIG_ENV_ADDR_REDUND
e5bce247b   Simon Glass   env: Switch over ...
57
58
  
  static env_t __maybe_unused *flash_addr_new = (env_t *)CONFIG_ENV_ADDR_REDUND;
c609719b8   wdenk   Initial revision
59

ea882baf9   Wolfgang Denk   New implementatio...
60
  /* CONFIG_ENV_ADDR_REDUND is supposed to be on sector boundary */
e5bce247b   Simon Glass   env: Switch over ...
61
62
  static ulong __maybe_unused end_addr_new =
  		CONFIG_ENV_ADDR_REDUND + CONFIG_ENV_SECT_SIZE - 1;
0e8d15866   Jean-Christophe PLAGNIOL-VILLARD   rename CFG_ENV ma...
63
  #endif /* CONFIG_ENV_ADDR_REDUND */
c609719b8   wdenk   Initial revision
64

0e8d15866   Jean-Christophe PLAGNIOL-VILLARD   rename CFG_ENV ma...
65
  #ifdef CONFIG_ENV_ADDR_REDUND
4415f1d1f   Simon Glass   env: Create a loc...
66
  #ifdef INITENV
e5bce247b   Simon Glass   env: Switch over ...
67
  static int env_flash_init(void)
c609719b8   wdenk   Initial revision
68
  {
8ed960461   wdenk   * Patches by Rich...
69
  	int crc1_ok = 0, crc2_ok = 0;
c609719b8   wdenk   Initial revision
70
71
72
73
74
75
76
  
  	uchar flag1 = flash_addr->flags;
  	uchar flag2 = flash_addr_new->flags;
  
  	ulong addr_default = (ulong)&default_environment[0];
  	ulong addr1 = (ulong)&(flash_addr->data);
  	ulong addr2 = (ulong)&(flash_addr_new->data);
82b54b972   Igor Grinberg   env: clean env_fl...
77
78
79
80
81
82
  	crc1_ok = crc32(0, flash_addr->data, ENV_SIZE) == flash_addr->crc;
  	crc2_ok =
  		crc32(0, flash_addr_new->data, ENV_SIZE) == flash_addr_new->crc;
  
  	if (crc1_ok && !crc2_ok) {
  		gd->env_addr	= addr1;
203e94f6c   Simon Glass   env: Add an enum ...
83
  		gd->env_valid	= ENV_VALID;
82b54b972   Igor Grinberg   env: clean env_fl...
84
85
  	} else if (!crc1_ok && crc2_ok) {
  		gd->env_addr	= addr2;
203e94f6c   Simon Glass   env: Add an enum ...
86
  		gd->env_valid	= ENV_VALID;
82b54b972   Igor Grinberg   env: clean env_fl...
87
88
  	} else if (!crc1_ok && !crc2_ok) {
  		gd->env_addr	= addr_default;
2d7cb5b42   Simon Glass   env: Replace all ...
89
  		gd->env_valid	= ENV_INVALID;
c3f9d4939   wdenk   * Patch by Yuli B...
90
  	} else if (flag1 == ACTIVE_FLAG && flag2 == OBSOLETE_FLAG) {
82b54b972   Igor Grinberg   env: clean env_fl...
91
  		gd->env_addr	= addr1;
203e94f6c   Simon Glass   env: Add an enum ...
92
  		gd->env_valid	= ENV_VALID;
c3f9d4939   wdenk   * Patch by Yuli B...
93
  	} else if (flag1 == OBSOLETE_FLAG && flag2 == ACTIVE_FLAG) {
82b54b972   Igor Grinberg   env: clean env_fl...
94
  		gd->env_addr	= addr2;
203e94f6c   Simon Glass   env: Add an enum ...
95
  		gd->env_valid	= ENV_VALID;
c3f9d4939   wdenk   * Patch by Yuli B...
96
  	} else if (flag1 == flag2) {
82b54b972   Igor Grinberg   env: clean env_fl...
97
  		gd->env_addr	= addr1;
203e94f6c   Simon Glass   env: Add an enum ...
98
  		gd->env_valid	= ENV_REDUND;
c3f9d4939   wdenk   * Patch by Yuli B...
99
  	} else if (flag1 == 0xFF) {
82b54b972   Igor Grinberg   env: clean env_fl...
100
  		gd->env_addr	= addr1;
203e94f6c   Simon Glass   env: Add an enum ...
101
  		gd->env_valid	= ENV_REDUND;
c3f9d4939   wdenk   * Patch by Yuli B...
102
  	} else if (flag2 == 0xFF) {
82b54b972   Igor Grinberg   env: clean env_fl...
103
  		gd->env_addr	= addr2;
203e94f6c   Simon Glass   env: Add an enum ...
104
  		gd->env_valid	= ENV_REDUND;
c609719b8   wdenk   Initial revision
105
  	}
ea882baf9   Wolfgang Denk   New implementatio...
106
  	return 0;
c609719b8   wdenk   Initial revision
107
  }
4415f1d1f   Simon Glass   env: Create a loc...
108
  #endif
c609719b8   wdenk   Initial revision
109
110
  
  #ifdef CMD_SAVEENV
e5bce247b   Simon Glass   env: Switch over ...
111
  static int env_flash_save(void)
c609719b8   wdenk   Initial revision
112
  {
ea882baf9   Wolfgang Denk   New implementatio...
113
  	env_t	env_new;
7ce1526ed   Marek Vasut   env: Add env_expo...
114
  	char	*saved_data = NULL;
ea882baf9   Wolfgang Denk   New implementatio...
115
  	char	flag = OBSOLETE_FLAG, new_flag = ACTIVE_FLAG;
82b54b972   Igor Grinberg   env: clean env_fl...
116
  	int	rc = 1;
0e8d15866   Jean-Christophe PLAGNIOL-VILLARD   rename CFG_ENV ma...
117
  #if CONFIG_ENV_SECT_SIZE > CONFIG_ENV_SIZE
ea882baf9   Wolfgang Denk   New implementatio...
118
  	ulong	up_data = 0;
500545cc6   wdenk   Fix problem with ...
119
  #endif
c609719b8   wdenk   Initial revision
120

82b54b972   Igor Grinberg   env: clean env_fl...
121
122
  	debug("Protect off %08lX ... %08lX
  ", (ulong)flash_addr, end_addr);
c609719b8   wdenk   Initial revision
123

82b54b972   Igor Grinberg   env: clean env_fl...
124
  	if (flash_sect_protect(0, (ulong)flash_addr, end_addr))
ea882baf9   Wolfgang Denk   New implementatio...
125
  		goto done;
c609719b8   wdenk   Initial revision
126

ea882baf9   Wolfgang Denk   New implementatio...
127
128
  	debug("Protect off %08lX ... %08lX
  ",
c609719b8   wdenk   Initial revision
129
  		(ulong)flash_addr_new, end_addr_new);
82b54b972   Igor Grinberg   env: clean env_fl...
130
  	if (flash_sect_protect(0, (ulong)flash_addr_new, end_addr_new))
ea882baf9   Wolfgang Denk   New implementatio...
131
  		goto done;
ea882baf9   Wolfgang Denk   New implementatio...
132

7ce1526ed   Marek Vasut   env: Add env_expo...
133
134
135
  	rc = env_export(&env_new);
  	if (rc)
  		return rc;
82b54b972   Igor Grinberg   env: clean env_fl...
136
  	env_new.flags	= new_flag;
c609719b8   wdenk   Initial revision
137

0e8d15866   Jean-Christophe PLAGNIOL-VILLARD   rename CFG_ENV ma...
138
  #if CONFIG_ENV_SECT_SIZE > CONFIG_ENV_SIZE
82b54b972   Igor Grinberg   env: clean env_fl...
139
  	up_data = end_addr_new + 1 - ((long)flash_addr_new + CONFIG_ENV_SIZE);
ea882baf9   Wolfgang Denk   New implementatio...
140
141
  	debug("Data to save 0x%lX
  ", up_data);
47cd00fa7   wdenk   * Patches by Robe...
142
  	if (up_data) {
82b54b972   Igor Grinberg   env: clean env_fl...
143
144
  		saved_data = malloc(up_data);
  		if (saved_data == NULL) {
8bde7f776   wdenk   * Code cleanup:
145
146
  			printf("Unable to save the rest of sector (%ld)
  ",
47cd00fa7   wdenk   * Patches by Robe...
147
  				up_data);
ea882baf9   Wolfgang Denk   New implementatio...
148
  			goto done;
47cd00fa7   wdenk   * Patches by Robe...
149
  		}
8bde7f776   wdenk   * Code cleanup:
150
  		memcpy(saved_data,
82b54b972   Igor Grinberg   env: clean env_fl...
151
152
  			(void *)((long)flash_addr_new + CONFIG_ENV_SIZE),
  			up_data);
ea882baf9   Wolfgang Denk   New implementatio...
153
154
155
156
  		debug("Data (start 0x%lX, len 0x%lX) saved at 0x%p
  ",
  			(long)flash_addr_new + CONFIG_ENV_SIZE,
  			up_data, saved_data);
47cd00fa7   wdenk   * Patches by Robe...
157
158
  	}
  #endif
ea882baf9   Wolfgang Denk   New implementatio...
159
  	puts("Erasing Flash...");
82b54b972   Igor Grinberg   env: clean env_fl...
160
  	debug(" %08lX ... %08lX ...", (ulong)flash_addr_new, end_addr_new);
c609719b8   wdenk   Initial revision
161

82b54b972   Igor Grinberg   env: clean env_fl...
162
  	if (flash_sect_erase((ulong)flash_addr_new, end_addr_new))
ea882baf9   Wolfgang Denk   New implementatio...
163
  		goto done;
c609719b8   wdenk   Initial revision
164

ea882baf9   Wolfgang Denk   New implementatio...
165
166
  	puts("Writing to Flash... ");
  	debug(" %08lX ... %08lX ...",
c609719b8   wdenk   Initial revision
167
  		(ulong)&(flash_addr_new->data),
82b54b972   Igor Grinberg   env: clean env_fl...
168
169
170
171
172
173
174
175
176
177
  		sizeof(env_ptr->data) + (ulong)&(flash_addr_new->data));
  	rc = flash_write((char *)&env_new, (ulong)flash_addr_new,
  			 sizeof(env_new));
  	if (rc)
  		goto perror;
  
  	rc = flash_write(&flag, (ulong)&(flash_addr->flags),
  			 sizeof(flash_addr->flags));
  	if (rc)
  		goto perror;
c609719b8   wdenk   Initial revision
178

0e8d15866   Jean-Christophe PLAGNIOL-VILLARD   rename CFG_ENV ma...
179
  #if CONFIG_ENV_SECT_SIZE > CONFIG_ENV_SIZE
47cd00fa7   wdenk   * Patches by Robe...
180
  	if (up_data) { /* restore the rest of sector */
ea882baf9   Wolfgang Denk   New implementatio...
181
182
183
  		debug("Restoring the rest of data to 0x%lX len 0x%lX
  ",
  			(long)flash_addr_new + CONFIG_ENV_SIZE, up_data);
8bde7f776   wdenk   * Code cleanup:
184
  		if (flash_write(saved_data,
0e8d15866   Jean-Christophe PLAGNIOL-VILLARD   rename CFG_ENV ma...
185
  				(long)flash_addr_new + CONFIG_ENV_SIZE,
82b54b972   Igor Grinberg   env: clean env_fl...
186
187
  				up_data))
  			goto perror;
47cd00fa7   wdenk   * Patches by Robe...
188
189
  	}
  #endif
ea882baf9   Wolfgang Denk   New implementatio...
190
191
  	puts("done
  ");
c609719b8   wdenk   Initial revision
192
  	{
82b54b972   Igor Grinberg   env: clean env_fl...
193
  		env_t *etmp = flash_addr;
c609719b8   wdenk   Initial revision
194
195
196
197
198
199
200
201
202
203
  		ulong ltmp = end_addr;
  
  		flash_addr = flash_addr_new;
  		flash_addr_new = etmp;
  
  		end_addr = end_addr_new;
  		end_addr_new = ltmp;
  	}
  
  	rc = 0;
82b54b972   Igor Grinberg   env: clean env_fl...
204
205
206
  	goto done;
  perror:
  	flash_perror(rc);
ea882baf9   Wolfgang Denk   New implementatio...
207
  done:
47cd00fa7   wdenk   * Patches by Robe...
208
  	if (saved_data)
ea882baf9   Wolfgang Denk   New implementatio...
209
  		free(saved_data);
c609719b8   wdenk   Initial revision
210
  	/* try to re-protect */
82b54b972   Igor Grinberg   env: clean env_fl...
211
212
  	flash_sect_protect(1, (ulong)flash_addr, end_addr);
  	flash_sect_protect(1, (ulong)flash_addr_new, end_addr_new);
c609719b8   wdenk   Initial revision
213
214
215
216
  
  	return rc;
  }
  #endif /* CMD_SAVEENV */
0e8d15866   Jean-Christophe PLAGNIOL-VILLARD   rename CFG_ENV ma...
217
  #else /* ! CONFIG_ENV_ADDR_REDUND */
c609719b8   wdenk   Initial revision
218

4415f1d1f   Simon Glass   env: Create a loc...
219
  #ifdef INITENV
e5bce247b   Simon Glass   env: Switch over ...
220
  static int env_flash_init(void)
c609719b8   wdenk   Initial revision
221
  {
c609719b8   wdenk   Initial revision
222
  	if (crc32(0, env_ptr->data, ENV_SIZE) == env_ptr->crc) {
82b54b972   Igor Grinberg   env: clean env_fl...
223
  		gd->env_addr	= (ulong)&(env_ptr->data);
203e94f6c   Simon Glass   env: Add an enum ...
224
  		gd->env_valid	= ENV_VALID;
82b54b972   Igor Grinberg   env: clean env_fl...
225
  		return 0;
c609719b8   wdenk   Initial revision
226
  	}
9bb8b209e   Dirk Behme   Fix compilation e...
227

82b54b972   Igor Grinberg   env: clean env_fl...
228
  	gd->env_addr	= (ulong)&default_environment[0];
2d7cb5b42   Simon Glass   env: Replace all ...
229
  	gd->env_valid	= ENV_INVALID;
ea882baf9   Wolfgang Denk   New implementatio...
230
  	return 0;
c609719b8   wdenk   Initial revision
231
  }
4415f1d1f   Simon Glass   env: Create a loc...
232
  #endif
c609719b8   wdenk   Initial revision
233
234
  
  #ifdef CMD_SAVEENV
e5bce247b   Simon Glass   env: Switch over ...
235
  static int env_flash_save(void)
c609719b8   wdenk   Initial revision
236
  {
ea882baf9   Wolfgang Denk   New implementatio...
237
  	env_t	env_new;
ea882baf9   Wolfgang Denk   New implementatio...
238
  	int	rc = 1;
3fa1981e2   Tom Rini   env_flash.c: Drop...
239
  	char	*saved_data = NULL;
ea882baf9   Wolfgang Denk   New implementatio...
240
241
  #if CONFIG_ENV_SECT_SIZE > CONFIG_ENV_SIZE
  	ulong	up_data = 0;
c609719b8   wdenk   Initial revision
242

82b54b972   Igor Grinberg   env: clean env_fl...
243
  	up_data = end_addr + 1 - ((long)flash_addr + CONFIG_ENV_SIZE);
ea882baf9   Wolfgang Denk   New implementatio...
244
245
246
  	debug("Data to save 0x%lx
  ", up_data);
  	if (up_data) {
82b54b972   Igor Grinberg   env: clean env_fl...
247
248
  		saved_data = malloc(up_data);
  		if (saved_data == NULL) {
ea882baf9   Wolfgang Denk   New implementatio...
249
250
251
252
253
254
255
256
257
258
259
260
261
  			printf("Unable to save the rest of sector (%ld)
  ",
  				up_data);
  			goto done;
  		}
  		memcpy(saved_data,
  			(void *)((long)flash_addr + CONFIG_ENV_SIZE), up_data);
  		debug("Data (start 0x%lx, len 0x%lx) saved at 0x%lx
  ",
  			(ulong)flash_addr + CONFIG_ENV_SIZE,
  			up_data,
  			(ulong)saved_data);
  	}
0e8d15866   Jean-Christophe PLAGNIOL-VILLARD   rename CFG_ENV ma...
262
  #endif	/* CONFIG_ENV_SECT_SIZE */
c609719b8   wdenk   Initial revision
263

82b54b972   Igor Grinberg   env: clean env_fl...
264
265
  	debug("Protect off %08lX ... %08lX
  ", (ulong)flash_addr, end_addr);
c609719b8   wdenk   Initial revision
266

ea882baf9   Wolfgang Denk   New implementatio...
267
268
  	if (flash_sect_protect(0, (long)flash_addr, end_addr))
  		goto done;
c609719b8   wdenk   Initial revision
269

7ce1526ed   Marek Vasut   env: Add env_expo...
270
271
  	rc = env_export(&env_new);
  	if (rc)
ea882baf9   Wolfgang Denk   New implementatio...
272
  		goto done;
c609719b8   wdenk   Initial revision
273

ea882baf9   Wolfgang Denk   New implementatio...
274
275
276
  	puts("Erasing Flash...");
  	if (flash_sect_erase((long)flash_addr, end_addr))
  		goto done;
c609719b8   wdenk   Initial revision
277

ea882baf9   Wolfgang Denk   New implementatio...
278
279
  	puts("Writing to Flash... ");
  	rc = flash_write((char *)&env_new, (long)flash_addr, CONFIG_ENV_SIZE);
82b54b972   Igor Grinberg   env: clean env_fl...
280
281
  	if (rc != 0)
  		goto perror;
ea882baf9   Wolfgang Denk   New implementatio...
282
283
284
285
286
287
288
  #if CONFIG_ENV_SECT_SIZE > CONFIG_ENV_SIZE
  	if (up_data) {	/* restore the rest of sector */
  		debug("Restoring the rest of data to 0x%lx len 0x%lx
  ",
  			(ulong)flash_addr + CONFIG_ENV_SIZE, up_data);
  		if (flash_write(saved_data,
  				(long)flash_addr + CONFIG_ENV_SIZE,
82b54b972   Igor Grinberg   env: clean env_fl...
289
290
  				up_data))
  			goto perror;
ea882baf9   Wolfgang Denk   New implementatio...
291
292
293
294
295
  	}
  #endif
  	puts("done
  ");
  	rc = 0;
82b54b972   Igor Grinberg   env: clean env_fl...
296
297
298
  	goto done;
  perror:
  	flash_perror(rc);
ea882baf9   Wolfgang Denk   New implementatio...
299
300
301
  done:
  	if (saved_data)
  		free(saved_data);
c609719b8   wdenk   Initial revision
302
  	/* try to re-protect */
82b54b972   Igor Grinberg   env: clean env_fl...
303
  	flash_sect_protect(1, (long)flash_addr, end_addr);
ea882baf9   Wolfgang Denk   New implementatio...
304
  	return rc;
c609719b8   wdenk   Initial revision
305
  }
c609719b8   wdenk   Initial revision
306
  #endif /* CMD_SAVEENV */
0e8d15866   Jean-Christophe PLAGNIOL-VILLARD   rename CFG_ENV ma...
307
  #endif /* CONFIG_ENV_ADDR_REDUND */
c609719b8   wdenk   Initial revision
308

e5bce247b   Simon Glass   env: Switch over ...
309
  #ifdef LOADENV
c59519919   Simon Glass   env: Adjust the l...
310
  static int env_flash_load(void)
c609719b8   wdenk   Initial revision
311
  {
0e8d15866   Jean-Christophe PLAGNIOL-VILLARD   rename CFG_ENV ma...
312
  #ifdef CONFIG_ENV_ADDR_REDUND
c3f9d4939   wdenk   * Patch by Yuli B...
313
  	if (gd->env_addr != (ulong)&(flash_addr->data)) {
ea882baf9   Wolfgang Denk   New implementatio...
314
  		env_t *etmp = flash_addr;
c609719b8   wdenk   Initial revision
315
316
317
318
319
320
321
322
  		ulong ltmp = end_addr;
  
  		flash_addr = flash_addr_new;
  		flash_addr_new = etmp;
  
  		end_addr = end_addr_new;
  		end_addr_new = ltmp;
  	}
c3f9d4939   wdenk   * Patch by Yuli B...
323
  	if (flash_addr_new->flags != OBSOLETE_FLAG &&
82b54b972   Igor Grinberg   env: clean env_fl...
324
  	    crc32(0, flash_addr_new->data, ENV_SIZE) == flash_addr_new->crc) {
c3f9d4939   wdenk   * Patch by Yuli B...
325
  		char flag = OBSOLETE_FLAG;
203e94f6c   Simon Glass   env: Add an enum ...
326
  		gd->env_valid = ENV_REDUND;
ea882baf9   Wolfgang Denk   New implementatio...
327
  		flash_sect_protect(0, (ulong)flash_addr_new, end_addr_new);
c3f9d4939   wdenk   * Patch by Yuli B...
328
  		flash_write(&flag,
8bde7f776   wdenk   * Code cleanup:
329
330
  			    (ulong)&(flash_addr_new->flags),
  			    sizeof(flash_addr_new->flags));
ea882baf9   Wolfgang Denk   New implementatio...
331
  		flash_sect_protect(1, (ulong)flash_addr_new, end_addr_new);
c609719b8   wdenk   Initial revision
332
  	}
c3f9d4939   wdenk   * Patch by Yuli B...
333
334
335
  	if (flash_addr->flags != ACTIVE_FLAG &&
  	    (flash_addr->flags & ACTIVE_FLAG) == ACTIVE_FLAG) {
  		char flag = ACTIVE_FLAG;
203e94f6c   Simon Glass   env: Add an enum ...
336
  		gd->env_valid = ENV_REDUND;
ea882baf9   Wolfgang Denk   New implementatio...
337
  		flash_sect_protect(0, (ulong)flash_addr, end_addr);
c3f9d4939   wdenk   * Patch by Yuli B...
338
  		flash_write(&flag,
8bde7f776   wdenk   * Code cleanup:
339
340
  			    (ulong)&(flash_addr->flags),
  			    sizeof(flash_addr->flags));
ea882baf9   Wolfgang Denk   New implementatio...
341
  		flash_sect_protect(1, (ulong)flash_addr, end_addr);
c609719b8   wdenk   Initial revision
342
  	}
203e94f6c   Simon Glass   env: Add an enum ...
343
  	if (gd->env_valid == ENV_REDUND)
82b54b972   Igor Grinberg   env: clean env_fl...
344
345
346
347
  		puts("*** Warning - some problems detected "
  		     "reading environment; recovered successfully
  
  ");
0e8d15866   Jean-Christophe PLAGNIOL-VILLARD   rename CFG_ENV ma...
348
  #endif /* CONFIG_ENV_ADDR_REDUND */
ea882baf9   Wolfgang Denk   New implementatio...
349

2166ebf78   Simon Goldschmidt   env: make env dri...
350
  	return env_import((char *)flash_addr, 1);
c609719b8   wdenk   Initial revision
351
  }
e5bce247b   Simon Glass   env: Switch over ...
352
  #endif /* LOADENV */
4415f1d1f   Simon Glass   env: Create a loc...
353
354
355
  
  U_BOOT_ENV_LOCATION(flash) = {
  	.location	= ENVL_FLASH,
ac358beb8   Simon Glass   env: Drop the env...
356
  	ENV_NAME("Flash")
4415f1d1f   Simon Glass   env: Create a loc...
357
  #ifdef LOADENV
e5bce247b   Simon Glass   env: Switch over ...
358
  	.load		= env_flash_load,
4415f1d1f   Simon Glass   env: Create a loc...
359
360
  #endif
  #ifdef CMD_SAVEENV
e5bce247b   Simon Glass   env: Switch over ...
361
  	.save		= env_save_ptr(env_flash_save),
4415f1d1f   Simon Glass   env: Create a loc...
362
363
  #endif
  #ifdef INITENV
e5bce247b   Simon Glass   env: Switch over ...
364
  	.init		= env_flash_init,
4415f1d1f   Simon Glass   env: Create a loc...
365
366
  #endif
  };