projects
/
oweals
/
u-boot.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge git://git.denx.de/u-boot into x1
[oweals/u-boot.git]
/
board
/
lpc2292sodimm
/
flash.c
diff --git
a/board/lpc2292sodimm/flash.c
b/board/lpc2292sodimm/flash.c
index 0fb08430c53edecfc43ad9742b4be1fbdb9eaa3f..a7e175d8edbcf3502322cf178bbb6eb98860cc02 100644
(file)
--- a/
board/lpc2292sodimm/flash.c
+++ b/
board/lpc2292sodimm/flash.c
@@
-28,7
+28,7
@@
#define SST_ADDR2 ((volatile ushort*)(SST_BASEADDR + (0x2AAA << 1)))
#define SST_ADDR2 ((volatile ushort*)(SST_BASEADDR + (0x2AAA << 1)))
-flash_info_t flash_info[C
FG
_MAX_FLASH_BANKS];
+flash_info_t flash_info[C
ONFIG_SYS
_MAX_FLASH_BANKS];
extern int lpc2292_copy_buffer_to_flash(flash_info_t *, ulong);
extern int lpc2292_flash_erase(flash_info_t *, int, int);
extern int lpc2292_copy_buffer_to_flash(flash_info_t *, ulong);
extern int lpc2292_flash_erase(flash_info_t *, int, int);
@@
-97,8
+97,8
@@
ulong flash_init (void)
&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[0]);
return size;
&flash_info[0]);
return size;