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]
/
common
/
env_common.c
diff --git
a/common/env_common.c
b/common/env_common.c
index
0fee3af
..
6be3bb0
100644
(file)
--- a/
common/env_common.c
+++ b/
common/env_common.c
@@
-103,8
+103,8
@@
uchar default_environment[] = {
#ifdef CONFIG_SERVERIP
"serverip=" MK_STR(CONFIG_SERVERIP) "\0"
#endif
#ifdef CONFIG_SERVERIP
"serverip=" MK_STR(CONFIG_SERVERIP) "\0"
#endif
-#ifdef C
FG
_AUTOLOAD
- "autoload=" C
FG_AUTOLOAD
"\0"
+#ifdef C
ONFIG_SYS
_AUTOLOAD
+ "autoload=" C
ONFIG_SYS_AUTOLOAD
"\0"
#endif
#ifdef CONFIG_PREBOOT
"preboot=" CONFIG_PREBOOT "\0"
#endif
#ifdef CONFIG_PREBOOT
"preboot=" CONFIG_PREBOOT "\0"
@@
-220,7
+220,7
@@
void set_default_env(void)
memset(env_ptr, 0, sizeof(env_t));
memcpy(env_ptr->data, default_environment,
sizeof(default_environment));
memset(env_ptr, 0, sizeof(env_t));
memcpy(env_ptr->data, default_environment,
sizeof(default_environment));
-#ifdef C
FG
_REDUNDAND_ENVIRONMENT
+#ifdef C
ONFIG_SYS
_REDUNDAND_ENVIRONMENT
env_ptr->flags = 0xFF;
#endif
env_crc_update ();
env_ptr->flags = 0xFF;
#endif
env_crc_update ();