diff options
| author | roy zang <tie-fei.zang@freescale.com> | 2006-11-29 09:45:03 +0800 |
|---|---|---|
| committer | Zang Tiefei <roy@bus.ap.freescale.net> | 2006-11-29 09:45:03 +0800 |
| commit | 6bd87c0aeea441c49d59fd542b84a9be88d08b17 (patch) | |
| tree | e450a5f1e69a78a203a1e15167d7fefa43c5ce7e /include/environment.h | |
| parent | 0a8eb59983047ae3bcc0babf3ee4d10d01abe7da (diff) | |
| parent | d2c83f549378fb3fc34cb3c2e62fd772fbf8b68b (diff) | |
Solve the copyright conflicts when merging 'master' into hpc2.
Merge branch 'master' into hpc2
Conflicts:
drivers/cfi_flash.c
Diffstat (limited to 'include/environment.h')
| -rw-r--r-- | include/environment.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/include/environment.h b/include/environment.h index 26b07120da1..af605ab7a9c 100644 --- a/include/environment.h +++ b/include/environment.h @@ -79,8 +79,7 @@ # ifdef CFG_ENV_OFFSET_REDUND # define CFG_REDUNDAND_ENVIRONMENT # endif -# if defined(CONFIG_NAND_U_BOOT) -/* Use embedded environment in NAND boot versions */ +# ifdef CFG_ENV_IS_EMBEDDED # define ENV_IS_EMBEDDED 1 # endif #endif /* CFG_ENV_IS_IN_NAND */ |