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
/
sbc2410x
/
flash.c
diff --git
a/board/sbc2410x/flash.c
b/board/sbc2410x/flash.c
index
fa3996d
..
abb0935
100644
(file)
--- a/
board/sbc2410x/flash.c
+++ b/
board/sbc2410x/flash.c
@@
-29,7
+29,7
@@
ulong myflush (void);
#define FLASH_BANK_SIZE PHYS_FLASH_SIZE
#define MAIN_SECT_SIZE 0x10000 /* 64 KB */
#define FLASH_BANK_SIZE PHYS_FLASH_SIZE
#define MAIN_SECT_SIZE 0x10000 /* 64 KB */
-flash_info_t flash_info[C
FG
_MAX_FLASH_BANKS];
+flash_info_t flash_info[C
ONFIG_SYS
_MAX_FLASH_BANKS];
#define CMD_READ_ARRAY 0x000000F0
#define CMD_UNLOCK1 0x000000AA
#define CMD_READ_ARRAY 0x000000F0
#define CMD_UNLOCK1 0x000000AA
@@
-39,8
+39,8
@@
flash_info_t flash_info[CFG_MAX_FLASH_BANKS];
#define CMD_PROGRAM 0x000000A0
#define CMD_UNLOCK_BYPASS 0x00000020
#define CMD_PROGRAM 0x000000A0
#define CMD_UNLOCK_BYPASS 0x00000020
-#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 0x00000080
#define BIT_RDY_MASK 0x00000080
#define BIT_ERASE_DONE 0x00000080
#define BIT_RDY_MASK 0x00000080
@@
-59,7
+59,7
@@
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 =
ulong flashbase = 0;
flash_info[i].flash_id =
@@
-73,8
+73,8
@@
ulong flash_init (void)
#error "Unknown flash configured"
#endif
flash_info[i].size = FLASH_BANK_SIZE;
#error "Unknown flash configured"
#endif
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
@@
-109,8
+109,8
@@
ulong flash_init (void)
}
flash_protect (FLAG_PROTECT_SET,
}
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,
@@
-234,7
+234,7
@@
int flash_erase (flash_info_t * info, int s_first, int s_last)
/* check timeout */
if (get_timer_masked () >
/* check timeout */
if (get_timer_masked () >
- C
FG
_FLASH_ERASE_TOUT) {
+ C
ONFIG_SYS
_FLASH_ERASE_TOUT) {
MEM_FLASH_ADDR1 = CMD_READ_ARRAY;
chip = TMO;
break;
MEM_FLASH_ADDR1 = CMD_READ_ARRAY;
chip = TMO;
break;
@@
-330,7
+330,7
@@
static int write_hword (flash_info_t * info, ulong dest, ushort data)
result = *addr;
/* check timeout */
result = *addr;
/* check timeout */
- if (get_timer_masked () > C
FG
_FLASH_ERASE_TOUT) {
+ if (get_timer_masked () > C
ONFIG_SYS
_FLASH_ERASE_TOUT) {
chip = ERR | TMO;
break;
}
chip = ERR | TMO;
break;
}