From 0126fa7182816aab08e37ade48958b50990aab7b Mon Sep 17 00:00:00 2001 From: Nick Spence Date: Wed, 22 Nov 2006 18:07:49 -0700 Subject: [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. --- include/configs/sequoia.h | 1 + include/environment.h | 3 +-- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/include/configs/sequoia.h b/include/configs/sequoia.h index 3a76315..1274d8e 100644 --- a/include/configs/sequoia.h +++ b/include/configs/sequoia.h @@ -102,6 +102,7 @@ #if !defined(CONFIG_NAND_U_BOOT) && !def #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 26b0712..af605ab 100644 --- a/include/environment.h +++ b/include/environment.h @@ -79,8 +79,7 @@ # endif # 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 */ -- 1.4.2.3