projects
/
oweals
/
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
[oweals/u-boot.git]
/
board
/
freescale
/
m5272c3
/
flash.c
diff --git
a/board/freescale/m5272c3/flash.c
b/board/freescale/m5272c3/flash.c
index ea0b1fd7e0942a126cae6585a208b10bbb32b82d..586a2cfc63267ed3e15ef5ff12b4ab439f2e1ed6 100644
(file)
--- a/
board/freescale/m5272c3/flash.c
+++ b/
board/freescale/m5272c3/flash.c
@@
-23,10
+23,10
@@
#include <common.h>
#include <common.h>
-#define PHYS_FLASH_1 C
FG
_FLASH_BASE
+#define PHYS_FLASH_1 C
ONFIG_SYS
_FLASH_BASE
#define FLASH_BANK_SIZE 0x200000
#define FLASH_BANK_SIZE 0x200000
-flash_info_t flash_info[C
FG
_MAX_FLASH_BANKS];
+flash_info_t flash_info[C
ONFIG_SYS
_MAX_FLASH_BANKS];
void flash_print_info (flash_info_t * info)
{
void flash_print_info (flash_info_t * info)
{
@@
-74,15
+74,15
@@
unsigned long flash_init (void)
int i, j;
ulong size = 0;
int i, j;
ulong size = 0;
- for (i = 0; i < C
FG
_MAX_FLASH_BANKS; i++) {
+ for (i = 0; i < C
ONFIG_SYS
_MAX_FLASH_BANKS; i++) {
ulong flashbase = 0;
flash_info[i].flash_id =
(AMD_MANUFACT & FLASH_VENDMASK) |
(AMD_ID_PL160CB & FLASH_TYPEMASK);
flash_info[i].size = FLASH_BANK_SIZE;
ulong flashbase = 0;
flash_info[i].flash_id =
(AMD_MANUFACT & FLASH_VENDMASK) |
(AMD_ID_PL160CB & FLASH_TYPEMASK);
flash_info[i].size = FLASH_BANK_SIZE;
- flash_info[i].sector_count = C
FG
_MAX_FLASH_SECT;
- memset (flash_info[i].protect, 0, C
FG
_MAX_FLASH_SECT);
+ flash_info[i].sector_count = C
ONFIG_SYS
_MAX_FLASH_SECT;
+ memset (flash_info[i].protect, 0, C
ONFIG_SYS
_MAX_FLASH_SECT);
if (i == 0)
flashbase = PHYS_FLASH_1;
else
if (i == 0)
flashbase = PHYS_FLASH_1;
else
@@
-113,8
+113,8
@@
unsigned long flash_init (void)
}
flash_protect (FLAG_PROTECT_SET,
}
flash_protect (FLAG_PROTECT_SET,
- C
FG
_FLASH_BASE,
- C
FG
_FLASH_BASE + 0x3ffff, &flash_info[0]);
+ C
ONFIG_SYS
_FLASH_BASE,
+ C
ONFIG_SYS
_FLASH_BASE + 0x3ffff, &flash_info[0]);
return size;
}
return size;
}
@@
-128,8
+128,8
@@
unsigned long flash_init (void)
#define CMD_PROGRAM 0x00A0
#define CMD_UNLOCK_BYPASS 0x0020
#define CMD_PROGRAM 0x00A0
#define CMD_UNLOCK_BYPASS 0x0020
-#define MEM_FLASH_ADDR1 (*(volatile u16 *)(C
FG
_FLASH_BASE + (0x00000555<<1)))
-#define MEM_FLASH_ADDR2 (*(volatile u16 *)(C
FG
_FLASH_BASE + (0x000002AA<<1)))
+#define MEM_FLASH_ADDR1 (*(volatile u16 *)(C
ONFIG_SYS
_FLASH_BASE + (0x00000555<<1)))
+#define MEM_FLASH_ADDR2 (*(volatile u16 *)(C
ONFIG_SYS
_FLASH_BASE + (0x000002AA<<1)))
#define BIT_ERASE_DONE 0x0080
#define BIT_RDY_MASK 0x0080
#define BIT_ERASE_DONE 0x0080
#define BIT_RDY_MASK 0x0080
@@
-211,7
+211,7
@@
int flash_erase (flash_info_t * info, int s_first, int s_last)
result = *addr;
/* check timeout */
result = *addr;
/* check timeout */
- if (get_timer (0) > C
FG
_FLASH_ERASE_TOUT) {
+ if (get_timer (0) > C
ONFIG_SYS
_FLASH_ERASE_TOUT) {
MEM_FLASH_ADDR1 = CMD_READ_ARRAY;
chip1 = TMO;
break;
MEM_FLASH_ADDR1 = CMD_READ_ARRAY;
chip1 = TMO;
break;
@@
-299,7
+299,7
@@
static int write_word (flash_info_t * info, ulong dest, ulong data)
result = *addr;
/* check timeout */
result = *addr;
/* check timeout */
- if (get_timer (0) > C
FG
_FLASH_ERASE_TOUT) {
+ if (get_timer (0) > C
ONFIG_SYS
_FLASH_ERASE_TOUT) {
chip1 = ERR | TMO;
break;
}
chip1 = ERR | TMO;
break;
}