Merge with /home/sr/git/u-boot/nand-env
This commit is contained in:
commit
7de8354855
@ -102,6 +102,7 @@
|
||||
#define CFG_ENV_IS_IN_FLASH 1 /* use FLASH for environment vars */
|
||||
#else
|
||||
#define CFG_ENV_IS_IN_NAND 1 /* use NAND for environment vars */
|
||||
#define CFG_ENV_IS_EMBEDDED 1 /* use embedded environment */
|
||||
#endif
|
||||
|
||||
/*-----------------------------------------------------------------------
|
||||
|
@ -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 */
|
||||
|
Loading…
Reference in New Issue
Block a user