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_ENV macros to CONFIG_ENV
[platform/kernel/u-boot.git]
/
board
/
exbitgen
/
flash.c
diff --git
a/board/exbitgen/flash.c
b/board/exbitgen/flash.c
index
dddd06e
..
745fba2
100644
(file)
--- a/
board/exbitgen/flash.c
+++ b/
board/exbitgen/flash.c
@@
-28,11
+28,10
@@
* Chris Hallinan - DS4.COM, Inc. - clh@net1plus.com
*/
* Chris Hallinan - DS4.COM, Inc. - clh@net1plus.com
*/
-#include <
asm/types
.h>
+#include <
common
.h>
#include <asm/u-boot.h>
#include <asm/processor.h>
#include <ppc4xx.h>
#include <asm/u-boot.h>
#include <asm/processor.h>
#include <ppc4xx.h>
-#include <common.h>
flash_info_t flash_info[CFG_MAX_FLASH_BANKS]; /* info for FLASH chips */
flash_info_t flash_info[CFG_MAX_FLASH_BANKS]; /* info for FLASH chips */
@@
-127,10
+126,10
@@
unsigned long flash_init (void)
#endif
#endif
#endif
#endif
-#if
(CFG_ENV_IS_IN_FLASH == 1) && defined(CF
G_ENV_ADDR)
+#if
defined(CONFIG_ENV_IS_IN_FLASH) && defined(CONFI
G_ENV_ADDR)
flash_protect(FLAG_PROTECT_SET,
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]);
#endif
&flash_info[0]);
#endif