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
/
cu824
/
flash.c
diff --git
a/board/cu824/flash.c
b/board/cu824/flash.c
index
6fe2978
..
bd0f8d3
100644
(file)
--- a/
board/cu824/flash.c
+++ b/
board/cu824/flash.c
@@
-27,7
+27,7
@@
#if defined(CONFIG_ENV_IS_IN_FLASH)
# ifndef CONFIG_ENV_ADDR
#if defined(CONFIG_ENV_IS_IN_FLASH)
# ifndef CONFIG_ENV_ADDR
-# define CONFIG_ENV_ADDR (C
FG
_FLASH_BASE + CONFIG_ENV_OFFSET)
+# define CONFIG_ENV_ADDR (C
ONFIG_SYS
_FLASH_BASE + CONFIG_ENV_OFFSET)
# endif
# ifndef CONFIG_ENV_SIZE
# define CONFIG_ENV_SIZE CONFIG_ENV_SECT_SIZE
# endif
# ifndef CONFIG_ENV_SIZE
# define CONFIG_ENV_SIZE CONFIG_ENV_SECT_SIZE
@@
-43,7
+43,7
@@
#define BOARD_CTRL_REG 0xFE800013
#define BOARD_CTRL_REG 0xFE800013
-flash_info_t flash_info[C
FG
_MAX_FLASH_BANKS];
+flash_info_t flash_info[C
ONFIG_SYS
_MAX_FLASH_BANKS];
static int write_data (flash_info_t *info, ulong dest, ulong *data);
static void write_via_fpu(vu_long *addr, ulong *data);
static int write_data (flash_info_t *info, ulong dest, ulong *data);
static void write_via_fpu(vu_long *addr, ulong *data);
@@
-75,8
+75,8
@@
unsigned long flash_init(void)
*bcr |= 0x6; /* FWP0 = FWP1 = 1 */
DEBUGF("Write protect is: 0x%02X\n", *bcr);
*bcr |= 0x6; /* FWP0 = FWP1 = 1 */
DEBUGF("Write protect is: 0x%02X\n", *bcr);
- for (i = 0; i < C
FG
_MAX_FLASH_BANKS; i++) {
- vu_long *addr = (vu_long *)(C
FG
_FLASH_BASE + i * FLASH_BANK_SIZE);
+ for (i = 0; i < C
ONFIG_SYS
_MAX_FLASH_BANKS; i++) {
+ vu_long *addr = (vu_long *)(C
ONFIG_SYS
_FLASH_BASE + i * FLASH_BANK_SIZE);
addr[0] = 0x00900090;
addr[0] = 0x00900090;
@@
-103,15
+103,15
@@
unsigned long flash_init(void)
addr[0] = 0xFFFFFFFF;
flash_info[i].size = FLASH_BANK_SIZE;
addr[0] = 0xFFFFFFFF;
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);
for (j = 0; j < flash_info[i].sector_count; j++) {
if (j <= 7) {
for (j = 0; j < flash_info[i].sector_count; j++) {
if (j <= 7) {
- flash_info[i].start[j] = C
FG
_FLASH_BASE +
+ flash_info[i].start[j] = C
ONFIG_SYS
_FLASH_BASE +
i * FLASH_BANK_SIZE +
j * PARAM_SECT_SIZE;
} else {
i * FLASH_BANK_SIZE +
j * PARAM_SECT_SIZE;
} else {
- flash_info[i].start[j] = C
FG
_FLASH_BASE +
+ flash_info[i].start[j] = C
ONFIG_SYS
_FLASH_BASE +
i * FLASH_BANK_SIZE +
(j - 7)*MAIN_SECT_SIZE;
}
i * FLASH_BANK_SIZE +
(j - 7)*MAIN_SECT_SIZE;
}
@@
-121,22
+121,22
@@
unsigned long flash_init(void)
/* Protect monitor and environment sectors
*/
/* Protect monitor and environment sectors
*/
-#if C
FG_MONITOR_BASE >= CFG
_FLASH_BASE
-#if C
FG_MONITOR_BASE >= CFG
_FLASH_BASE + FLASH_BANK_SIZE
+#if C
ONFIG_SYS_MONITOR_BASE >= CONFIG_SYS
_FLASH_BASE
+#if C
ONFIG_SYS_MONITOR_BASE >= CONFIG_SYS
_FLASH_BASE + FLASH_BANK_SIZE
flash_protect(FLAG_PROTECT_SET,
flash_protect(FLAG_PROTECT_SET,
- C
FG
_MONITOR_BASE,
- C
FG
_MONITOR_BASE + monitor_flash_len - 1,
+ C
ONFIG_SYS
_MONITOR_BASE,
+ C
ONFIG_SYS
_MONITOR_BASE + monitor_flash_len - 1,
&flash_info[1]);
#else
flash_protect(FLAG_PROTECT_SET,
&flash_info[1]);
#else
flash_protect(FLAG_PROTECT_SET,
- C
FG
_MONITOR_BASE,
- C
FG
_MONITOR_BASE + monitor_flash_len - 1,
+ C
ONFIG_SYS
_MONITOR_BASE,
+ C
ONFIG_SYS
_MONITOR_BASE + monitor_flash_len - 1,
&flash_info[0]);
#endif
#endif
#if defined(CONFIG_ENV_IS_IN_FLASH) && defined(CONFIG_ENV_ADDR)
&flash_info[0]);
#endif
#endif
#if defined(CONFIG_ENV_IS_IN_FLASH) && defined(CONFIG_ENV_ADDR)
-#if CONFIG_ENV_ADDR >= C
FG
_FLASH_BASE + FLASH_BANK_SIZE
+#if CONFIG_ENV_ADDR >= C
ONFIG_SYS
_FLASH_BASE + FLASH_BANK_SIZE
flash_protect(FLAG_PROTECT_SET,
CONFIG_ENV_ADDR,
CONFIG_ENV_ADDR + CONFIG_ENV_SIZE - 1,
flash_protect(FLAG_PROTECT_SET,
CONFIG_ENV_ADDR,
CONFIG_ENV_ADDR + CONFIG_ENV_SIZE - 1,
@@
-268,7
+268,7
@@
int flash_erase (flash_info_t *info, int s_first, int s_last)
while (((addr[0] & 0x00800080) != 0x00800080) ||
((addr[1] & 0x00800080) != 0x00800080) ) {
if ((now=get_timer(start)) >
while (((addr[0] & 0x00800080) != 0x00800080) ||
((addr[1] & 0x00800080) != 0x00800080) ) {
if ((now=get_timer(start)) >
- C
FG
_FLASH_ERASE_TOUT) {
+ C
ONFIG_SYS
_FLASH_ERASE_TOUT) {
printf ("Timeout\n");
addr[0] = 0x00B000B0; /* suspend erase */
addr[0] = 0x00FF00FF; /* to read mode */
printf ("Timeout\n");
addr[0] = 0x00B000B0; /* suspend erase */
addr[0] = 0x00FF00FF; /* to read mode */
@@
-452,7
+452,7
@@
static int write_data (flash_info_t *info, ulong dest, ulong *data)
while (((addr[0] & 0x00800080) != 0x00800080) ||
((addr[1] & 0x00800080) != 0x00800080) ) {
while (((addr[0] & 0x00800080) != 0x00800080) ||
((addr[1] & 0x00800080) != 0x00800080) ) {
- if (get_timer(start) > C
FG
_FLASH_WRITE_TOUT) {
+ if (get_timer(start) > C
ONFIG_SYS
_FLASH_WRITE_TOUT) {
addr[0] = 0x00FF00FF; /* restore read mode */
return (1);
}
addr[0] = 0x00FF00FF; /* restore read mode */
return (1);
}