Home Explore Help
Register Sign In
phyus
/
uboot-vybrid_public
8
0
Fork 0
Files Issues 0 Pull Requests 0 Wiki
Browse Source

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

Wolfgang Denk 18 years ago
parent
a5bfa2726b d1a7254529
commit
7de8354855
2 changed files with 2 additions and 2 deletions
Split View Show Diff Stats
  1. 1 0
      include/configs/sequoia.h
  2. 1 2
      include/environment.h

+ 1 - 0
include/configs/sequoia.h
View File 

@@ -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
 
 
 /*-----------------------------------------------------------------------

+ 1 - 2
include/environment.h
View File 

@@ -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 */