[U-Boot] [PATCH 15/25] env_onenand: Move conditional compilation to Makefile

[Jean-Christophe PLAGNIOL-VILLARD]

Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj at jcrosoft.com>
---
 common/Makefile      |    2 +-
 common/env_onenand.c |    5 -----
 2 files changed, 1 insertions(+), 6 deletions(-)

diff --git a/common/Makefile b/common/Makefile
index 93bcd03..4f333df 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 */
-- 
1.5.6.3