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
/
cogent
/
flash.c
diff --git
a/board/cogent/flash.c
b/board/cogent/flash.c
index
942f33a
..
e6c85b6
100644
(file)
--- a/
board/cogent/flash.c
+++ b/
board/cogent/flash.c
@@
-24,11
+24,11
@@
#include <common.h>
#include <board/cogent/flash.h>
#include <common.h>
#include <board/cogent/flash.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
*/
#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
@@
-121,7
+121,7
@@
c302f_probe(flash_info_t *fip, c302f_addr_t base)
fip->size += C302F_BNK_SIZE;
osc = fip->sector_count;
fip->sector_count += C302F_BNK_NBLOCKS;
fip->size += C302F_BNK_SIZE;
osc = fip->sector_count;
fip->sector_count += C302F_BNK_NBLOCKS;
- if ((nsc = fip->sector_count) >= C
FG
_MAX_FLASH_SECT)
+ if ((nsc = fip->sector_count) >= C
ONFIG_SYS
_MAX_FLASH_SECT)
panic("Too many sectors in flash at address 0x%08lx\n",
(unsigned long)base);
panic("Too many sectors in flash at address 0x%08lx\n",
(unsigned long)base);
@@
-264,7
+264,7
@@
c302f_write_word(c302f_addr_t addr, c302f_word_t value)
/* data polling for D7 */
start = get_timer (0);
do {
/* data polling for D7 */
start = get_timer (0);
do {
- if (get_timer(start) > C
FG
_FLASH_WRITE_TOUT) {
+ if (get_timer(start) > C
ONFIG_SYS
_FLASH_WRITE_TOUT) {
retval = 1;
goto done;
}
retval = 1;
goto done;
}
@@
-295,7
+295,7
@@
flash_init(void)
flash_info_t *fip;
/* Init: no FLASHes known */
flash_info_t *fip;
/* Init: no FLASHes known */
- for (i=0; i<C
FG
_MAX_FLASH_BANKS; ++i) {
+ for (i=0; i<C
ONFIG_SYS
_MAX_FLASH_BANKS; ++i) {
flash_info[i].flash_id = FLASH_UNKNOWN;
}
flash_info[i].flash_id = FLASH_UNKNOWN;
}
@@
-303,7
+303,7
@@
flash_init(void)
total = 0L;
#if defined(CONFIG_CMA302)
total = 0L;
#if defined(CONFIG_CMA302)
- c302f_probe(fip, (c302f_addr_t)C
FG
_FLASH_BASE);
+ c302f_probe(fip, (c302f_addr_t)C
ONFIG_SYS
_FLASH_BASE);
total += fip->size;
fip++;
#endif
total += fip->size;
fip++;
#endif
@@
-320,10
+320,10
@@
flash_init(void)
* protect monitor and environment sectors
*/
* protect monitor and environment sectors
*/
-#if C
FG_MONITOR_BASE == CFG
_FLASH_BASE
+#if C
ONFIG_SYS_MONITOR_BASE == CONFIG_SYS
_FLASH_BASE
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[0]);
#endif
&flash_info[0]);
#endif
@@
-472,7
+472,7
@@
flash_erase(flash_info_t *info, int s_first, int s_last)
do {
now = get_timer(start);
do {
now = get_timer(start);
- if (now - estart > C
FG
_FLASH_ERASE_TOUT) {
+ if (now - estart > C
ONFIG_SYS
_FLASH_ERASE_TOUT) {
printf ("Timeout (sect %d)\n", sect);
haderr = 1;
break;
printf ("Timeout (sect %d)\n", sect);
haderr = 1;
break;