projects
/
oweals
/
u-boot.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
powerpc/85xx: Rework TQM boards pci_init_board to use common FSL PCIe code
[oweals/u-boot.git]
/
board
/
gcplus
/
flash.c
diff --git
a/board/gcplus/flash.c
b/board/gcplus/flash.c
index 48f33b2b7a03a404d06e9a20f09bef844a9fd158..8511582baece976aa8bb1310285cd59a1499fe95 100644
(file)
--- a/
board/gcplus/flash.c
+++ b/
board/gcplus/flash.c
@@
-29,7
+29,7
@@
#include <common.h>
#include <linux/byteorder/swab.h>
#include <common.h>
#include <linux/byteorder/swab.h>
-flash_info_t flash_info[C
FG_MAX_FLASH_BANKS];
/* info for FLASH chips */
+flash_info_t flash_info[C
ONFIG_SYS_MAX_FLASH_BANKS];
/* info for FLASH chips */
/* Board support for 1 or 2 flash devices */
#define FLASH_PORT_WIDTH32
/* Board support for 1 or 2 flash devices */
#define FLASH_PORT_WIDTH32
@@
-67,7
+67,7
@@
flash_init(void)
int i;
ulong size = 0;
int i;
ulong size = 0;
- for (i = 0; i < C
FG
_MAX_FLASH_BANKS; i++) {
+ for (i = 0; i < C
ONFIG_SYS
_MAX_FLASH_BANKS; i++) {
switch (i) {
case 0:
flash_get_size((FPW *) PHYS_FLASH_1, &flash_info[i]);
switch (i) {
case 0:
flash_get_size((FPW *) PHYS_FLASH_1, &flash_info[i]);
@@
-83,8
+83,8
@@
flash_init(void)
/* Protect monitor and environment sectors
*/
flash_protect(FLAG_PROTECT_SET,
/* Protect monitor and environment sectors
*/
flash_protect(FLAG_PROTECT_SET,
- C
FG
_FLASH_BASE,
- C
FG
_FLASH_BASE + monitor_flash_len - 1, &flash_info[0]);
+ C
ONFIG_SYS
_FLASH_BASE,
+ C
ONFIG_SYS
_FLASH_BASE + monitor_flash_len - 1, &flash_info[0]);
flash_protect(FLAG_PROTECT_SET,
CONFIG_ENV_ADDR,
flash_protect(FLAG_PROTECT_SET,
CONFIG_ENV_ADDR,
@@
-207,10
+207,10
@@
flash_get_size(FPW * addr, flash_info_t * info)
break;
}
break;
}
- if (info->sector_count > C
FG
_MAX_FLASH_SECT) {
+ if (info->sector_count > C
ONFIG_SYS
_MAX_FLASH_SECT) {
printf("** ERROR: sector count %d > max (%d) **\n",
printf("** ERROR: sector count %d > max (%d) **\n",
- info->sector_count, C
FG
_MAX_FLASH_SECT);
- info->sector_count = C
FG
_MAX_FLASH_SECT;
+ info->sector_count, C
ONFIG_SYS
_MAX_FLASH_SECT);
+ info->sector_count = C
ONFIG_SYS
_MAX_FLASH_SECT;
}
addr[0] = (FPW) 0x00FF00FF; /* restore read mode */
}
addr[0] = (FPW) 0x00FF00FF; /* restore read mode */
@@
-282,7
+282,7
@@
flash_erase(flash_info_t * info, int s_first, int s_last)
while (((status =
*addr) & (FPW) 0x00800080) !=
(FPW) 0x00800080) {
while (((status =
*addr) & (FPW) 0x00800080) !=
(FPW) 0x00800080) {
- if (get_timer_masked() > C
FG
_FLASH_ERASE_TOUT) {
+ if (get_timer_masked() > C
ONFIG_SYS
_FLASH_ERASE_TOUT) {
printf("Timeout\n");
*addr = (FPW) 0x00B000B0; /* suspend erase */
*addr = (FPW) 0x00FF00FF; /* reset to read mode */
printf("Timeout\n");
*addr = (FPW) 0x00B000B0; /* suspend erase */
*addr = (FPW) 0x00FF00FF; /* reset to read mode */
@@
-418,7
+418,7
@@
write_data(flash_info_t * info, ulong dest, FPW data)
/* wait while polling the status register */
while (((status = *addr) & (FPW) 0x00800080) != (FPW) 0x00800080) {
/* wait while polling the status register */
while (((status = *addr) & (FPW) 0x00800080) != (FPW) 0x00800080) {
- if (get_timer_masked() > C
FG
_FLASH_WRITE_TOUT) {
+ if (get_timer_masked() > C
ONFIG_SYS
_FLASH_WRITE_TOUT) {
*addr = (FPW) 0x00FF00FF; /* restore read mode */
return (1);
}
*addr = (FPW) 0x00FF00FF; /* restore read mode */
return (1);
}