[PATCH] Select NAND embedded environment from board configuration

The current NAND Bootloader setup forces the environment
variables to be in line with the bootloader. This change
enables the configuration to be made in the board include
file instead so that it can be individually enabled.

Signed-off-by: Nick Spence <nick.spence@freescale.com>
Signed-off-by: Stefan Roese <sr@denx.de>

diff --git a/include/configs/sequoia.h b/include/configs/sequoia.h
index 1a460cde067e5c52cb1c13eaeb97ab35a354d056..00b92220c10f417fbd7941c8dd9c88aa7ecdffea 100644 (file)
--- a/include/configs/sequoia.h
+++ b/include/configs/sequoia.h
@@ -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
 
 /*-----------------------------------------------------------------------

diff --git a/include/environment.h b/include/environment.h
index 26b07120da152166f250ce69f1b9073e4ae58ec6..af605ab7a9cefc5547ce23b91a7e4aef5fa4bb19 100644 (file)
--- 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 */