Blame view

tools/updater/flash_hw.c 14.1 KB
c7de829c7   wdenk   * Patch by Thomas...
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
  /*
   * (C) Copyright 2001
   * Josh Huber <huber@mclx.com>, Mission Critical Linux, Inc.
   *
   * (C) Copyright 2002
   * Wolfgang Denk, DENX Software Engineering, wd@denx.de.
   *
   * See file CREDITS for list of people who contributed to this
   * project.
   *
   * This program is free software; you can redistribute it and/or
   * modify it under the terms of the GNU General Public License as
   * published by the Free Software Foundation; either version 2 of
   * the License, or (at your option) any later version.
   *
   * This program is distributed in the hope that it will be useful,
   * but WITHOUT ANY WARRANTY; without even the implied warranty of
   * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.	 See the
   * GNU General Public License for more details.
   *
   * You should have received a copy of the GNU General Public License
   * along with this program; if not, write to the Free Software
   * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
   * MA 02111-1307 USA
   */
  
  #include <common.h>
  #include <flash.h>
  #include <asm/io.h>
  #include <memio.h>
  
  /*---------------------------------------------------------------------*/
  #undef DEBUG_FLASH
c7de829c7   wdenk   * Patch by Thomas...
34
35
  
  #ifdef DEBUG_FLASH
27b207fd0   wdenk   * Implement new m...
36
  #define DEBUGF(fmt,args...) printf(fmt ,##args)
c7de829c7   wdenk   * Patch by Thomas...
37
38
39
40
  #else
  #define DEBUGF(fmt,args...)
  #endif
  /*---------------------------------------------------------------------*/
e6f2e9023   Marian Balakowicz   Added support for...
41
  flash_info_t	flash_info[];
c7de829c7   wdenk   * Patch by Thomas...
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
  
  static ulong flash_get_size (ulong addr, flash_info_t *info);
  static int flash_get_offsets (ulong base, flash_info_t *info);
  static int write_word (flash_info_t *info, ulong dest, ulong data);
  static void flash_reset (ulong addr);
  
  int flash_xd_nest;
  
  static void flash_to_xd(void)
  {
      unsigned char x;
  
      flash_xd_nest ++;
  
      if (flash_xd_nest == 1)
      {
  	DEBUGF("Flash on XD
  ");
  	x = pci_read_cfg_byte(0, 0, 0x74);
  	pci_write_cfg_byte(0, 0, 0x74, x|1);
      }
  }
  
  static void flash_to_mem(void)
  {
      unsigned char x;
  
      flash_xd_nest --;
8bde7f776   wdenk   * Code cleanup:
70

c7de829c7   wdenk   * Patch by Thomas...
71
72
73
74
75
76
77
78
79
80
81
82
      if (flash_xd_nest == 0)
      {
  	DEBUGF("Flash on memory bus
  ");
  	x = pci_read_cfg_byte(0, 0, 0x74);
  	pci_write_cfg_byte(0, 0, 0x74, x&0xFE);
      }
  }
  
  unsigned long flash_init_old(void)
  {
      int i;
6d0f6bcf3   Jean-Christophe PLAGNIOL-VILLARD   rename CFG_ macro...
83
      for (i = 0; i < CONFIG_SYS_MAX_FLASH_BANKS; i++)
c7de829c7   wdenk   * Patch by Thomas...
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
      {
  	flash_info[i].flash_id = FLASH_UNKNOWN;
  	flash_info[i].sector_count = 0;
  	flash_info[i].size = 0;
      }
  
  
      return 1;
  }
  
  unsigned long flash_init (void)
  {
  	unsigned int i;
  	unsigned long flash_size = 0;
  
  	flash_xd_nest = 0;
  
  	flash_to_xd();
  
  	/* Init: no FLASHes known */
6d0f6bcf3   Jean-Christophe PLAGNIOL-VILLARD   rename CFG_ macro...
104
  	for (i=0; i<CONFIG_SYS_MAX_FLASH_BANKS; ++i) {
c7de829c7   wdenk   * Patch by Thomas...
105
106
107
108
  		flash_info[i].flash_id = FLASH_UNKNOWN;
  		flash_info[i].sector_count = 0;
  		flash_info[i].size = 0;
  	}
6d0f6bcf3   Jean-Christophe PLAGNIOL-VILLARD   rename CFG_ macro...
109
110
111
  	DEBUGF("
  ## Get flash size @ 0x%08x
  ", CONFIG_SYS_FLASH_BASE);
c7de829c7   wdenk   * Patch by Thomas...
112

6d0f6bcf3   Jean-Christophe PLAGNIOL-VILLARD   rename CFG_ macro...
113
  	flash_size = flash_get_size (CONFIG_SYS_FLASH_BASE, flash_info);
c7de829c7   wdenk   * Patch by Thomas...
114
115
116
117
118
  
  	DEBUGF("## Flash bank size: %08lx
  ", flash_size);
  
  	if (flash_size) {
6d0f6bcf3   Jean-Christophe PLAGNIOL-VILLARD   rename CFG_ macro...
119
120
  #if CONFIG_SYS_MONITOR_BASE >= CONFIG_SYS_FLASH_BASE && \
      CONFIG_SYS_MONITOR_BASE < CONFIG_SYS_FLASH_BASE + CONFIG_SYS_FLASH_MAX_SIZE
c7de829c7   wdenk   * Patch by Thomas...
121
122
  		/* monitor protection ON by default */
  		flash_protect(FLAG_PROTECT_SET,
6d0f6bcf3   Jean-Christophe PLAGNIOL-VILLARD   rename CFG_ macro...
123
124
  			      CONFIG_SYS_MONITOR_BASE,
  			      CONFIG_SYS_MONITOR_BASE + CONFIG_SYS_MONITOR_LEN - 1,
c7de829c7   wdenk   * Patch by Thomas...
125
126
  			      &flash_info[0]);
  #endif
5a1aceb06   Jean-Christophe PLAGNIOL-VILLARD   rename CFG_ENV_IS...
127
  #ifdef CONFIG_ENV_IS_IN_FLASH
c7de829c7   wdenk   * Patch by Thomas...
128
129
  		/* ENV protection ON by default */
  		flash_protect(FLAG_PROTECT_SET,
0e8d15866   Jean-Christophe PLAGNIOL-VILLARD   rename CFG_ENV ma...
130
131
  			      CONFIG_ENV_ADDR,
  			      CONFIG_ENV_ADDR + CONFIG_ENV_SECT_SIZE - 1,
c7de829c7   wdenk   * Patch by Thomas...
132
133
134
135
  			      &flash_info[0]);
  #endif
  
  	} else {
27b207fd0   wdenk   * Implement new m...
136
  		printf ("Warning: the BOOT Flash is not initialised !");
c7de829c7   wdenk   * Patch by Thomas...
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
  	}
  
  	flash_to_mem();
  
  	return flash_size;
  }
  
  /*
   * The following code cannot be run from FLASH!
   */
  static ulong flash_get_size (ulong addr, flash_info_t *info)
  {
  	short i;
  	uchar value;
  	uchar *x = (uchar *)addr;
  
  	flash_to_xd();
  
  	/* Write auto select command: read Manufacturer ID */
  	x[0x0555] =  0xAA;
54e822f95   Peter Tyser   Replace __asm ref...
157
158
  	__asm__ volatile ("sync
   eieio");
c7de829c7   wdenk   * Patch by Thomas...
159
  	x[0x02AA] =  0x55;
54e822f95   Peter Tyser   Replace __asm ref...
160
161
  	__asm__ volatile ("sync
   eieio");
c7de829c7   wdenk   * Patch by Thomas...
162
  	x[0x0555] =  0x90;
54e822f95   Peter Tyser   Replace __asm ref...
163
164
  	__asm__ volatile ("sync
   eieio");
c7de829c7   wdenk   * Patch by Thomas...
165
166
  
  	value = x[0];
54e822f95   Peter Tyser   Replace __asm ref...
167
168
  	__asm__ volatile ("sync
   eieio");
c7de829c7   wdenk   * Patch by Thomas...
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
  
  	DEBUGF("Manuf. ID @ 0x%08lx: 0x%08x
  ", (ulong)addr, value);
  
  	switch (value | (value << 16)) {
  		case AMD_MANUFACT:
  			info->flash_id = FLASH_MAN_AMD;
  			break;
  
  		case FUJ_MANUFACT:
  			info->flash_id = FLASH_MAN_FUJ;
  			break;
  
  		case STM_MANUFACT:
  			info->flash_id = FLASH_MAN_STM;
  			break;
  
  		default:
  			info->flash_id = FLASH_UNKNOWN;
  			info->sector_count = 0;
  			info->size = 0;
  			flash_reset (addr);
  			return 0;
  	}
  
  	value = x[1];
54e822f95   Peter Tyser   Replace __asm ref...
195
196
  	__asm__ volatile ("sync
   eieio");
c7de829c7   wdenk   * Patch by Thomas...
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
  
  	DEBUGF("Device ID @ 0x%08lx: 0x%08x
  ", addr+1, value);
  
  	switch (value) {
  		case AMD_ID_F040B:
  			DEBUGF("Am29F040B
  ");
  			info->flash_id += FLASH_AM040;
  			info->sector_count = 8;
  			info->size = 0x00080000;
  			break;			/* => 512 kB		*/
  
  		case AMD_ID_LV040B:
  			DEBUGF("Am29LV040B
  ");
  			info->flash_id += FLASH_AM040;
  			info->sector_count = 8;
  			info->size = 0x00080000;
  			break;			/* => 512 kB		*/
  
  		case AMD_ID_LV400T:
  			DEBUGF("Am29LV400T
  ");
  			info->flash_id += FLASH_AM400T;
  			info->sector_count = 11;
  			info->size = 0x00100000;
  			break;			/* => 1 MB		*/
  
  		case AMD_ID_LV400B:
  			DEBUGF("Am29LV400B
  ");
  			info->flash_id += FLASH_AM400B;
  			info->sector_count = 11;
  			info->size = 0x00100000;
  			break;			/* => 1 MB		*/
  
  		case AMD_ID_LV800T:
  			DEBUGF("Am29LV800T
  ");
  			info->flash_id += FLASH_AM800T;
  			info->sector_count = 19;
  			info->size = 0x00200000;
  			break;			/* => 2 MB		*/
  
  		case AMD_ID_LV800B:
  			DEBUGF("Am29LV400B
  ");
  			info->flash_id += FLASH_AM800B;
  			info->sector_count = 19;
  			info->size = 0x00200000;
  			break;			/* => 2 MB		*/
  
  		case AMD_ID_LV160T:
  			DEBUGF("Am29LV160T
  ");
  			info->flash_id += FLASH_AM160T;
  			info->sector_count = 35;
  			info->size = 0x00400000;
  			break;			/* => 4 MB		*/
  
  		case AMD_ID_LV160B:
  			DEBUGF("Am29LV160B
  ");
  			info->flash_id += FLASH_AM160B;
  			info->sector_count = 35;
  			info->size = 0x00400000;
  			break;			/* => 4 MB		*/
  
  		case AMD_ID_LV320T:
  			DEBUGF("Am29LV320T
  ");
  			info->flash_id += FLASH_AM320T;
  			info->sector_count = 67;
  			info->size = 0x00800000;
  			break;			/* => 8 MB		*/
  
  #if 0
  		/* Has the same ID as AMD_ID_LV320T, to be fixed */
  		case AMD_ID_LV320B:
  			DEBUGF("Am29LV320B
  ");
  			info->flash_id += FLASH_AM320B;
  			info->sector_count = 67;
  			info->size = 0x00800000;
  			break;			/* => 8 MB		*/
  #endif
  
  		case AMD_ID_LV033C:
  			DEBUGF("Am29LV033C
  ");
  			info->flash_id += FLASH_AM033C;
  			info->sector_count = 64;
  			info->size = 0x01000000;
  			break;			/* => 16Mb		*/
  
  		case STM_ID_F040B:
  			DEBUGF("M29F040B
  ");
  			info->flash_id += FLASH_AM040;
  			info->sector_count = 8;
  			info->size = 0x00080000;
  			break;			/* => 512 kB		*/
  
  		default:
  			info->flash_id = FLASH_UNKNOWN;
  			flash_reset (addr);
  			flash_to_mem();
  			return (0);		/* => no or unknown flash */
  
  	}
6d0f6bcf3   Jean-Christophe PLAGNIOL-VILLARD   rename CFG_ macro...
308
  	if (info->sector_count > CONFIG_SYS_MAX_FLASH_SECT) {
27b207fd0   wdenk   * Implement new m...
309
310
  		printf ("** ERROR: sector count %d > max (%d) **
  ",
6d0f6bcf3   Jean-Christophe PLAGNIOL-VILLARD   rename CFG_ macro...
311
312
  			info->sector_count, CONFIG_SYS_MAX_FLASH_SECT);
  		info->sector_count = CONFIG_SYS_MAX_FLASH_SECT;
c7de829c7   wdenk   * Patch by Thomas...
313
314
315
316
317
318
319
320
321
322
323
324
325
326
327
328
329
330
331
332
333
334
335
336
337
338
339
340
341
342
343
344
345
346
347
348
  	}
  
  	if (! flash_get_offsets (addr, info)) {
  		flash_reset (addr);
  		flash_to_mem();
  		return 0;
  	}
  
  	/* check for protected sectors */
  	for (i = 0; i < info->sector_count; i++) {
  		/* read sector protection at sector address, (A7 .. A0) = 0x02 */
  		/* D0 = 1 if protected */
  		value = in8(info->start[i] + 2);
  		iobarrier_rw();
  		info->protect[i] = (value & 1) != 0;
  	}
  
  	/*
  	 * Reset bank to read mode
  	 */
  	flash_reset (addr);
  
  	flash_to_mem();
  
  	return (info->size);
  }
  
  static int flash_get_offsets (ulong base, flash_info_t *info)
  {
  	unsigned int i;
  
  	switch (info->flash_id & FLASH_TYPEMASK) {
  		case FLASH_AM040:
  			/* set sector offsets for uniform sector type	*/
  			for (i = 0; i < info->sector_count; i++) {
  				info->start[i] = base + i * info->size /
8bde7f776   wdenk   * Code cleanup:
349
  							    info->sector_count;
c7de829c7   wdenk   * Patch by Thomas...
350
351
352
353
354
355
356
357
358
359
360
361
362
363
364
365
366
367
368
  			}
  			break;
  		default:
  			return 0;
  	}
  
  	return 1;
  }
  
  int flash_erase (flash_info_t *info, int s_first, int s_last)
  {
  	volatile ulong addr = info->start[0];
  	int flag, prot, sect, l_sect;
  	ulong start, now, last;
  
  	flash_to_xd();
  
  	if (s_first < 0 || s_first > s_last) {
  		if (info->flash_id == FLASH_UNKNOWN) {
27b207fd0   wdenk   * Implement new m...
369
370
  			printf ("- missing
  ");
c7de829c7   wdenk   * Patch by Thomas...
371
  		} else {
27b207fd0   wdenk   * Implement new m...
372
373
  			printf ("- no sectors to erase
  ");
c7de829c7   wdenk   * Patch by Thomas...
374
375
376
377
378
379
  		}
  		flash_to_mem();
  		return 1;
  	}
  
  	if (info->flash_id == FLASH_UNKNOWN) {
27b207fd0   wdenk   * Implement new m...
380
381
  		printf ("Can't erase unknown flash type %08lx - aborted
  ",
c7de829c7   wdenk   * Patch by Thomas...
382
383
384
385
386
387
388
389
390
391
392
393
394
  			info->flash_id);
  		flash_to_mem();
  		return 1;
  	}
  
  	prot = 0;
  	for (sect=s_first; sect<=s_last; ++sect) {
  		if (info->protect[sect]) {
  			prot++;
  		}
  	}
  
  	if (prot) {
27b207fd0   wdenk   * Implement new m...
395
396
  		printf ("- Warning: %d protected sectors will not be erased!
  ",
c7de829c7   wdenk   * Patch by Thomas...
397
398
  			prot);
  	} else {
27b207fd0   wdenk   * Implement new m...
399
  		printf ("");
c7de829c7   wdenk   * Patch by Thomas...
400
401
402
403
404
405
406
407
408
409
410
411
412
413
414
415
416
417
418
419
420
421
422
423
424
425
426
427
428
429
430
431
432
  	}
  
  	l_sect = -1;
  
  	/* Disable interrupts which might cause a timeout here */
  	flag = disable_interrupts();
  
  	out8(addr + 0x555, 0xAA);
  	iobarrier_rw();
  	out8(addr + 0x2AA, 0x55);
  	iobarrier_rw();
  	out8(addr + 0x555, 0x80);
  	iobarrier_rw();
  	out8(addr + 0x555, 0xAA);
  	iobarrier_rw();
  	out8(addr + 0x2AA, 0x55);
  	iobarrier_rw();
  
  	/* Start erase on unprotected sectors */
  	for (sect = s_first; sect<=s_last; sect++) {
  		if (info->protect[sect] == 0) {	/* not protected */
  			addr = info->start[sect];
  			out8(addr, 0x30);
  			iobarrier_rw();
  			l_sect = sect;
  		}
  	}
  
  	/* re-enable interrupts if necessary */
  	if (flag)
  		enable_interrupts();
  
  	/* wait at least 80us - let's wait 1 ms */
27b207fd0   wdenk   * Implement new m...
433
  	udelay (1000);
c7de829c7   wdenk   * Patch by Thomas...
434
435
436
437
438
439
  
  	/*
  	 * We wait for the last triggered sector
  	 */
  	if (l_sect < 0)
  		goto DONE;
27b207fd0   wdenk   * Implement new m...
440
  	start = get_timer (0);
c7de829c7   wdenk   * Patch by Thomas...
441
442
  	last  = start;
  	addr = info->start[l_sect];
6d0f6bcf3   Jean-Christophe PLAGNIOL-VILLARD   rename CFG_ macro...
443
444
  	DEBUGF ("Start erase timeout: %d
  ", CONFIG_SYS_FLASH_ERASE_TOUT);
c7de829c7   wdenk   * Patch by Thomas...
445
446
  
  	while ((in8(addr) & 0x80) != 0x80) {
6d0f6bcf3   Jean-Christophe PLAGNIOL-VILLARD   rename CFG_ macro...
447
  		if ((now = get_timer(start)) > CONFIG_SYS_FLASH_ERASE_TOUT) {
27b207fd0   wdenk   * Implement new m...
448
449
  			printf ("Timeout
  ");
c7de829c7   wdenk   * Patch by Thomas...
450
451
452
453
454
455
  			flash_reset (info->start[0]);
  			flash_to_mem();
  			return 1;
  		}
  		/* show that we're waiting */
  		if ((now - last) > 1000) {	/* every second */
27b207fd0   wdenk   * Implement new m...
456
  			putc ('.');
c7de829c7   wdenk   * Patch by Thomas...
457
458
459
460
461
462
463
464
465
  			last = now;
  		}
  		iobarrier_rw();
  	}
  
  DONE:
  	/* reset to read mode */
  	flash_reset (info->start[0]);
  	flash_to_mem();
27b207fd0   wdenk   * Implement new m...
466
467
  	printf (" done
  ");
c7de829c7   wdenk   * Patch by Thomas...
468
469
470
471
472
473
474
475
476
477
478
479
480
481
482
483
484
485
486
487
488
489
490
491
492
493
494
495
496
497
498
499
500
501
502
503
504
  	return 0;
  }
  
  /*
   * Copy memory to flash, returns:
   * 0 - OK
   * 1 - write timeout
   * 2 - Flash not erased
   */
  int write_buff (flash_info_t *info, uchar *src, ulong addr, ulong cnt)
  {
  	ulong cp, wp, data;
  	int i, l, rc;
  	ulong out_cnt = 0;
  
  	flash_to_xd();
  
  	wp = (addr & ~3);	/* get lower word aligned address */
  
  	/*
  	 * handle unaligned start bytes
  	 */
  	if ((l = addr - wp) != 0) {
  		data = 0;
  		for (i=0, cp=wp; i<l; ++i, ++cp) {
  			data = (data << 8) | (*(uchar *)cp);
  		}
  		for (; i<4 && cnt>0; ++i) {
  			data = (data << 8) | *src++;
  			--cnt;
  			++cp;
  		}
  		for (; cnt==0 && i<4; ++i, ++cp) {
  			data = (data << 8) | (*(uchar *)cp);
  		}
  
  		if ((rc = write_word(info, wp, data)) != 0) {
8bde7f776   wdenk   * Code cleanup:
505
  			flash_to_mem();
c7de829c7   wdenk   * Patch by Thomas...
506
507
508
509
  			return (rc);
  		}
  		wp += 4;
  	}
27b207fd0   wdenk   * Implement new m...
510
  	putc(219);
c7de829c7   wdenk   * Patch by Thomas...
511
512
513
514
515
  
  	/*
  	 * handle word aligned part
  	 */
  	while (cnt >= 4) {
8bde7f776   wdenk   * Code cleanup:
516
  	    if (out_cnt>26214)
c7de829c7   wdenk   * Patch by Thomas...
517
  	    {
27b207fd0   wdenk   * Implement new m...
518
  		putc(219);
c7de829c7   wdenk   * Patch by Thomas...
519
520
521
522
523
524
525
526
527
528
529
530
531
532
533
534
535
536
537
538
539
540
541
542
543
544
545
546
547
548
549
550
551
552
553
554
555
556
557
558
559
560
561
562
563
564
565
566
567
568
569
570
571
572
573
574
575
576
577
578
579
580
581
582
583
584
585
586
587
588
589
590
591
592
593
  		out_cnt = 0;
  	    }
  	    data = 0;
  	    for (i=0; i<4; ++i) {
  		data = (data << 8) | *src++;
  	    }
  	    if ((rc = write_word(info, wp, data)) != 0) {
  		flash_to_mem();
  		return (rc);
  	    }
  	    wp  += 4;
  	    cnt -= 4;
  	    out_cnt += 4;
  	}
  
  	if (cnt == 0) {
  		flash_to_mem();
  		return (0);
  	}
  
  	/*
  	 * handle unaligned tail bytes
  	 */
  	data = 0;
  	for (i=0, cp=wp; i<4 && cnt>0; ++i, ++cp) {
  		data = (data << 8) | *src++;
  		--cnt;
  	}
  	for (; i<4; ++i, ++cp) {
  		data = (data << 8) | (*(uchar *)cp);
  	}
  
  	flash_to_mem();
  	return (write_word(info, wp, data));
  }
  
  /*
   * Write a word to Flash, returns:
   * 0 - OK
   * 1 - write timeout
   * 2 - Flash not erased
   */
  static int write_word (flash_info_t *info, ulong dest, ulong data)
  {
  	volatile ulong addr = info->start[0];
  	ulong start;
  	int i;
  
  	flash_to_xd();
  
  	/* Check if Flash is (sufficiently) erased */
  	if ((in32(dest) & data) != data) {
  		flash_to_mem();
  		return (2);
  	}
  
  	/* write each byte out */
  	for (i = 0; i < 4; i++) {
  		char *data_ch = (char *)&data;
  		int flag = disable_interrupts();
  
  		out8(addr + 0x555, 0xAA);
  		iobarrier_rw();
  		out8(addr + 0x2AA, 0x55);
  		iobarrier_rw();
  		out8(addr + 0x555, 0xA0);
  		iobarrier_rw();
  		out8(dest+i, data_ch[i]);
  		iobarrier_rw();
  
  		/* re-enable interrupts if necessary */
  		if (flag)
  			enable_interrupts();
  
  		/* data polling for D7 */
27b207fd0   wdenk   * Implement new m...
594
  		start = get_timer (0);
c7de829c7   wdenk   * Patch by Thomas...
595
  		while ((in8(dest+i) & 0x80) != (data_ch[i] & 0x80)) {
6d0f6bcf3   Jean-Christophe PLAGNIOL-VILLARD   rename CFG_ macro...
596
  			if (get_timer(start) > CONFIG_SYS_FLASH_WRITE_TOUT) {
c7de829c7   wdenk   * Patch by Thomas...
597
598
599
600
601
602
603
604
605
606
607
608
609
610
611
612
613
614
  				flash_reset (addr);
  				flash_to_mem();
  				return (1);
  			}
  			iobarrier_rw();
  		}
  	}
  
  	flash_reset (addr);
  	flash_to_mem();
  	return (0);
  }
  
  /*
   * Reset bank to read mode
   */
  static void flash_reset (ulong addr)
  {
8bde7f776   wdenk   * Code cleanup:
615
  	flash_to_xd();
c7de829c7   wdenk   * Patch by Thomas...
616
617
618
619
620
621
622
623
624
625
  	out8(addr, 0xF0);	/* reset bank */
  	iobarrier_rw();
  	flash_to_mem();
  }
  
  void flash_print_info (flash_info_t *info)
  {
  	int i;
  
  	if (info->flash_id == FLASH_UNKNOWN) {
27b207fd0   wdenk   * Implement new m...
626
627
  		printf ("missing or unknown FLASH type
  ");
c7de829c7   wdenk   * Patch by Thomas...
628
629
630
631
  		return;
  	}
  
  	switch (info->flash_id & FLASH_VENDMASK) {
27b207fd0   wdenk   * Implement new m...
632
633
634
635
636
  	case FLASH_MAN_AMD:	printf ("AMD ");		break;
  	case FLASH_MAN_FUJ:	printf ("FUJITSU ");		break;
  	case FLASH_MAN_BM:	printf ("BRIGHT MICRO ");	break;
  	case FLASH_MAN_STM:	printf ("SGS THOMSON ");	break;
  	default:		printf ("Unknown Vendor ");	break;
c7de829c7   wdenk   * Patch by Thomas...
637
638
639
  	}
  
  	switch (info->flash_id & FLASH_TYPEMASK) {
27b207fd0   wdenk   * Implement new m...
640
641
  	case FLASH_AM040:	printf ("29F040 or 29LV040 (4 Mbit, uniform sectors)
  ");
c7de829c7   wdenk   * Patch by Thomas...
642
  				break;
27b207fd0   wdenk   * Implement new m...
643
644
  	case FLASH_AM400B:	printf ("AM29LV400B (4 Mbit, bottom boot sect)
  ");
c7de829c7   wdenk   * Patch by Thomas...
645
  				break;
27b207fd0   wdenk   * Implement new m...
646
647
  	case FLASH_AM400T:	printf ("AM29LV400T (4 Mbit, top boot sector)
  ");
c7de829c7   wdenk   * Patch by Thomas...
648
  				break;
27b207fd0   wdenk   * Implement new m...
649
650
  	case FLASH_AM800B:	printf ("AM29LV800B (8 Mbit, bottom boot sect)
  ");
c7de829c7   wdenk   * Patch by Thomas...
651
  				break;
27b207fd0   wdenk   * Implement new m...
652
653
  	case FLASH_AM800T:	printf ("AM29LV800T (8 Mbit, top boot sector)
  ");
c7de829c7   wdenk   * Patch by Thomas...
654
  				break;
27b207fd0   wdenk   * Implement new m...
655
656
  	case FLASH_AM160B:	printf ("AM29LV160B (16 Mbit, bottom boot sect)
  ");
c7de829c7   wdenk   * Patch by Thomas...
657
  				break;
27b207fd0   wdenk   * Implement new m...
658
659
  	case FLASH_AM160T:	printf ("AM29LV160T (16 Mbit, top boot sector)
  ");
c7de829c7   wdenk   * Patch by Thomas...
660
  				break;
27b207fd0   wdenk   * Implement new m...
661
662
  	case FLASH_AM320B:	printf ("AM29LV320B (32 Mbit, bottom boot sect)
  ");
c7de829c7   wdenk   * Patch by Thomas...
663
  				break;
27b207fd0   wdenk   * Implement new m...
664
665
  	case FLASH_AM320T:	printf ("AM29LV320T (32 Mbit, top boot sector)
  ");
c7de829c7   wdenk   * Patch by Thomas...
666
  				break;
27b207fd0   wdenk   * Implement new m...
667
668
  	default:		printf ("Unknown Chip Type
  ");
c7de829c7   wdenk   * Patch by Thomas...
669
670
671
672
  				break;
  	}
  
  	if (info->size % 0x100000 == 0) {
27b207fd0   wdenk   * Implement new m...
673
674
  		printf ("  Size: %ld MB in %d Sectors
  ",
c7de829c7   wdenk   * Patch by Thomas...
675
676
  			info->size / 0x100000, info->sector_count);
  	} else if (info->size % 0x400 == 0) {
27b207fd0   wdenk   * Implement new m...
677
678
  		printf ("  Size: %ld KB in %d Sectors
  ",
8bde7f776   wdenk   * Code cleanup:
679
  			info->size / 0x400, info->sector_count);
c7de829c7   wdenk   * Patch by Thomas...
680
  	} else {
27b207fd0   wdenk   * Implement new m...
681
682
  		printf ("  Size: %ld B in %d Sectors
  ",
8bde7f776   wdenk   * Code cleanup:
683
  			info->size, info->sector_count);
c7de829c7   wdenk   * Patch by Thomas...
684
  	}
27b207fd0   wdenk   * Implement new m...
685
  	printf ("  Sector Start Addresses:");
c7de829c7   wdenk   * Patch by Thomas...
686
687
  	for (i=0; i<info->sector_count; ++i) {
  		if ((i % 5) == 0)
27b207fd0   wdenk   * Implement new m...
688
689
690
  			printf ("
     ");
  		printf (" %08lX%s",
c7de829c7   wdenk   * Patch by Thomas...
691
692
693
694
  			info->start[i],
  			info->protect[i] ? " (RO)" : "     "
  		);
  	}
27b207fd0   wdenk   * Implement new m...
695
696
  	printf ("
  ");
c7de829c7   wdenk   * Patch by Thomas...
697
  }