Skip to content
Snippets Groups Projects
Commit 7de83548 authored by Wolfgang Denk's avatar Wolfgang Denk Committed by Wolfgang Denk
Browse files

Merge with /home/sr/git/u-boot/nand-env

parents a5bfa272 d1a72545
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
include/configs/sequoia.h
+ 1
− 0
View file @ 7de83548
...@@ -102,6 +102,7 @@ ...@@ -102,6 +102,7 @@
#define CFG_ENV_IS_IN_FLASH 1 /* use FLASH for environment vars */ #define CFG_ENV_IS_IN_FLASH 1 /* use FLASH for environment vars */
#else #else
#define CFG_ENV_IS_IN_NAND 1 /* use NAND for environment vars */ #define CFG_ENV_IS_IN_NAND 1 /* use NAND for environment vars */
#define CFG_ENV_IS_EMBEDDED 1 /* use embedded environment */
#endif #endif
/*----------------------------------------------------------------------- /*-----------------------------------------------------------------------
......
include/environment.h
+ 1
− 2
View file @ 7de83548
...@@ -79,8 +79,7 @@ ...@@ -79,8 +79,7 @@
# ifdef CFG_ENV_OFFSET_REDUND # ifdef CFG_ENV_OFFSET_REDUND
# define CFG_REDUNDAND_ENVIRONMENT # define CFG_REDUNDAND_ENVIRONMENT
# endif # endif
# if defined(CONFIG_NAND_U_BOOT) # ifdef CFG_ENV_IS_EMBEDDED
/* Use embedded environment in NAND boot versions */
# define ENV_IS_EMBEDDED 1 # define ENV_IS_EMBEDDED 1
# endif # endif
#endif /* CFG_ENV_IS_IN_NAND */ #endif /* CFG_ENV_IS_IN_NAND */
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment