summaryrefslogtreecommitdiff
path: root/common
diff options
context:
space:
mode:
authorJean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>2008-09-10 22:48:00 +0200
committerJean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>2008-09-10 22:48:00 +0200
commit55c5f49910ec8225347aa1d211352a84de6649b4 (patch)
tree028bdcb324a9e4085173e8ca26f1e1ef4a34adf6 /common
parent9656138ff1a34d4c4768db6b490deffc40ee674b (diff)
downloadu-boot-imx-55c5f49910ec8225347aa1d211352a84de6649b4.zip
u-boot-imx-55c5f49910ec8225347aa1d211352a84de6649b4.tar.gz
u-boot-imx-55c5f49910ec8225347aa1d211352a84de6649b4.tar.bz2
env_onenand: Move conditional compilation to Makefile
Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
Diffstat (limited to 'common')
-rw-r--r--common/Makefile2
-rw-r--r--common/env_onenand.c5
2 files changed, 1 insertions, 6 deletions
diff --git a/common/Makefile b/common/Makefile
index cb3a742..a9d66ae 100644
--- a/common/Makefile
+++ b/common/Makefile
@@ -55,7 +55,7 @@ COBJS-$(CONFIG_ENV_IS_IN_EEPROM) += env_eeprom.o
COBJS-y += env_flash.o
COBJS-$(CONFIG_ENV_IS_IN_NAND) += env_nand.o
COBJS-$(CONFIG_ENV_IS_IN_NVRAM) += env_nvram.o
-COBJS-y += env_onenand.o
+COBJS-$(CONFIG_ENV_IS_IN_ONENAND) += env_onenand.o
COBJS-y += env_sf.o
COBJS-y += env_nowhere.o
diff --git a/common/env_onenand.c b/common/env_onenand.c
index 4e466ea..09a79d0 100644
--- a/common/env_onenand.c
+++ b/common/env_onenand.c
@@ -22,9 +22,6 @@
*/
#include <common.h>
-
-#if defined(CONFIG_ENV_IS_IN_ONENAND) /* Environment is in OneNAND */
-
#include <command.h>
#include <environment.h>
#include <linux/stddef.h>
@@ -126,5 +123,3 @@ int env_init(void)
return 0;
}
-
-#endif /* CONFIG_ENV_IS_IN_ONENAND */