env_dataflash: Move conditional compilation to Makefile

Signed-off-by: NJean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>

common/Makefile

@@ -50,7 +50,7 @@ COBJS-y += cmd_nvedit.o
 # environment
 COBJS-y += environment.o
 COBJS-y += env_common.o
-COBJS-y += env_dataflash.o
+COBJS-$(CONFIG_ENV_IS_IN_DATAFLASH) += env_dataflash.o
 COBJS-$(CONFIG_ENV_IS_IN_EEPROM) += env_eeprom.o
 COBJS-y += env_flash.o
 COBJS-y += env_nand.o

common/env_dataflash.c

@@ -18,9 +18,6 @@
  *
  */
 #include <common.h>
-
-#if defined(CONFIG_ENV_IS_IN_DATAFLASH) /* Environment is in DataFlash */
-
 #include <command.h>
 #include <environment.h>
 #include <linux/stddef.h>
@@ -100,5 +97,3 @@ int env_init(void)
 
 	return (0);
 }
-
-#endif /* CONFIG_ENV_IS_IN_DATAFLASH */