projects
/
oweals
/
u-boot.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
socrates: rename sdram_setup fixed_sdram()
[oweals/u-boot.git]
/
board
/
rsdproto
/
flash.c
diff --git
a/board/rsdproto/flash.c
b/board/rsdproto/flash.c
index 4e43b296601f0ca9e5b4792f58b40b0d1e25ccc2..e99c2a6f664fead205dc8b8aaf72a53bf04112b7 100644
(file)
--- a/
board/rsdproto/flash.c
+++ b/
board/rsdproto/flash.c
@@
-41,7
+41,7
@@
*/
#undef WITH_AUTOSELECT
*/
#undef WITH_AUTOSELECT
-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 1
#define D(x)
#if 1
#define D(x)
@@
-94,7
+94,7
@@
unsigned long flash_init (void)
#endif
/* Init: no FLASHes known */
#endif
/* 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;
}
@@
-120,28
+120,28
@@
unsigned long flash_init (void)
* protect monitor and environment sectors
*/
* protect monitor and environment sectors
*/
-#if C
FG
_MONITOR_BASE >= PHYS_FLASH
+#if C
ONFIG_SYS
_MONITOR_BASE >= PHYS_FLASH
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]);
flash_protect(FLAG_PROTECT_SET,
&flash_info[0]);
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]);
#endif
&flash_info[1]);
#endif
-#if
(CFG_ENV_IS_IN_FLASH == 1) && defined(CF
G_ENV_ADDR)
-# ifndef C
F
G_ENV_SIZE
-# define C
FG_ENV_SIZE CF
G_ENV_SECT_SIZE
+#if
defined(CONFIG_ENV_IS_IN_FLASH) && defined(CONFI
G_ENV_ADDR)
+# ifndef C
ONFI
G_ENV_SIZE
+# define C
ONFIG_ENV_SIZE CONFI
G_ENV_SECT_SIZE
# endif
flash_protect(FLAG_PROTECT_SET,
# endif
flash_protect(FLAG_PROTECT_SET,
- C
F
G_ENV_ADDR,
- C
FG_ENV_ADDR + CF
G_ENV_SIZE - 1,
+ C
ONFI
G_ENV_ADDR,
+ C
ONFIG_ENV_ADDR + CONFI
G_ENV_SIZE - 1,
&flash_info[0]);
flash_protect(FLAG_PROTECT_SET,
&flash_info[0]);
flash_protect(FLAG_PROTECT_SET,
- C
F
G_ENV_ADDR,
- C
FG_ENV_ADDR + CF
G_ENV_SIZE - 1,
+ C
ONFI
G_ENV_ADDR,
+ C
ONFIG_ENV_ADDR + CONFI
G_ENV_SIZE - 1,
&flash_info[1]);
#endif
&flash_info[1]);
#endif
@@
-259,7
+259,7
@@
int flash_erase (flash_info_t *info, int s_first, int s_last)
start = get_timer (0);
do
{
start = get_timer (0);
do
{
- if (get_timer(start) > C
FG
_FLASH_ERASE_TOUT)
+ if (get_timer(start) > C
ONFIG_SYS
_FLASH_ERASE_TOUT)
{ /* write reset command, command address is unimportant */
/* this command turns the flash back to read mode */
f_addr =
{ /* write reset command, command address is unimportant */
/* this command turns the flash back to read mode */
f_addr =
@@
-387,7
+387,7
@@
static unsigned char write_ull(flash_info_t *info,
start = get_timer (0);
do
{
start = get_timer (0);
do
{
- if (get_timer(start) > C
FG
_FLASH_WRITE_TOUT)
+ if (get_timer(start) > C
ONFIG_SYS
_FLASH_WRITE_TOUT)
{
/* write reset command, command address is unimportant */
/* this command turns the flash back to read mode */
{
/* write reset command, command address is unimportant */
/* this command turns the flash back to read mode */