projects
/
platform
/
kernel
/
u-boot.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
rename CFG_ macros to CONFIG_SYS
[platform/kernel/u-boot.git]
/
board
/
xm250
/
flash.c
diff --git
a/board/xm250/flash.c
b/board/xm250/flash.c
index
893351e
..
b02149c
100644
(file)
--- a/
board/xm250/flash.c
+++ b/
board/xm250/flash.c
@@
-28,7
+28,7
@@
#include <linux/byteorder/swab.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
@@
-84,7
+84,7
@@
unsigned long 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]);
@@
-104,8
+104,8
@@
unsigned long 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,
+ C
ONFIG_SYS
_FLASH_BASE,
+ C
ONFIG_SYS
_FLASH_BASE + monitor_flash_len - 1,
&flash_info[0] );
flash_protect ( FLAG_PROTECT_SET,
&flash_info[0] );
flash_protect ( FLAG_PROTECT_SET,
@@
-232,10
+232,10
@@
static ulong 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 */
@@
-305,7
+305,7
@@
int flash_erase (flash_info_t *info, int s_first, int s_last)
*addr = (FPW) 0x00D000D0; /* erase confirm */
while (((status = *addr) & (FPW) 0x00800080) != (FPW) 0x00800080) {
*addr = (FPW) 0x00D000D0; /* erase confirm */
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 */
@@
-439,7
+439,7
@@
static int 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);
}
@@
-484,7
+484,7
@@
int flash_real_protect(flash_info_t *info, long sector, int prot)
reset_timer_masked ();
while ((*addr & INTEL_FINISHED) != INTEL_FINISHED) {
reset_timer_masked ();
while ((*addr & INTEL_FINISHED) != INTEL_FINISHED) {
- if (get_timer_masked () > C
FG
_FLASH_UNLOCK_TOUT) {
+ if (get_timer_masked () > C
ONFIG_SYS
_FLASH_UNLOCK_TOUT) {
printf("Flash lock bit operation timed out\n");
rc = 1;
break;
printf("Flash lock bit operation timed out\n");
rc = 1;
break;
@@
-516,7
+516,7
@@
int flash_real_protect(flash_info_t *info, long sector, int prot)
*addr = INTEL_PROTECT; /* set */
while ((*addr & INTEL_FINISHED) != INTEL_FINISHED)
{
*addr = INTEL_PROTECT; /* set */
while ((*addr & INTEL_FINISHED) != INTEL_FINISHED)
{
- if (get_timer_masked () > C
FG
_FLASH_UNLOCK_TOUT)
+ if (get_timer_masked () > C
ONFIG_SYS
_FLASH_UNLOCK_TOUT)
{
printf("Flash lock bit operation timed out\n");
rc = 1;
{
printf("Flash lock bit operation timed out\n");
rc = 1;