From 55c5f49910ec8225347aa1d211352a84de6649b4 Mon Sep 17 00:00:00 2001 From: Jean-Christophe PLAGNIOL-VILLARD Date: Wed, 10 Sep 2008 22:48:00 +0200 Subject: [PATCH] env_onenand: Move conditional compilation to Makefile Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD --- common/Makefile | 2 +- common/env_onenand.c | 5 ----- 2 files changed, 1 insertion(+), 6 deletions(-) diff --git a/common/Makefile b/common/Makefile index cb3a7425f7..a9d66ae157 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 4e466eaa4e..09a79d0191 100644 --- a/common/env_onenand.c +++ b/common/env_onenand.c @@ -22,9 +22,6 @@ */ #include - -#if defined(CONFIG_ENV_IS_IN_ONENAND) /* Environment is in OneNAND */ - #include #include #include @@ -126,5 +123,3 @@ int env_init(void) return 0; } - -#endif /* CONFIG_ENV_IS_IN_ONENAND */ -- 2.30.2