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
/
csb226
/
flash.c
diff --git
a/board/csb226/flash.c
b/board/csb226/flash.c
index
2a60909
..
02ded1c
100644
(file)
--- a/
board/csb226/flash.c
+++ b/
board/csb226/flash.c
@@
-37,7
+37,7
@@
#define FLASH_BANK_SIZE 0x02000000
#define MAIN_SECT_SIZE 0x40000 /* 2x16 = 256k per sector */
#define FLASH_BANK_SIZE 0x02000000
#define MAIN_SECT_SIZE 0x40000 /* 2x16 = 256k per sector */
-flash_info_t flash_info[C
FG
_MAX_FLASH_BANKS];
+flash_info_t flash_info[C
ONFIG_SYS
_MAX_FLASH_BANKS];
/**
/**
@@
-51,14
+51,14
@@
ulong 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 =
(INTEL_MANUFACT & FLASH_VENDMASK) |
(INTEL_ID_28F128J3 & FLASH_TYPEMASK);
flash_info[i].size = FLASH_BANK_SIZE;
ulong flashbase = 0;
flash_info[i].flash_id =
(INTEL_MANUFACT & FLASH_VENDMASK) |
(INTEL_ID_28F128J3 & 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);
switch (i) {
case 0:
switch (i) {
case 0:
@@
-76,8
+76,8
@@
ulong 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,
@@
-97,7
+97,7
@@
void flash_print_info (flash_info_t *info)
{
int i, j;
{
int i, j;
- for (j=0; j<C
FG
_MAX_FLASH_BANKS; j++) {
+ for (j=0; j<C
ONFIG_SYS
_MAX_FLASH_BANKS; j++) {
switch (info->flash_id & FLASH_VENDMASK) {
case (INTEL_MANUFACT & FLASH_VENDMASK):
switch (info->flash_id & FLASH_VENDMASK) {
case (INTEL_MANUFACT & FLASH_VENDMASK):
@@
-189,7
+189,7
@@
int flash_erase(flash_info_t *info, int s_first, int s_last)
*addr = 0x00D000D0; /* erase confirm */
while ((*addr & 0x00800080) != 0x00800080) {
*addr = 0x00D000D0; /* erase confirm */
while ((*addr & 0x00800080) != 0x00800080) {
- if (get_timer_masked() > C
FG
_FLASH_ERASE_TOUT) {
+ if (get_timer_masked() > C
ONFIG_SYS
_FLASH_ERASE_TOUT) {
*addr = 0x00B000B0; /* suspend erase*/
*addr = 0x00FF00FF; /* read mode */
rc = ERR_TIMOUT;
*addr = 0x00B000B0; /* suspend erase*/
*addr = 0x00FF00FF; /* read mode */
rc = ERR_TIMOUT;
@@
-251,7
+251,7
@@
static int write_long (flash_info_t *info, ulong dest, ulong data)
/* wait while polling the status register */
while(((val = *addr) & 0x00800080) != 0x00800080) {
/* wait while polling the status register */
while(((val = *addr) & 0x00800080) != 0x00800080) {
- if (get_timer_masked() > C
FG
_FLASH_WRITE_TOUT) {
+ if (get_timer_masked() > C
ONFIG_SYS
_FLASH_WRITE_TOUT) {
rc = ERR_TIMOUT;
/* suspend program command */
*addr = 0x00B000B0;
rc = ERR_TIMOUT;
/* suspend program command */
*addr = 0x00B000B0;