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
Merge branch 'master' of /home/wd/git/u-boot/custodians
[platform/kernel/u-boot.git]
/
include
/
configs
/
mecp5200.h
diff --git
a/include/configs/mecp5200.h
b/include/configs/mecp5200.h
index
1c2f1a2
..
8b13fc0
100644
(file)
--- a/
include/configs/mecp5200.h
+++ b/
include/configs/mecp5200.h
@@
-180,7
+180,7
@@
*/
#define CFG_FLASH_BASE 0xFFC00000
#define CFG_FLASH_SIZE 0x00400000
*/
#define CFG_FLASH_BASE 0xFFC00000
#define CFG_FLASH_SIZE 0x00400000
-#define C
FG_ENV_ADDR
(CFG_FLASH_BASE + 0x003E0000)
+#define C
ONFIG_ENV_ADDR
(CFG_FLASH_BASE + 0x003E0000)
#define CFG_MAX_FLASH_BANKS 1 /* max num of memory banks */
#define CFG_MAX_FLASH_SECT 512
#define CFG_MAX_FLASH_BANKS 1 /* max num of memory banks */
#define CFG_MAX_FLASH_SECT 512
@@
-191,14
+191,14
@@
* Environment settings
*/
#if 1 /* test-only */
* Environment settings
*/
#if 1 /* test-only */
-#define C
FG_ENV_IS_IN_FLASH
1
-#define C
FG_ENV_SIZE
0x10000
-#define C
FG_ENV_SECT_SIZE
0x10000
+#define C
ONFIG_ENV_IS_IN_FLASH
1
+#define C
ONFIG_ENV_SIZE
0x10000
+#define C
ONFIG_ENV_SECT_SIZE
0x10000
#define CONFIG_ENV_OVERWRITE 1
#else
#define CONFIG_ENV_IS_IN_EEPROM 1 /* use EEPROM for environment vars */
#define CONFIG_ENV_OVERWRITE 1
#else
#define CONFIG_ENV_IS_IN_EEPROM 1 /* use EEPROM for environment vars */
-#define C
FG_ENV_OFFSET
0x0000 /* environment starts at the beginning of the EEPROM */
-#define C
FG_ENV_SIZE
0x0400 /* 8192 bytes may be used for env vars*/
+#define C
ONFIG_ENV_OFFSET
0x0000 /* environment starts at the beginning of the EEPROM */
+#define C
ONFIG_ENV_SIZE
0x0400 /* 8192 bytes may be used for env vars*/
/* total size of a CAT24WC32 is 8192 bytes */
#define CONFIG_ENV_OVERWRITE 1
#endif
/* total size of a CAT24WC32 is 8192 bytes */
#define CONFIG_ENV_OVERWRITE 1
#endif