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 with git://www.denx.de/git/u-boot.git
[platform/kernel/u-boot.git]
/
common
/
env_nand.c
diff --git
a/common/env_nand.c
b/common/env_nand.c
index
f97af20
..
38a07f8
100644
(file)
--- a/
common/env_nand.c
+++ b/
common/env_nand.c
@@
-39,10
+39,10
@@
#include <malloc.h>
#include <nand.h>
#include <malloc.h>
#include <nand.h>
-#if
((CONFIG_COMMANDS&(CFG_CMD_ENV|CFG_CMD_NAND)) == (CFG_CMD_ENV|CFG_CMD_NAND)) || (defined(CONFIG_CMD_ENV) && defined(CONFIG_CMD_NAND)
)
+#if
defined(CONFIG_CMD_ENV) && defined(CONFIG_CMD_NAND
)
#define CMD_SAVEENV
#elif defined(CFG_ENV_OFFSET_REDUND)
#define CMD_SAVEENV
#elif defined(CFG_ENV_OFFSET_REDUND)
-#error Cannot use CFG_ENV_OFFSET_REDUND without C
FG_CMD_ENV & CF
G_CMD_NAND
+#error Cannot use CFG_ENV_OFFSET_REDUND without C
ONFIG_CMD_ENV & CONFI
G_CMD_NAND
#endif
#if defined(CFG_ENV_SIZE_REDUND) && (CFG_ENV_SIZE_REDUND != CFG_ENV_SIZE)
#endif
#if defined(CFG_ENV_SIZE_REDUND) && (CFG_ENV_SIZE_REDUND != CFG_ENV_SIZE)