env_nowhere: Move conditional compilation to Makefile

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

diff --git a/common/Makefile b/common/Makefile
index e171ae0b4c586b0cd10128f95adb03ce1e9e1a3f..cf861c575c1e90eabcfc2043361005f9685406e2 100644 (file)
--- a/common/Makefile
+++ b/common/Makefile
@@ -57,7 +57,7 @@ COBJS-$(CONFIG_ENV_IS_IN_NAND) += env_nand.o
 COBJS-$(CONFIG_ENV_IS_IN_NVRAM) += env_nvram.o
 COBJS-$(CONFIG_ENV_IS_IN_ONENAND) += env_onenand.o
 COBJS-$(CONFIG_ENV_IS_IN_SPI_FLASH) += env_sf.o
-COBJS-y += env_nowhere.o
+COBJS-$(CONFIG_ENV_IS_NOWHERE) += env_nowhere.o
 
 # command
 COBJS-$(CONFIG_CMD_AMBAPP) += cmd_ambapp.o

diff --git a/common/env_nowhere.c b/common/env_nowhere.c
index 8dd4867f1faf352312276543b8a172cfb8e505e6..78e8f8eb4e4c8e63eef2669879dc5a09d614310b 100644 (file)
--- a/common/env_nowhere.c
+++ b/common/env_nowhere.c
@@ -25,9 +25,6 @@
  */
 
 #include <common.h>
-
-#if defined(CONFIG_ENV_IS_NOWHERE) /* Environment is nowhere */
-
 #include <command.h>
 #include <environment.h>
 #include <linux/stddef.h>
@@ -61,5 +58,3 @@ int  env_init(void)
 
        return (0);
 }
-
-#endif /* CONFIG_ENV_IS_NOWHERE) */