aboutsummaryrefslogtreecommitdiff
path: root/common/env_nvram.c
diff options
context:
space:
mode:
authorJean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>2008-09-10 22:47:59 +0200
committerJean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>2008-09-10 22:47:59 +0200
commit957a0e69575683efd70ace147746bbb3d8e7c501 (patch)
tree3af87be7a4e366d6dde5e53bb01fcfc0fc136030 /common/env_nvram.c
parent9314cee6917444ab88bd4e758da7a30975120187 (diff)
downloadu-boot-linaro-stable-957a0e69575683efd70ace147746bbb3d8e7c501.tar.gz
env_nvram: Move conditional compilation to Makefile
Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
Diffstat (limited to 'common/env_nvram.c')
-rw-r--r--common/env_nvram.c9
1 files changed, 2 insertions, 7 deletions
diff --git a/common/env_nvram.c b/common/env_nvram.c
index c877f00a6..c59bf9faa 100644
--- a/common/env_nvram.c
+++ b/common/env_nvram.c
@@ -41,15 +41,12 @@
*/
#include <common.h>
-
-DECLARE_GLOBAL_DATA_PTR;
-
-#ifdef CONFIG_ENV_IS_IN_NVRAM /* Environment is in NVRAM */
-
#include <command.h>
#include <environment.h>
#include <linux/stddef.h>
+DECLARE_GLOBAL_DATA_PTR;
+
#ifdef CFG_NVRAM_ACCESS_ROUTINE
extern void *nvram_read(void *dest, const long src, size_t count);
extern void nvram_write(long dest, const void *src, size_t count);
@@ -156,5 +153,3 @@ int env_init (void)
#endif
return (0);
}
-
-#endif /* CONFIG_ENV_IS_IN_NVRAM */